Thu Dec 3 16:31:18 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19806

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.3.50-xine_pulseaudio.patch 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
	phonon-4.3.1-xineonly.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
	phonon-4.3.2-kdebug#172242-2.patch 
	phonon-4.3.2-kdebug#172242.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
sync w/devel branch for phonon/pulseaudio goodness


phonon-4.3.50-xine_pulseaudio.patch:
 backend.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.50-xine_pulseaudio.patch ---
diff -up phonon/xine/backend.cpp.pulseaudio phonon/xine/backend.cpp
--- phonon/xine/backend.cpp.pulseaudio	2009-10-03 14:00:19.000000000 -0500
+++ phonon/xine/backend.cpp	2009-10-19 12:23:17.768923476 -0500
@@ -649,7 +649,7 @@ void Backend::checkAudioOutputs()
                             "in KDE2 and KDE3. Its use is discouraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Oct 2009 15:34:43 -0000	1.12
+++ .cvsignore	3 Dec 2009 16:31:17 -0000	1.13
@@ -6,3 +6,5 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+phonon-20091118svn.tar.bz2
+phonon-20091124svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- phonon.spec	7 Oct 2009 14:22:44 -0000	1.49
+++ phonon.spec	3 Dec 2009 16:31:18 -0000	1.50
@@ -1,12 +1,16 @@
 
+%define snap 20091124svn
+
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.1
-Release: 102%{?dist}
+Version: 4.3.50
+Release: 5.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+#Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+Source0: phonon-%{snap}.tar.bz2
+Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
@@ -17,27 +21,12 @@ Source14: hi48-phonon-gstreamer.png
 Source15: hi64-phonon-gstreamer.png
 Source16: hi128-phonon-gstreamer.png
 
-# Make PulseAudio the default when listed by the backend.
-# Note that this currently only works for the Xine backend. Device selection in
-# the GStreamer backend is weird: there is a setting for "sink" which cannot be
-# set through systemsettings, and listed devices are only those supported by the
-# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
-# 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
-Patch2:  qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
-
-## define to build phonon-backend-xine only
-#define xine_only 1
-#Patch10: phonon-4.3.1-xineonly.patch
+# Prefer PulseAudio
+# This one was easiest to port, but doesn't seem to work by itself as-is
+# maybe we can just wait for the improvie PA support to land.
+Patch1:  phonon-4.3.50-xine_pulseaudio.patch
 
 ## Upstream patches
-Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
-Patch101: phonon-4.3.2-gstreamer-volumefader.patch
-# fix for non-ascii filenames in xine backend
-Patch102: phonon-4.3.2-kdebug#172242.patch
-# escape '#' too
-Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -50,14 +39,15 @@ BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
+%if 0%{?fedora} > 11
+BuildRequires: pulseaudio-libs-devel >= 0.9.21
+%else
+%define pa_keep_old_hacks 1
+%endif
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-%if 0%{?fedora} > 11
-Requires: qt4%{?_isa} >= 4.5.2-21 
-%else
 Requires: qt4%{?_isa} >= %{_qt4_version}
-%endif
 
 %description
 %{summary}.
@@ -84,6 +74,7 @@ Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Epoch:   2
 Requires: %{name} = %{version}-%{release}
+Requires: gstreamer-plugins-good
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -92,18 +83,10 @@ Provides:  %{name}-backend-gst = %{versi
 
 
 %prep
-%setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .pulseaudio
-%patch1 -p1 -b .xine-pulseaudio
-%patch2 -p4 -b .gst-pulseaudio
-%patch100 -p0 -b .gstreamer-utf8-url
-%patch101 -p0 -b .gstreamer-volumefader
-%patch102 -p1 -b .xine_nonascii
-%patch103 -p1 -b .xine_nonascii-2
-
-# not working?  use -C .../xine hack below instead for now  -- Rex
-%if 0%{?xine_only}
-#patch10 -p1 -b .xineonly
+%setup -q -n phonon%{!?snap:-%{version}}
+
+%if 0%{?pa_keep_old_hacks}
+%patch1 -p1 -b .xine_pulseaudio
 %endif
 
 
@@ -121,6 +104,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
+# symlink for qt/phonon compatibility
+ln -s ../KDE/Phonon %{buildroot}%{_includedir}/phonon/Phonon
+
 # move the oxygen-only phonon-xine icons to hicolor
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
@@ -204,6 +190,22 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
+- backend-gstreamer: Requires: gstreamer-plugins-good
+
+* Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-4.20091124
+- ln -s ../KDE/Phonon %%_includedir/phonon/Phonon (qt/phonon compat)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-3.20091124
+- phonon-4.3.50 (20091124 snapshot)
+- enable pulseaudio integration (F-12+)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-2.20091118
+- phonon-4.3.50 (20091118 snapshot)
+
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091019
+- phonon-4.3.50 (20091019 snapshot)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
 - Requires: qt4 >= 4.5.2-21 (f12+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	3 Oct 2009 15:34:43 -0000	1.14
+++ sources	3 Dec 2009 16:31:18 -0000	1.15
@@ -1,8 +1,8 @@
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-767cb68052c108e95f293f30acdef3fb  phonon-4.3.1.tar.bz2
 60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
 7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
 0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
+0b522b42d9be2b9297ab972b861fdbb8  phonon-20091124svn.tar.bz2


--- phonon-4.2.96-pulseaudio.patch DELETED ---


--- phonon-4.2.96-xine-pulseaudio.patch DELETED ---


--- phonon-4.3.1-xineonly.patch DELETED ---


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


--- phonon-4.3.2-gstreamer-volumefader.patch DELETED ---


--- phonon-4.3.2-kdebug#172242-2.patch DELETED ---


--- phonon-4.3.2-kdebug#172242.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch DELETED ---


