rpms/phonon/devel phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.29, 1.30

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5130

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
Log Message:
backport some GStreamer fixes


phonon-4.3.2-gstreamer-utf8-url.patch:

--- NEW FILE phonon-4.3.2-gstreamer-utf8-url.patch ---
Index: gstreamer/mediaobject.h
===================================================================
--- gstreamer/mediaobject.h	(revision 932755)
+++ gstreamer/mediaobject.h	(revision 932756)
@@ -185,7 +185,7 @@
     /*
      * @param encodedUrl percent-encoded QString for source compat reasons.  Should change to QUrl
      */
-    bool createPipefromURL(const QString &encodedUrl);
+    bool createPipefromURL(const QUrl &url);
     bool createPipefromStream(const MediaSource &);
 
 private Q_SLOTS:
Index: gstreamer/mediaobject.cpp
===================================================================
--- gstreamer/mediaobject.cpp	(revision 932755)
+++ gstreamer/mediaobject.cpp	(revision 932756)
@@ -347,11 +347,8 @@
  *
  * returns true if successful
  */
-bool MediaObject::createPipefromURL(const QString &encodedUrl)
+bool MediaObject::createPipefromURL(const QUrl &url)
 {
-    // Convert back to URL
-    QUrl url(encodedUrl, QUrl::StrictMode);
-
     // Remove any existing data source
     if (m_datasource) {
         gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
@@ -361,7 +358,7 @@
 
     // Verify that the uri can be parsed
     if (!url.isValid()) {
-        m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl));
+        m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString()));
         return false;
     }
 
@@ -875,8 +872,7 @@
 
     switch (source.type()) {
     case MediaSource::Url: {            
-            QString urlString = source.url().toEncoded();
-            if (createPipefromURL(urlString))
+            if (createPipefromURL(source.url()))
                 m_loading = true;
             else
                 setError(tr("Could not open media source."));
@@ -884,8 +880,7 @@
         break;
 
     case MediaSource::LocalFile: {
-            QString urlString = QUrl::fromLocalFile(source.fileName()).toString();
-            if (createPipefromURL(urlString))
+            if (createPipefromURL(QUrl::fromLocalFile(source.fileName())))
                 m_loading = true;
             else
                 setError(tr("Could not open media source."));

phonon-4.3.2-gstreamer-volumefader.patch:

--- NEW FILE phonon-4.3.2-gstreamer-volumefader.patch ---
Index: gstreamer/mediaobject.cpp
===================================================================
--- gstreamer/mediaobject.cpp	(revision 932979)
+++ gstreamer/mediaobject.cpp	(revision 932980)
@@ -141,9 +141,9 @@
     if (m_resumeState)
         return;
 
-    if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) {
+    if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) {
         m_resumeState = true;
-        m_oldState = m_state;
+        m_oldState = m_pendingState;
         m_oldPos = getPipelinePos();
     }
 }


Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phonon.spec	27 Feb 2009 11:07:08 -0000	1.29
+++ phonon.spec	3 Mar 2009 16:41:33 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -15,6 +15,11 @@
 # it as a "sink", and then the device setting is ignored entirely.
 Patch0:  phonon-4.2.96-pulseaudio.patch
 Patch1:  phonon-4.2.96-xine-pulseaudio.patch
+
+## Upstream patches
+Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
+Patch101: phonon-4.3.2-gstreamer-volumefader.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4 >= 0.9.86
@@ -73,7 +78,8 @@
 %setup -q -n phonon-%{version}%{?alphatag}
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .xine-pulseaudio
-
+%patch100 -p0 -b .gstreamer-utf8-url
+%patch101 -p0 -b .gstreamer-volumefader
 
 %build
 mkdir -p %{_target_platform}
@@ -153,6 +159,10 @@
 
 
 %changelog
+* Tue Mar  3 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-2
+- backport GStreamer backend bugfixes (UTF-8 file handling, volume
+fader)
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1