Overview

Request 6053 (accepted)

No description set
Submit package Staging / vlc-beta to package Extra / vlc-beta

vlc-beta.spec Changed
x
 
1
@@ -232,6 +232,9 @@
2
 BuildRequires:  pkgconfig(soxr) >= 0.1.2
3
 BuildRequires:  pkgconfig(libebur128) >= 1.2.4
4
 BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
5
+%if 0%{?suse_version} > 1500
6
+BuildRequires:  pkgconfig(KF6WindowSystem)
7
+%endif
8
 BuildRequires:  pkgconfig(Qt6Core)
9
 BuildRequires:  pkgconfig(Qt6Gui)
10
 BuildRequires:  pkgconfig(Qt6Qml)
11
@@ -335,11 +338,12 @@
12
 test -x "$(type -p gcc-10)" && BUILDCC="$_"
13
 test -x "$(type -p gcc-10)" && CC="$_"
14
 test -x "$(type -p g++-10)" && CXX="$_"
15
-test -x "$(type -p qmake6)" && QMAKE6="$_"
16
+test -x "$(type -p gcc-13)" && BUILDCC="$_"
17
+test -x "$(type -p gcc-13)" && CC="$_"
18
+test -x "$(type -p g++-13)" && CXX="$_"
19
 export BUILDCC="$(readlink -f ${BUILDCC})"
20
 export CC="$(readlink -f ${CC})"
21
 export CXX="$(readlink -f ${CXX})"
22
-export QMAKE6="$(readlink -f ${QMAKE6})"
23
 CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
24
 CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
25
 ./bootstrap
26
vlc-beta.patch Changed
63
 
1
@@ -1,34 +1,3 @@
2
---- a/buildsystem/check_qml_module.py
3
-+++ b/buildsystem/check_qml_module.py
4
-@@ -50,7 +50,7 @@ class QmlModuleChecker:
5
-                 "-qmlFiles", f.name,
6
-                 "-importPath", self.qmlpath
7
-             ,
8
--            capture_output=True,
9
-+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
10
-             )
11
- 
12
-         if ret.returncode != 0:
13
-@@ -83,16 +83,16 @@ class QmlModuleChecker:
14
-             print("qmake not found")
15
-             return False
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
 @@ -10,7 +10,7 @@ VERSION_EXTRA=0
36
@@ -40,7 +9,7 @@
37
  LIBVLC_ABI_MINOR=0
38
  LIBVLC_ABI_MICRO=0
39
  
40
-@@ -2124,7 +2124,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
41
+@@ -2114,7 +2114,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
42
  dnl
43
  dnl dvdread module: check for libdvdread
44
  dnl
45
@@ -49,7 +18,7 @@
46
  
47
  dnl
48
  dnl libdvdnav plugin
49
-@@ -2471,7 +2471,7 @@ AC_ARG_ENABLE(mod,
50
+@@ -2461,7 +2461,7 @@ AC_ARG_ENABLE(mod,
51
    AS_HELP_STRING(--disable-mod,
52
      do not use libmodplug (default auto)))
53
  if test "${enable_mod}" != "no" ; then
54
@@ -58,7 +27,7 @@
55
            VLC_ADD_PLUGIN(mod)
56
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
57
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
58
-@@ -4750,7 +4750,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
59
+@@ -4731,7 +4731,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
60
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
61
  )
62
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
63
Refresh
Refresh
Request History
Olaf Hering's avatar

olh created request 11 months ago


Olaf Hering's avatar

olh accepted request 11 months ago