From e9703088bc1f99350f977ba555c84d46ef0f47e9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 06 2011 12:58:41 +0000 Subject: 20110505 snapshot, to test pk plugin for imminent 4.5.1 official release --- diff --git a/.gitignore b/.gitignore index e2c9053..7c59a7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /phonon-backend-gstreamer-4.4.4.tar.bz2 /phonon-backend-gstreamer-4.5.0.tar.bz2 +/phonon-backend-gstreamer-4.5.1-20110505.tar.bz2 diff --git a/phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch b/phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch deleted file mode 100644 index 7ab051c..0000000 --- a/phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur phonon-4.3.50.orig/gstreamer/mediaobject.cpp phonon-4.3.50/gstreamer/mediaobject.cpp ---- phonon-4.3.50.orig/gstreamer/mediaobject.cpp 2009-10-11 02:24:30.000000000 +0200 -+++ phonon-4.3.50/gstreamer/mediaobject.cpp 2009-10-11 02:28:25.000000000 +0200 -@@ -852,6 +852,10 @@ - else - m_backend->logMessage("Stream is non-seekable", Backend::Info, this); - } else { -+ if (m_seekable) { -+ m_seekable = false; -+ emit seekableChanged(m_seekable); -+ } - m_backend->logMessage("updateSeekable query failed", Backend::Info, this); - } - gst_query_unref (query); - diff --git a/phonon-backend-gstreamer.spec b/phonon-backend-gstreamer.spec index 8ce9fcb..8f646ee 100644 --- a/phonon-backend-gstreamer.spec +++ b/phonon-backend-gstreamer.spec @@ -1,14 +1,16 @@ +%define snap 20110505 + Summary: Gstreamer phonon backend Name: phonon-backend-gstreamer Epoch: 2 -Version: 4.5.0 -Release: 1%{?dist} +Version: 4.5.1 +Release: 0.1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ %if 0%{?snap} -Source0: phonon-gstreamer-%{version}-%{snap}.tar.bz2 +Source0: phonon-backend-gstreamer-%{version}-%{snap}.tar.bz2 # run this script to generate a snapshot tarball Source1: phonon-gstreamer_snapshot.sh %else @@ -17,9 +19,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/%{vers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Mandriva/upstreamable patches -Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch ## Ubuntu/upstreamable patches +# older shared-mime-info may still need this, where audio/x-flac was primary mimetype (newer versions use audio/flac with audio/x-flac alias) +# otherwise, keeping this patch is mostly harmless. Patch60: phonon-4.4.3-flac_mimetype.patch ## Upstream patches @@ -30,7 +33,7 @@ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: phonon-devel >= 4.5.0 -%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.4.4) +%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.0) Provides: phonon-backend%{?_isa} = %{phonon_version} @@ -54,7 +57,6 @@ Requires: qt4%{?_isa} >= %{_qt4_version} %prep %setup -q -n phonon-backend-gstreamer-%{version} -%patch52 -p1 -b .gstreamer-fix-seekable-query-failed %patch60 -p1 -b .flac_mimetype @@ -102,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||: %changelog +* Fri May 06 2011 Rex Dieter 2:4.5.1-0.1.20110505 +- 20110505 snapshot + * Sun Apr 10 2011 Rex Dieter 2:4.5.0-1 - 4.5.0 diff --git a/phonon-gstreamer_snapshot.sh b/phonon-gstreamer_snapshot.sh index 6cef33c..9815a6c 100755 --- a/phonon-gstreamer_snapshot.sh +++ b/phonon-gstreamer_snapshot.sh @@ -2,7 +2,7 @@ MODULE=phonon-gstreamer TARBALL=phonon-backend-gstreamer -VERSION=4.5.0 +VERSION=4.5.1 DATE=$(date +%Y%m%d) set -x @@ -11,7 +11,7 @@ rm -rf $MODULE git clone git://anongit.kde.org/phonon-gstreamer $MODULE/ pushd $MODULE -git archive master --format tar --prefix=${TARBALL}-${VERSION}/ | bzip2 -9 > ../%{TARBALL}-${VERSION}-${DATE}.tar.bz2 +git archive master --format tar --prefix=${TARBALL}-${VERSION}/ | bzip2 -9 > ../${TARBALL}-${VERSION}-${DATE}.tar.bz2 popd rm -rf $MODULE diff --git a/sources b/sources index b6bed6c..ea61331 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2875139f2b7b649396125f4acc66de67 phonon-backend-gstreamer-4.5.0.tar.bz2 +28ce7f308a7c5712510e483206decba3 phonon-backend-gstreamer-4.5.1-20110505.tar.bz2