From e97ad4ac78ef1011ca8a324018f269cc4a5dfb82 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 18 Nov 2014 18:41:36 -0600 Subject: [PATCH] wip/gstreamer1 snapshot (#1149885) --- qt5-qtmultimedia.spec | 48 +++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec index 4b0df9c..fa7117a 100644 --- a/qt5-qtmultimedia.spec +++ b/qt5-qtmultimedia.spec @@ -10,33 +10,48 @@ %global openal 1 %endif -%define pre beta +#define pre beta +%define snap 20141118 + +%define gst 0.10 +%if 0%{?fedora} > 20 +%define gst 1.0 +%endif Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} Version: 5.4.0 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{snap}.gst1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ +%if 0%{?snap} +# snapshot from wip/gstreamer1 branch +Source0: qtmultimedia-opensource-src-5.4.0-20141118.gst1.tar.xz +%else %if 0%{?pre:1} Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz %else Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif +%endif BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-app-0.10) -BuildRequires: pkgconfig(gstreamer-audio-0.10) -BuildRequires: pkgconfig(gstreamer-base-0.10) +%if "%{?gst}" == "1.0" +BuildConflicts: pkgconfig(gstreamer-0.10) +%else BuildRequires: pkgconfig(gstreamer-interfaces-0.10) -BuildRequires: pkgconfig(gstreamer-pbutils-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-bad-0.10) -BuildRequires: pkgconfig(gstreamer-video-0.10) +%endif +BuildRequires: pkgconfig(gstreamer-%{gst}) +BuildRequires: pkgconfig(gstreamer-app-%{gst}) +BuildRequires: pkgconfig(gstreamer-audio-%{gst}) +BuildRequires: pkgconfig(gstreamer-base-%{gst}) +BuildRequires: pkgconfig(gstreamer-pbutils-%{gst}) +BuildRequires: pkgconfig(gstreamer-plugins-bad-%{gst}) +BuildRequires: pkgconfig(gstreamer-video-%{gst}) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) %if 0%{?openal} BuildRequires: pkgconfig(openal) @@ -79,13 +94,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} +%setup -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} + +# force version match, snapshot is marked 5.5.0 currently +sed -i -e "s|^MODULE_VERSION =.*|MODULE_VERSION = %{version}|" .qmake.conf + +# do this... or CONFIG+=git_build below +# I've no idea really why this is needed, but without it, some private headers +# do not get created +#syncqt.pl -version %{version} %build mkdir %{_target_platform} pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} .. %{?snap:CONFIG+=git_build} make %{?_smp_mflags} @@ -170,6 +193,9 @@ popd %changelog +* Tue Nov 18 2014 Rex Dieter 5.4.0-0.3.20141118.gst1 +- wip/gstreamer1 snapshot (#1149885) + * Mon Nov 03 2014 Rex Dieter 5.4.0-0.2.beta - out-of-tree build, use %%qmake_qt5