Packman Build Service PMBS

Difference Between Revision 4 and Essentials / A_16.0-vlc

vlc.spec Changed

@@ -56,7 +56,7 @@
 Patch2:         vlc-lua-5.3.patch
 # PATCH-FIX-UPSTREAM fix-build-with-fdk-2.0.patch -- Fix building vlc with libfdk-aac v2
 Patch4:         fix-build-with-fdk-2.0.patch
-# PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant
+# PATCH-FEATURE-OPENSUSE vlc-projectM-qt6.patch -- Build against projectM-qt6; openSUSE provides projectM as -qt and -qt6 variant
 Patch100:       vlc-projectM-qt5.patch
 # PATCH-FIX-UPSTREAM -- Use OpenCV C++ API
 Patch103:       0001-Port-OpenCV-facedetect-example-to-C-API.patch
@@ -80,7 +80,7 @@
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  gettext-devel
 BuildRequires:  gtk3-devel
-BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  cmake(Qt6GuiPrivate)
 BuildRequires:  libavc1394-devel >= 0.5.3
 BuildRequires:  libcddb-devel >= 0.9.5
 BuildRequires:  libcdio-devel >= 0.78.2
@@ -123,10 +123,10 @@
 #BuildRequires:  slang-devel
 BuildRequires:  speex-devel >= 1.0.5
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Core) >= 5.5.0
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Svg)
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt6Core) >= 5.5.0
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Svg)
+BuildRequires:  pkgconfig(Qt6Widgets)
 BuildRequires:  pkgconfig(aom)
 BuildRequires:  pkgconfig(caca) >= 0.99.beta20
 BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
@@ -195,7 +195,7 @@
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 %endif
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-BuildRequires:  pkgconfig(Qt5X11Extras)
+##BuildRequires:  pkgconfig(Qt6X11Extras)
 # for some reason libXi-devel is explicitly needed on Leap 42.1, otherwise the build fails...
 BuildRequires:  pkgconfig(xi)
 %endif
@@ -203,7 +203,7 @@
 BuildRequires:  pkgconfig(libupnp)
 %ifarch %{ix86} x86_64
 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
-BuildRequires:  pkgconfig(libprojectM-qt5) >= 2.0.0
+BuildRequires:  pkgconfig(libprojectM-qt6) >= 2.0.0
 %else
 BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
 %endif
@@ -384,7 +384,7 @@
 Requires:       %{name}-noX = %{version}-%{release}
 # We need the noX package first, as it contains vlc-cache-gen
 Requires(post): %{name}-noX
-Supplements:    packageand(%{name}-noX:libqt5)
+Supplements:    packageand(%{name}-noX:libqt6)
 Conflicts:      %{conflicts}-qt
 
 %description qt