Changes of Revision 361

vlc-beta.patch Changed
x
 
1
@@ -9,16 +9,25 @@
2
              )
3
  
4
          if ret.returncode != 0:
5
-@@ -83,8 +83,8 @@ class QmlModuleChecker:
6
+@@ -83,16 +83,16 @@ class QmlModuleChecker:
7
+             print("qmake not found")
8
              return False
9
  
10
-         ret = subprocess.run(
11
--             qmake, "-qtconf", qtconf, "-query",
12
--            capture_output=True,
13
-+             qmake, "-query",
14
-+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
15
-             encoding="utf8"
16
-         )
17
+-        if qtconf:
18
++        if False:
19
+             ret = subprocess.run(
20
+                  qmake, "-qtconf", qtconf, "-query",
21
+-                capture_output=True,
22
++                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
23
+                 encoding="utf8"
24
+             )
25
+         else:
26
+             ret = subprocess.run(
27
+                  qmake, "-query",
28
+-                capture_output=True,
29
++                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
30
+                 encoding="utf8"
31
+             )
32
  
33
 --- a/configure.ac
34
 +++ b/configure.ac
35
@@ -49,7 +58,7 @@
36
            VLC_ADD_PLUGIN(mod)
37
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
38
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
39
-@@ -4771,7 +4771,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
40
+@@ -4750,7 +4750,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
41
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
42
  )
43
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
44
@@ -95,7 +104,7 @@
45
  #else // _WIN32
46
 --- a/src/Makefile.am
47
 +++ b/src/Makefile.am
48
-@@ -563,7 +563,7 @@ libvlccore_la_LDFLAGS = \
49
+@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
50
    $(LDFLAGS_libvlccore) \
51
    -no-undefined \
52
    -export-symbols $(srcdir)/libvlccore.sym \
53
_service:obs_scm:vlc-beta-20240412.e0ee001b9f.obscpio Deleted
_service:obs_scm:vlc-beta-20240419.1f6ad29193.obscpio Added
_service:obs_scm:vlc-beta.obsinfo Changed
9
 
1
@@ -1,4 +1,4 @@
2
 name: vlc-beta
3
-version: 20240412.e0ee001b9f
4
-mtime: 1712905507
5
-commit: e0ee001b9f23ee6c347954dfb3c2aa4db9104748
6
+version: 20240419.1f6ad29193
7
+mtime: 1713525105
8
+commit: 1f6ad2919344f0baa958356472ee6d4aa7de1a34
9