[phonon-backend-gstreamer] snapshot from 1.0-porting-for-merge branch, build against GStreamer 1 on F21+

[Kevin Kofler]

commit 08c6bc97a6c93f6dd0d052122bc19a3604910a61
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Jul 20 04:08:05 2014 +0200

    snapshot from 1.0-porting-for-merge branch, build against GStreamer 1 on F21+
    
    * Sun Jul 20 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:4.7.2-2.gstreamer1.20140408git1c8de75487228
    - update to a snapshot from the 1.0-porting-for-merge branch
    - build against GStreamer 1 on F21+

 .gitignore                    |    1 +
 phonon-backend-gstreamer.spec |   31 +++++++++++++++++++++++++------
 phonon-gstreamer_snapshot.sh  |    9 +++++----
 sources                       |    2 +-
 4 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce8373b..a7ad43d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phonon-backend-gstreamer-4.7.2.tar.xz
+/phonon-backend-gstreamer-4.7.2-gstreamer1-20140408.tar.xz
diff --git a/phonon-backend-gstreamer.spec b/phonon-backend-gstreamer.spec
index 0f78e68..ce04245 100644
--- a/phonon-backend-gstreamer.spec
+++ b/phonon-backend-gstreamer.spec
@@ -1,9 +1,12 @@
+# snapshot from the 1.0-porting-for-merge branch, supports both GStreamer 0.10
+# and GStreamer 1.x
+%global snap gstreamer1-20140408
 
-Summary: Gstreamer phonon backend 
+Summary: Gstreamer phonon backend
 Name:    phonon-backend-gstreamer
 Epoch:   2
 Version: 4.7.2
-Release: 1%{?dist}
+Release: 2.gstreamer1.20140408git1c8de75487228%{?dist}
 
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -17,10 +20,23 @@ Source0: http://download.kde.org/stable/phonon/phonon-backend-gstreamer/%{versio
 
 ## upstream patches
 
+%if 0%{?fedora} > 20 || 0%{?rhel} > 7
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-app-1.0) pkgconfig(gstreamer-audio-1.0) pkgconfig(gstreamer-video-1.0)
+
+Requires: gstreamer1-plugins-good
+%else
+# We don't want to use GStreamer 1 where the rest of the Qt 4 stack doesn't,
+# or we run into symbol conflicts. So build against GStreamer 0.10 on Fedora up
+# to 20 and RHEL up to 7. (Up to RHEL 6, GStreamer 0.10 is the only option.)
+BuildRequires: pkgconfig(gstreamer-0.10)
+BuildRequires: pkgconfig(gstreamer-app-0.10) pkgconfig(gstreamer-audio-0.10) pkgconfig(gstreamer-video-0.10)
+
+Requires: gstreamer-plugins-good
+%endif
+
 BuildRequires: automoc4
 BuildRequires: cmake
-BuildRequires: pkgconfig(gstreamer-0.10) 
-BuildRequires: pkgconfig(gstreamer-app-0.10) pkgconfig(gstreamer-audio-0.10) pkgconfig(gstreamer-video-0.10)
 BuildRequires: pkgconfig(phonon) >= 4.7.0
 BuildRequires: pkgconfig(phonon4qt5) >= 4.7.0
 BuildRequires: pkgconfig(QtOpenGL)
@@ -39,7 +55,6 @@ Provides:  phonon-gstreamer = %{version}-%{release}
 # provide upgrade path for deprecated/removed -xine backend
 Obsoletes: phonon-backend-xine < 4.5.0
 
-Requires: gstreamer-plugins-good
 # not *strictly* required, but strongly recommended by upstream when built
 # with USE_INSTALL_PLUGIN
 #Requires: PackageKit-gstreamer-plugin
@@ -112,7 +127,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 
 
 %changelog
-* Mon Jun 23 2014 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-1
+* Sun Jul 20 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:4.7.2-2.gstreamer1.20140408git1c8de75487228
+- update to a snapshot from the 1.0-porting-for-merge branch
+- build against GStreamer 1 on F21+
+
+* Mon Jun 23 2014 Rex Dieter <rdieter at fedoraproject.org> 2:4.7.2-1
 - 4.7.2
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:4.7.1-3
diff --git a/phonon-gstreamer_snapshot.sh b/phonon-gstreamer_snapshot.sh
index 40b8a16..6036467 100755
--- a/phonon-gstreamer_snapshot.sh
+++ b/phonon-gstreamer_snapshot.sh
@@ -2,9 +2,10 @@
 
 MODULE=phonon-gstreamer
 TARBALL=phonon-backend-gstreamer
-BRANCH=remotes/origin/4.6
-VERSION=4.6.2
-DATE=$(date +%Y%m%d)
+BRANCH=remotes/origin/1.0-porting-for-merge
+VERSION=4.7.2
+DATE=gstreamer1-20140408
+#DATE=$(date +%Y%m%d)
 
 set -x
 
@@ -15,4 +16,4 @@ pushd $MODULE
 git archive ${BRANCH} --format tar --prefix=${TARBALL}-${VERSION}/ | xz -9 > ../${TARBALL}-${VERSION}-${DATE}.tar.xz
 popd
 
-rm -rf $MODULE 
+rm -rf $MODULE
diff --git a/sources b/sources
index 6bc2246..2dfa280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d437478c3ef2da2cda0da0abda20ef11  phonon-backend-gstreamer-4.7.2.tar.xz
+8af8d2311c5d5367019fc61991421810  phonon-backend-gstreamer-4.7.2-gstreamer1-20140408.tar.xz