5.4.0 (final) + backported gst1 support from dev/ branch

.gitignore

@@ -1,3 +1,2 @@
 /qtmultimedia-opensource-src-5.3.2.tar.xz
-/qtmultimedia-opensource-src-5.4.0-beta.tar.xz
-/qtmultimedia-opensource-src-5.4.0-20141118.gst1.tar.xz
+/qtmultimedia-opensource-src-5.4.0.tar.xz

qt5-qtmultimedia.spec

@@ -11,7 +11,6 @@
 %endif
 
 #define pre beta
-%define snap 20141118
 
 %define gst 0.10
 %if 0%{?fedora} > 20
@@ -21,28 +20,25 @@
 Summary: Qt5 - Multimedia support
 Name:    qt5-%{qt_module}
 Version: 5.4.0
-Release: 0.3.%{snap}.gst1%{?dist}
+Release: 1%{?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
+
+## upstream patches dev/ branch
+# pull this in for now, may end up tracking dev/ branch snapshots when/if there are bugfixes
+Patch106: 0006-GStreamer-port-to-1.0.patch
 
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtdeclarative-devel >= %{version}
 BuildRequires: pkgconfig(alsa)
-%if "%{?gst}" == "1.0"
-BuildConflicts: pkgconfig(gstreamer-0.10)
-%else
+%if "%{?gst}" == "0.10"
 BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
 %endif
 BuildRequires: pkgconfig(gstreamer-%{gst})
@@ -96,6 +92,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
 
+%patch106 -p1 -b .0006
+
 # force version match, snapshot is marked 5.5.0 currently
 sed -i -e "s|^MODULE_VERSION =.*|MODULE_VERSION = %{version}|" .qmake.conf
 
@@ -108,7 +106,9 @@ sed -i -e "s|^MODULE_VERSION =.*|MODULE_VERSION = %{version}|" .qmake.conf
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{qmake_qt5} .. %{?snap:CONFIG+=git_build}
+%{qmake_qt5} .. \
+  CONFIG+=git_build \
+  GST_VERSION=%{gst}
 
 make %{?_smp_mflags}
 
@@ -193,6 +193,9 @@ popd
 
 
 %changelog
+* Thu Dec 11 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-1
+- 5.4.0 (final) + backported gst1 support from dev/ branch
+
 * Tue Nov 18 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.3.20141118.gst1
 - wip/gstreamer1 snapshot (#1149885)
 

sources

@@ -1,2 +1 @@
-2b98f813ca26ea8447991ef2143f5e61  qtmultimedia-opensource-src-5.4.0-20141118.gst1.tar.xz
-732d4872fd0ac601caa86267e9d366d0  qtmultimedia-opensource-src-5.4.0-beta.tar.xz
+3a6a415813b54a54cf283a5e2906e012  qtmultimedia-opensource-src-5.4.0.tar.xz