From 6a9fe58497349b90751716470143750845960214 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter@fedoraproject.org>
Date: Thu, 8 Jan 2009 21:00:00 +0000
Subject: [PATCH] - 4.2.96 but please wait for the tarballs to be released
 somewhere

---
 ...audio.patch => phonon-4.2.96-pulseaudio.patch | 16 ++++++++--------
 ....patch => phonon-4.2.96-xine-pulseaudio.patch |  8 ++++----
 phonon.spec                                      | 14 ++++++++++----
 3 files changed, 22 insertions(+), 16 deletions(-)
 rename phonon-4.2.0-pulseaudio.patch => phonon-4.2.96-pulseaudio.patch (69%)
 rename phonon-4.2.70-xine-pulseaudio.patch => phonon-4.2.96-xine-pulseaudio.patch (65%)

diff --git a/phonon-4.2.0-pulseaudio.patch b/phonon-4.2.96-pulseaudio.patch
similarity index 69%
rename from phonon-4.2.0-pulseaudio.patch
rename to phonon-4.2.96-pulseaudio.patch
index 458e605..1253402 100644
--- a/phonon-4.2.0-pulseaudio.patch
+++ b/phonon-4.2.96-pulseaudio.patch
@@ -1,7 +1,7 @@
-diff -ur phonon-4.2.0/phonon/globalconfig.cpp phonon-4.2.0-pulseaudio/phonon/globalconfig.cpp
---- phonon-4.2.0/phonon/globalconfig.cpp	2008-07-22 18:31:58.000000000 +0200
-+++ phonon-4.2.0-pulseaudio/phonon/globalconfig.cpp	2008-08-10 20:04:22.000000000 +0200
-@@ -28,6 +28,7 @@
+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>
@@ -9,8 +9,8 @@ diff -ur phonon-4.2.0/phonon/globalconfig.cpp phonon-4.2.0-pulseaudio/phonon/glo
  #include <QtCore/QVariant>
  
  QT_BEGIN_NAMESPACE
-@@ -158,6 +159,15 @@
-                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
+@@ -167,6 +168,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                      );
          }
 +        // make PulseAudio the global default (assume it is already default in this list)
@@ -25,8 +25,8 @@ diff -ur phonon-4.2.0/phonon/globalconfig.cpp phonon-4.2.0-pulseaudio/phonon/glo
          defaultList += list;
      }
  
-@@ -212,6 +222,15 @@
-                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
+@@ -222,6 +232,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                    );
          }
 +        // make PulseAudio the global default (assume it is already default in this list)
diff --git a/phonon-4.2.70-xine-pulseaudio.patch b/phonon-4.2.96-xine-pulseaudio.patch
similarity index 65%
rename from phonon-4.2.70-xine-pulseaudio.patch
rename to phonon-4.2.96-xine-pulseaudio.patch
index 40ade63..bffc87c 100644
--- a/phonon-4.2.70-xine-pulseaudio.patch
+++ b/phonon-4.2.96-xine-pulseaudio.patch
@@ -1,7 +1,7 @@
-diff -Naur phonon-4.2.70.20081022svn873961/xine/backend.cpp phonon-4.2.70.20081022svn873961.xine-pa/xine/backend.cpp
---- phonon-4.2.70.20081022svn873961/xine/backend.cpp	2008-10-17 23:48:34.000000000 +0200
-+++ phonon-4.2.70.20081022svn873961.xine-pa/xine/backend.cpp	2008-10-22 20:24:45.000000000 +0200
-@@ -627,7 +627,7 @@
+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")) {
diff --git a/phonon.spec b/phonon.spec
index 22ed2f0..3dcc162 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.2.80
-Release: 3%{?dist}
+Version: 4.2.96
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -14,8 +14,8 @@ Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 # 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
-Patch1:  phonon-4.2.70-xine-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
@@ -144,6 +144,12 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Thu Jan 08 2009 Lorenzo Villani <lvillani@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@fedoraproject.org> 4.2.80-3
 - rebuild for pkgconfig deps