Request 6046 (accepted)

Overview

Request 6046 (accepted)

No description set

Created by olh 15 days ago
In state accepted

Submit vlc-beta

Submit package Staging / vlc-beta to package Extra / vlc-beta

vlc-beta.spec Changed

@@ -38,18 +38,34 @@
 Source3:        %name-rpmlintrc
 Patch0:         vlc-beta.patch
 
-%ifarch x86_64 aarch64
-Requires:       libqtquickcontrols2plugin.so()(64bit)
-Requires:       libqtgraphicaleffectsplugin.so()(64bit)
-%endif
-
 # avoid stale debug.rpm
 Conflicts:      %name-debuginfo < %version-%release 
 Conflicts:      %name-debugsource < %version-%release 
 #
 Conflicts:      vlc
+Conflicts:      vlc-codec-fluidsynth
+Conflicts:      vlc-codec-fluidsynth-debuginfo
+Conflicts:      vlc-codec-gstreamer
+Conflicts:      vlc-codec-gstreamer-debuginfo
+Conflicts:      vlc-codecs
+Conflicts:      vlc-codecs-debuginfo
+Conflicts:      vlc-debuginfo
+Conflicts:      vlc-debugsource
 Conflicts:      vlc-devel
+Conflicts:      vlc-jack
+Conflicts:      vlc-jack-debuginfo
+Conflicts:      vlc-lang
+Conflicts:      vlc-noX
+Conflicts:      vlc-noX-debuginfo
+Conflicts:      vlc-opencv
+Conflicts:      vlc-opencv-debuginfo
 Conflicts:      vlc-qt
+Conflicts:      vlc-qt-debuginfo
+Conflicts:      vlc-vdpau
+Conflicts:      vlc-vdpau-debuginfo
+Obsoletes:      vlc < %version-%release
+Obsoletes:      vlc-codec-fluidsynth < %version-%release
+Obsoletes:      vlc-codec-fluidsynth-debuginfo < %version-%release
 Obsoletes:      vlc-codec-gstreamer < %version-%release
 Obsoletes:      vlc-codec-gstreamer-debuginfo < %version-%release
 Obsoletes:      vlc-codecs < %version-%release
@@ -68,6 +84,9 @@
 Obsoletes:      vlc-qt-debuginfo < %version-%release
 Obsoletes:      vlc-vdpau < %version-%release
 Obsoletes:      vlc-vdpau-debuginfo < %version-%release
+Provides:       vlc = %version-%release
+Provides:       vlc-codec-fluidsynth = %version-%release
+Provides:       vlc-codec-fluidsynth-debuginfo = %version-%release
 Provides:       vlc-codec-gstreamer = %version-%release
 Provides:       vlc-codec-gstreamer-debuginfo = %version-%release
 Provides:       vlc-codecs = %version-%release
@@ -236,9 +255,9 @@
 BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Gui)
-BuildRequires:  pkgconfig(Qt6Network)
 BuildRequires:  pkgconfig(Qt6Qml)
 BuildRequires:  pkgconfig(Qt6QmlModels)
+BuildRequires:  pkgconfig(Qt6QmlWorkerScript)
 BuildRequires:  pkgconfig(Qt6Quick)
 BuildRequires:  pkgconfig(Qt6QuickControls2)
 BuildRequires:  pkgconfig(Qt6QuickLayouts)
@@ -270,7 +289,9 @@
 BuildRequires:  pkgconfig(libsecret-1) >= 0.18
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(gtk+-3.0)
+%if 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(protobuf-lite)
+%endif
 
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
@@ -335,9 +356,11 @@
 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="$_"
 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
@@ -348,6 +371,7 @@
 	--enable-shared \
 	--enable-dbus \
 	--disable-avx \
+	--disable-chromecast \
 	--disable-debug \
 	--disable-gprof \
 	--disable-cprof \
@@ -491,7 +515,9 @@
 	--enable-soxr \
 	--disable-kai \
 	--enable-chromaprint \
+%if 0%{?suse_version} > 1500
 	--enable-chromecast \
+%endif
 	--enable-qt \
 	--enable-qt \
 	--enable-skins2 \

vlc-beta.patch Changed

@@ -9,14 +9,25 @@
              )
  
          if ret.returncode != 0:
-@@ -84,7 +84,7 @@ class QmlModuleChecker:
+@@ -83,16 +83,16 @@ class QmlModuleChecker:
+             print("qmake not found")
+             return False
  
-         ret = subprocess.run(
-              qmake, "-query",
--            capture_output=True,
-+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-             encoding="utf8"
-         )
+-        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
@@ -29,7 +40,7 @@
  LIBVLC_ABI_MINOR=0
  LIBVLC_ABI_MICRO=0
  
-@@ -2091,7 +2091,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
+@@ -2124,7 +2124,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
  dnl
  dnl dvdread module: check for libdvdread
  dnl
@@ -38,7 +49,7 @@
  
  dnl
  dnl libdvdnav plugin
-@@ -2406,7 +2406,7 @@ AC_ARG_ENABLE(mod,
+@@ -2471,7 +2471,7 @@ AC_ARG_ENABLE(mod,
    AS_HELP_STRING(--disable-mod,
      do not use libmodplug (default auto)))
  if test "${enable_mod}" != "no" ; then
@@ -47,7 +58,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
-@@ -4676,7 +4676,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+@@ -4750,7 +4750,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)
@@ -83,7 +94,7 @@
          msg_Err( p_this, "unable to initialize liba52" );
 --- a/modules/control/cli/cli.c
 +++ b/modules/control/cli/cli.c
-@@ -577,6 +577,7 @@ static void *Run(void *data)
+@@ -580,6 +580,7 @@ static void *Run(void *data)
  
          vlc_restorecancel(canc);
      }
@@ -93,7 +104,7 @@
  #else // _WIN32
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -554,7 +554,7 @@ libvlccore_la_LDFLAGS = \
+@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
  	$(LDFLAGS_libvlccore) \
  	-no-undefined \
  	-export-symbols $(srcdir)/libvlccore.sym \

_constraints Added

Build Results
RPM Lint

Refresh

Comments for request 6046 0

Request History

olh created request 15 days ago

olh accepted request 15 days ago