rpms/phonon/F-9 phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.10, 1.11 sources, 1.5, 1.6
Lukas Tinkl
ltinkl at fedoraproject.org
Tue Mar 3 16:54:53 UTC 2009
- Previous message (by thread): rpms/gcalctool/devel .cvsignore, 1.56, 1.57 gcalctool.spec, 1.86, 1.87 sources, 1.57, 1.58
- Next message (by thread): rpms/phonon/F-10 phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.16, 1.17 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8531/F-9
Modified Files:
phonon.spec sources
Added Files:
phonon-4.3.2-gstreamer-utf8-url.patch
phonon-4.3.2-gstreamer-volumefader.patch
Log Message:
Phonon 4.3.1 + backported GStreamer patches
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/F-9/phonon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phonon.spec 26 Feb 2009 11:29:43 -0000 1.10
+++ phonon.spec 3 Mar 2009 16:54:23 -0000 1.11
@@ -1,7 +1,7 @@
Summary: Multimedia framework api
Name: phonon
-Version: 4.3.0
-Release: 5%{?dist}
+Version: 4.3.1
+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,16 @@
%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
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sun Feb 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
- put icons in the right subpkg
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 29 Jan 2009 15:51:03 -0000 1.5
+++ sources 3 Mar 2009 16:54:23 -0000 1.6
@@ -1,2 +1,2 @@
8e3924f417fea67f72b2105faed2119c gstreamer-logo.svg
-f851219ec1fb4eadc7904f053b6b498d phonon-4.3.0.tar.bz2
+767cb68052c108e95f293f30acdef3fb phonon-4.3.1.tar.bz2
- Previous message (by thread): rpms/gcalctool/devel .cvsignore, 1.56, 1.57 gcalctool.spec, 1.86, 1.87 sources, 1.57, 1.58
- Next message (by thread): rpms/phonon/F-10 phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.16, 1.17 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list