Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

phonon/01-phonon-includes.patch

@@ -1,34 +0,0 @@
---- /dev/null
-+++ b/phonon/phonon
-@@ -0,0 +1,31 @@
-+#include "abstractaudiooutput.h"
-+#include "abstractmediastream.h"
-+#include "abstractvideooutput.h"
-+#include "addoninterface.h"
-+#include "audiooutput.h"
-+#include "audiooutputinterface.h"
-+#include "backendcapabilities.h"
-+#include "backendinterface.h"
-+#include "effect.h"
-+#include "effectinterface.h"
-+#include "effectparameter.h"
-+#include "effectwidget.h"
-+#include "mediacontroller.h"
-+#include "medianode.h"
-+#include "mediaobject.h"
-+#include "mediaobjectinterface.h"
-+#include "mediasource.h"
-+#include "objectdescription.h"
-+#include "objectdescriptionmodel.h"
-+#include "path.h"
-+#include "phonondefs.h"
-+#include "phononnamespace.h"
-+#include "platformplugin.h"
-+#include "seekslider.h"
-+#include "streaminterface.h"
-+#include "videoplayer.h"
-+#include "videowidget.h"
-+#include "videowidgetinterface.h"
-+#include "volumefadereffect.h"
-+#include "volumefaderinterface.h"
-+#include "volumeslider.h"

phonon/PKGBUILD

@@ -3,20 +3,25 @@
 
 pkgname=phonon
 pkgver=4.7.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://phonon.kde.org"
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE4"
 depends=('pulseaudio' 'libqzeitgeist' 'qtwebkit')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+	     'pulsesupport.patch')
+sha256sums=('4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d'         
+            'bc3b4cc3ac171462adc3730e5f80a65bcfc082f04282ad605765f0db5954d4c7')
 
+prepare(){
+  mkdir "${srcdir}"/build
+  # patch form Comment#38 at https://bugs.kde.org/show_bug.cgi?id=324975#c38
+  patch -uN ${srcdir}/${pkgname}-${pkgver}/phonon/pulsesupport.cpp ${srcdir}/pulsesupport.patch
+}
 build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
+  cd "${srcdir}"/build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \

phonon/pulsestream.diff

@@ -1,10 +0,0 @@
---- pulsestream_old.cpp	2011-05-05 14:12:38.000000000 -0400
-+++ pulsestream.cpp	2011-10-18 14:50:39.329749419 -0400
-@@ -21,6 +21,7 @@
- */
- 
- #include "pulsestream_p.h"
-+#include <math.h>
- 
- QT_BEGIN_NAMESPACE
- 

phonon/pulsesupport.patch

@@ -0,0 +1,11 @@
+--- pulsesupport.cpp.orig	2013-12-06 18:22:44.000000000 +0800
++++ pulsesupport.cpp	2013-12-11 17:50:17.013087219 +0800
+@@ -1332,7 +1332,7 @@
+             return false;
+         }
+         pa_operation_unref(o);
+-    } else if (s_outputStreams.contains(streamUuid) && s_outputStreams[streamUuid]->index() == PA_INVALID_INDEX) {
++    } else if (s_outputStreams.contains(streamUuid) && s_outputStreams[streamUuid]->index() == PA_INVALID_INDEX && !Phonon::NotificationCategory) {
+         logMessage(QString::fromLatin1("Setting volume on an invalid stream ..... this better be intended"));
+         PulseStream *stream = s_outputStreams[streamUuid];
+         stream->setCachedVolume(volume);

vlc/PKGBUILD

@@ -1,9 +1,12 @@
-## Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
 # Contributions from ArchLinux: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/vlc
 
 pkgname=vlc
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.1.2
+pkgrel=1
 arch=('x86_64')
 url="http://www.videolan.org/vlc/"
 pkgdesc=('A multimedia player and framework that plays most multimedia files as well as DVD, Audio CD, VCD, and various streaming protocols')
@@ -47,7 +50,8 @@ categories=('multimedia')
 options=('!libtool' '!emptydirs')
 install="vlc.install"
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz")
-sha1sums=('d23823b98d4130d6668bde18715a99269d6ab3cd')
+sha1sums=('2b0ef3a3767c56d64a2815c772c8b3f865018e70')
+screenshot='http://images1.videolan.org/vlc/screenshots/0.9.2/screenshot-kde4.jpg'
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver/.a}"