Packman Build Service PMBS

vlc-beta.spec Changed

@@ -232,6 +232,9 @@
 BuildRequires:  pkgconfig(soxr) >= 0.1.2
 BuildRequires:  pkgconfig(libebur128) >= 1.2.4
 BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
+%if 0%{?suse_version} > 1500
+BuildRequires:  pkgconfig(KF6WindowSystem)
+%endif
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Gui)
 BuildRequires:  pkgconfig(Qt6Qml)
@@ -335,11 +338,12 @@
 test -x "$(type -p gcc-10)" && BUILDCC="$_"
 test -x "$(type -p gcc-10)" && CC="$_"
 test -x "$(type -p g++-10)" && CXX="$_"
-test -x "$(type -p qmake6)" && QMAKE6="$_"
+test -x "$(type -p gcc-13)" && BUILDCC="$_"
+test -x "$(type -p gcc-13)" && CC="$_"
+test -x "$(type -p g++-13)" && CXX="$_"
 export BUILDCC="$(readlink -f ${BUILDCC})"
 export CC="$(readlink -f ${CC})"
 export CXX="$(readlink -f ${CXX})"
-export QMAKE6="$(readlink -f ${QMAKE6})"
 CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
 CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
 ./bootstrap

vlc-beta.patch Changed

@@ -1,34 +1,3 @@
---- a/buildsystem/check_qml_module.py
-+++ b/buildsystem/check_qml_module.py
-@@ -50,7 +50,7 @@ class QmlModuleChecker:
-                 "-qmlFiles", f.name,
-                 "-importPath", self.qmlpath
-             ,
--            capture_output=True,
-+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-             )
- 
-         if ret.returncode != 0:
-@@ -83,16 +83,16 @@ class QmlModuleChecker:
-             print("qmake not found")
-             return False
- 
--        if qtconf:
-+        if False:
-             ret = subprocess.run(
-                  qmake, "-qtconf", qtconf, "-query",
--                capture_output=True,
-+                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                 encoding="utf8"
-             )
-         else:
-             ret = subprocess.run(
-                  qmake, "-query",
--                capture_output=True,
-+                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                 encoding="utf8"
-             )
- 
 --- a/configure.ac
 +++ b/configure.ac
 @@ -10,7 +10,7 @@ VERSION_EXTRA=0
@@ -40,7 +9,7 @@
  LIBVLC_ABI_MINOR=0
  LIBVLC_ABI_MICRO=0
  
-@@ -2124,7 +2124,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
+@@ -2114,7 +2114,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
  dnl
  dnl dvdread module: check for libdvdread
  dnl
@@ -49,7 +18,7 @@
  
  dnl
  dnl libdvdnav plugin
-@@ -2471,7 +2471,7 @@ AC_ARG_ENABLE(mod,
+@@ -2461,7 +2461,7 @@ AC_ARG_ENABLE(mod,
    AS_HELP_STRING(--disable-mod,
      do not use libmodplug (default auto)))
  if test "${enable_mod}" != "no" ; then
@@ -58,7 +27,7 @@
            VLC_ADD_PLUGIN(mod)
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
-@@ -4750,7 +4750,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+@@ -4731,7 +4731,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
  )
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)

_service:obs_scm:vlc-beta-20240505.3f2959558d.obscpio Deleted

_service:obs_scm:vlc-beta-20240524.3a165daceb.obscpio Added

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 20