[packages/phonon-backend-vlc] - removed non-building qt5 support here

qboosh qboosh at pld-linux.org
Tue Jun 10 20:37:52 CEST 2025


commit 24e7802691c3d8df86f399e6e51c1976b9ef5f81
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 10 20:26:40 2025 +0200

    - removed non-building qt5 support here

 phonon-backend-vlc.spec | 75 ++++++-------------------------------------------
 1 file changed, 9 insertions(+), 66 deletions(-)
---
diff --git a/phonon-backend-vlc.spec b/phonon-backend-vlc.spec
index 6022168..d4943e6 100644
--- a/phonon-backend-vlc.spec
+++ b/phonon-backend-vlc.spec
@@ -1,11 +1,5 @@
-#
-# Conditional build:
-%bcond_without	qt4	# Qt4 Phonon backend
-%bcond_without	qt5	# Qt5 Phonon (Phonon4Qt5) backend
-
 %define		phonon_ver	4.7.0
-%define		qt4_ver		4.7.1
-%define		qt5_ver		4.7.1
+%define		qt_ver		4.7.1
 %define		vlc_ver		2.1.0
 
 Summary:	VLC backend for Phonon
@@ -19,26 +13,16 @@ Group:		X11/Applications
 Source0:	https://download.kde.org/Attic/phonon/phonon-backend-vlc/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	4c3f0f90182aedb724c3e715d2933459
 URL:		https://userbase.kde.org/Phonon
+BuildRequires:	QtCore-devel >= %{qt_ver}
+BuildRequires:	QtGui-devel >= %{qt_ver}
 BuildRequires:	cmake >= 2.8.9
-BuildRequires:	vlc-devel >= %{vlc_ver}
-BuildRequires:	rpmbuild(macros) >= 1.605
-%if %{with qt4}
-BuildRequires:	QtCore-devel >= %{qt4_ver}
-BuildRequires:	QtGui-devel >= %{qt4_ver}
 BuildRequires:	phonon-devel >= %{phonon_ver}
-BuildRequires:	qt4-build >= %{qt4_ver}
-BuildRequires:	qt4-qmake >= %{qt4_ver}
-%endif
-%if %{with qt5}
-BuildRequires:	Qt5Core-devel >= %{qt5_ver}
-BuildRequires:	Qt5Gui-devel >= %{qt5_ver}
-BuildRequires:	Qt5Widgets-devel >= %{qt5_ver}
-BuildRequires:	kf5-extra-cmake-modules
-BuildRequires:	phonon-qt5-devel >= %{phonon_ver}
-BuildRequires:	phonon-qt5-devel < 4.11
-BuildRequires:	qt5-build >= %{qt5_ver}
-BuildRequires:	qt5-qmake >= %{qt5_ver}
-%endif
+BuildRequires:	qt4-build >= %{qt_ver}
+BuildRequires:	qt4-qmake >= %{qt_ver}
+BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	vlc-devel >= %{vlc_ver}
+Requires:	QtCore >= %{qt_ver}
+Requires:	QtGui >= %{qt_ver}
 Requires:	phonon >= %{phonon_ver}
 Requires:	vlc >= %{vlc_ver}
 Provides:	qt4-phonon-backend = %{version}
@@ -50,68 +34,27 @@ VLC backend for Phonon.
 %description -l pl.UTF-8
 Wtyczka VLC dla Phonona.
 
-%package -n phonon-qt5-backend-vlc
-Summary:	VLC backend for Qt5 Phonon
-Summary(pl.UTF-8):	Wtyczka VLC dla Phonona opartego na Qt5
-Group:		Libraries
-Requires:	phonon-qt5 >= %{phonon_ver}
-Requires:	vlc >= %{vlc_ver}
-Provides:	phonon-qt5-backend = %{version}
-
-%description -n phonon-qt5-backend-vlc
-VLC backend for Qt5 Phonon.
-
-%description -n phonon-qt5-backend-vlc -l pl.UTF-8
-Wtyczka VLC dla Phonona opartego na Qt5.
-
 %prep
 %setup -q -n phonon-vlc-%{version}
 
 %build
-%if %{with qt4}
 install -d build-qt4
 cd build-qt4
 %cmake ..
 %{__make} -j1
 cd ..
-%endif
-
-%if %{with qt5}
-install -d build-qt5
-cd build-qt5
-%cmake .. \
-	-DPHONON_BUILD_PHONON4QT5=ON
-%{__make} -j1
-cd ..
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with qt4}
 %{__make} -C build-qt4 install \
 	DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%if %{with qt5}
-%{__make} -C build-qt5 install \
-	DESTDIR=$RPM_BUILD_ROOT
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with qt4}
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
 %attr(755,root,root) %{_libdir}/kde4/plugins/phonon_backend/phonon_vlc.so
 %{_datadir}/kde4/services/phononbackends/vlc.desktop
-%endif
-
-%if %{with qt5}
-%files -n phonon-qt5-backend-vlc
-%defattr(644,root,root,755)
-%doc AUTHORS
-%attr(755,root,root) %{_libdir}/qt5/plugins/phonon4qt5_backend/phonon_vlc.so
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phonon-backend-vlc.git/commitdiff/24e7802691c3d8df86f399e6e51c1976b9ef5f81



More information about the pld-cvs-commit mailing list