Author: rdieter Update of /cvs/free/rpms/phonon-backend-vlc/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31777 Modified Files: .cvsignore phonon-backend-vlc.spec sources Added Files: phonon-backend-vlc-0.7.0-initial_preference.patch Log Message: * Wed Nov 06 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.7.0-1 - 0.7.0, Qt5 support phonon-backend-vlc-0.7.0-initial_preference.patch: vlc.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE phonon-backend-vlc-0.7.0-initial_preference.patch --- diff -up phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake.priority phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake --- phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake.priority 2013-11-04 10:49:24.000000000 -0600 +++ phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake 2013-11-06 08:46:15.129946199 -0600 @@ -7,7 +7,7 @@ X-KDE-PhononBackendInfo-InterfaceVersion X-KDE-PhononBackendInfo-Version=@PHONON_VLC_VERSION@ X-KDE-PhononBackendInfo-Website=http://www.videolan.org/ Icon=vlc -InitialPreference=20 +InitialPreference=10 Name=VLC Name[bg]=VLC Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Feb 2013 12:35:39 -0000 1.13 +++ .cvsignore 6 Nov 2013 14:53:10 -0000 1.14 @@ -1 +1 @@ -phonon-backend-vlc-0.6.2.tar.xz +phonon-backend-vlc-0.7.0.tar.xz Index: phonon-backend-vlc.spec =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- phonon-backend-vlc.spec 2 Oct 2013 17:30:00 -0000 1.21 +++ phonon-backend-vlc.spec 6 Nov 2013 14:53:10 -0000 1.22 @@ -1,9 +1,9 @@ name: phonon-backend-vlc Summary: VLC phonon backend -Version: 0.6.2 -Release: 2%{?dist} -Group: Applications/Multimedia +Version: 0.7.0 +Release: 1%{?dist} + License: LGPLv2+ URL: http://phonon.kde.org/ %if 0%{?snap} @@ -11,69 +11,85 @@ # git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-backend-vlc-%{version}-%{snap}.tar.xz Source0: phonon-backend-vlc-%{version}-%{snap}.tar.xz %else -Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/phono... +Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/src/p... %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +## downstream patches +# reset initial preference below (fedora's default) gstreamer +Patch1: phonon-backend-vlc-0.7.0-initial_preference.patch BuildRequires: automoc4 >= 0.9.86 -BuildRequires: cmake >= 2.6.0 +BuildRequires: cmake BuildRequires: kde-filesystem BuildRequires: pkgconfig(libvlc) >= 1.1.10 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(phonon) >= 4.5.50 -BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui) +BuildRequires: pkgconfig(phonon) >= 4.7 +BuildRequires: pkgconfig(phonon4qt5) >= 4.7 +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(xcb) # Oh, the irony of being in the default buildroot @ rpmfusion BuildRequires: phonon-backend-gstreamer -%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50) +%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.7.0) %global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.10) Provides: phonon-backend%{?_isa} = %{phonon_ver} Requires: vlc-core%{?_isa} >= %{vlc_ver} Requires: phonon%{?_isa} >= %{phonon_ver} -%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}} +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +%package -n phonon-qt5-backend-vlc +Summary: Vlc phonon-qt5 backend +Provides: phonon-qt5-backend%{?_isa} = %{phonon_version} +%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} +%description -n phonon-qt5-backend-vlc +%{summary}. %description %{summary}. + %prep %setup -q -n phonon-backend-vlc-%{version}%{?pre:-%{pre}} +%patch1 -p1 -b .initial_preference -%build +%build mkdir -p %{_target_platform} pushd %{_target_platform} - -%{cmake} \ - %{?_cmake_skip_rpath} \ - .. +%{cmake} .. +make %{?_smp_mflags} popd -make %{?_smp_mflags} -C %{_target_platform} +mkdir -p %{_target_platform}-Qt5 +pushd %{_target_platform}-Qt5 +%{cmake} -DPHONON_BUILD_PHONON4QT5:BOOL=ON .. +make %{?_smp_mflags} +popd %install -rm -rf %{buildroot} - +make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-Qt5 make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc AUTHORS COPYING.LIB %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_vlc.so %{_kde4_datadir}/kde4/services/phononbackends/vlc.desktop +%files -n phonon-qt5-backend-vlc +%doc AUTHORS COPYING.LIB +%{_qt5_plugindir}/phonon4qt5_backend/phonon_vlc.so + %changelog +* Wed Nov 06 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.7.0-1 +- 0.7.0, Qt5 support + * Wed Oct 02 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.6.2-2 - rebuild (vlc) Index: sources =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Feb 2013 12:35:39 -0000 1.13 +++ sources 6 Nov 2013 14:53:10 -0000 1.14 @@ -1 +1 @@ -1ae8b15594714841d2bcf8c72813a176 phonon-backend-vlc-0.6.2.tar.xz +1a172744eb0fd9cb0dbe0ea8b69e50f1 phonon-backend-vlc-0.7.0.tar.xz