rpms/phonon/F-9 phonon-4.2.96-pulseaudio.patch, NONE, 1.1 phonon-4.2.96-xine-pulseaudio.patch, NONE, 1.1 phonon.spec, 1.6, 1.7 sources, 1.3, 1.4 phonon-4.2.0-pulseaudio.patch, 1.1, NONE

Mon Jan 26 11:10:49 UTC 2009

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32639

Modified Files:
	phonon.spec sources 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
Removed Files:
	phonon-4.2.0-pulseaudio.patch 
Log Message:
KDE 4.2.0


phonon-4.2.96-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

phonon-4.2.96-xine-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-xine-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/xine/backend.cpp phonon-4.2.96.xine-pulseaudio/xine/backend.cpp
--- phonon-4.2.96/xine/backend.cpp	2008-12-19 08:08:53.000000000 +0100
+++ phonon-4.2.96.xine-pulseaudio/xine/backend.cpp	2009-01-08 21:31:10.000000000 +0100
@@ -649,7 +649,7 @@
                             "in KDE2 and KDE3. Its use is discuraged.</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: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-9/phonon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- phonon.spec	29 Sep 2008 13:26:42 -0000	1.6
+++ phonon.spec	26 Jan 2009 11:10:18 -0000	1.7
@@ -1,41 +1,48 @@
-
 Summary: Multimedia framework api
-Name:    phonon 
-Version: 4.2.0
-Release: 5%{?dist}.1
+Name:    phonon
+Version: 4.3.0
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 # Make PulseAudio the default again 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.0-pulseaudio.patch
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: xine-lib-devel
 
-## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
-#Requires: phonon-backend-xine
 Requires: phonon-backend
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
 
 %package backend-gstreamer
 Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia 
+Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
@@ -43,6 +50,14 @@
 %description backend-gstreamer
 %{summary}.
 
+%package backend-xine
+Summary: xine phonon backend
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-backend = %{version}-%{release}
+%description backend-xine
+%{summary}.
+
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
@@ -54,8 +69,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n phonon-%{version}%{?alphatag}
 %patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .xine-pulseaudio
 
 
 %build
@@ -64,30 +80,42 @@
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+for i in 16 22 32 48 64 128; do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
+done
 
 
 %clean
-rm -rf %{buildroot} 
-
-
-%post -p /sbin/ldconfig
+rm -rf %{buildroot}
 
-%postun -p /sbin/ldconfig
 
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB 
-%{_libdir}/libphonon*.so.*
+%doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -97,6 +125,11 @@
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
 
+%files backend-xine
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
+%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/KDE
@@ -107,6 +140,50 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
+- fix typo in postun scriptlet (introduced in 4.2.96-3)
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
+- new tarball
+- put icons/scriptlets into main pkg
+- Requires: phonon-backend
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-2
+- add gstreaer-logo.svg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
+- 4.2.96
+- rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)
+- rebase phonon-4.2.70-xine-pulseaudio.patch 
+  (-> phonon-4.2.96-xine-pulseaudio.patch)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.80-3
+- rebuild for pkgconfig deps
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.80-2
+- phonon-backend-xine: don't Obsolete/Provide itself, Provides: phonon-backend
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.2.80-1
+- 4.2.80
+
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.80-0.1.20081121svn887051
+- Use subversion (4.2.80) snapshot
+- phonon-backend-xine subpkg
+- make VERBOSE=1
+- make install/fast
+- Xine backend is in phonon now, add xine-lib-devel as BR
+- BR cmake >= 2.6.0
+- forward-port xine pulseaudio patch
+
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-7
+- fix tranparent issue by convert
+
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-6
+- add missing icon
+
 * Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
 - Requires: phonon-backend-xine
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2008 13:13:31 -0000	1.3
+++ sources	26 Jan 2009 11:10:18 -0000	1.4
@@ -1 +1 @@
-de80b0f055886a6946acc7886713e23e  phonon-4.2.0.tar.bz2
+f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- phonon-4.2.0-pulseaudio.patch DELETED ---


