[Lunar-commits] <moonbase> phonon: Version bump to 4.6.0. Adjusting the BUILD, those are not required

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Thu Feb 16 20:40:13 CET 2012


commit 1909861e4f3800bbea172bfe18d9b0fdfd365571
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Feb 16 14:40:13 2012 -0500

    phonon: Version bump to 4.6.0. Adjusting the BUILD, those are not required
    
    with this version and adjusting DEPENDS, switching to libqzeitgeist.
---
 kde4/utils/phonon/BUILD   |    9 ---------
 kde4/utils/phonon/DEPENDS |    6 +++---
 kde4/utils/phonon/DETAILS |    6 +++---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/kde4/utils/phonon/BUILD b/kde4/utils/phonon/BUILD
index 05c9f57..01f338c 100644
--- a/kde4/utils/phonon/BUILD
+++ b/kde4/utils/phonon/BUILD
@@ -1,16 +1,7 @@
 (
 
-# This is a temporary thing. With this and qtzeitgeist installed, phonon
-# becomes confused. Remove on the next bump of phonon.
-  if module_installed libqzeitgeist ; then
-    lrm libqzeitgeist
-  fi &&
-
   export CFLAGS="$CFLAGS -fPIC" &&
 
-# This is needed to compile with pulseaudio-1.x or greater.
-  sed -i "24i #include <QtCore/qmath.h>" phonon/pulsestream.cpp &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
diff --git a/kde4/utils/phonon/DEPENDS b/kde4/utils/phonon/DEPENDS
index d6e417a..b69f8d7 100644
--- a/kde4/utils/phonon/DEPENDS
+++ b/kde4/utils/phonon/DEPENDS
@@ -2,6 +2,6 @@ depends qt4
 depends makeobj
 depends automoc
 
-optional_depends "glib-2"      "-DWITH_GLIB2=ON"       "-DWITH_GLIB2=OFF"      "for glib-2 support"
-optional_depends "pulseaudio"  "-DWITH_PulseAudio=ON"  "-DWITH_PulseAudio=OFF" "for pulseaudio audio support"
-optional_depends "qtzeitgeist" "-DWITH_QZeitgeist=ON"  "-DWITH_QZeitgeist=OFF" "for logging of activities and events (Recommended)"
+optional_depends "glib-2"        "-DWITH_GLIB2=ON"       "-DWITH_GLIB2=OFF"      "for glib-2 support"
+optional_depends "pulseaudio"    "-DWITH_PulseAudio=ON"  "-DWITH_PulseAudio=OFF" "for pulseaudio audio support"
+optional_depends "libqzeitgeist" "-DWITH_QZeitgeist=ON"  "-DWITH_QZeitgeist=OFF" "for logging of activities and events (Recommended)"
diff --git a/kde4/utils/phonon/DETAILS b/kde4/utils/phonon/DETAILS
index ea29b88..7acef46 100644
--- a/kde4/utils/phonon/DETAILS
+++ b/kde4/utils/phonon/DETAILS
@@ -1,11 +1,11 @@
           MODULE=phonon
-         VERSION=4.5.1
+         VERSION=4.6.0
           SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=$KDE_URL/stable/$MODULE/$VERSION/src
-      SOURCE_VFY=sha1:710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8
+      SOURCE_VFY=sha1:d8dbc188b58c6dd9c6a73d3742a25291e647bb95
         WEB_SITE=http://www.kde.org
          ENTERED=20080625
-         UPDATED=20120126
+         UPDATED=20120216
            SHORT="Multimedia API for KDE applications"
 
 cat << EOF


More information about the Lunar-commits mailing list