From a69d072f5cde4b5a6bac62e6022a69d337925e45 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 14 Jan 2013 00:06:25 -0800
Subject: Mon Jan 14 00:06:25 PST 2013

---
 community/qmmp/PKGBUILD            | 16 ++++++++++------
 community/qmmp/cdio-includes.patch | 12 ++++++++++++
 community/qmmp/qmmp.changelog      |  3 +++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 community/qmmp/cdio-includes.patch

(limited to 'community/qmmp')

diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 6e82a90ac..b8e2a1338 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,15 +1,15 @@
-#$Id: PKGBUILD 81996 2013-01-05 13:30:27Z jlichtblau $
+#$Id: PKGBUILD 82244 2013-01-13 12:33:54Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.6.5
+pkgver=0.6.6
 pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64')
 url="http://qmmp.ylsoftware.com/"
 license=('GPL')
 depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
-makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack')
+makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa')
 optdepends=('flac: native FLAC support'
             'jack: JACK sound output'
             'libmpcdec: Musepack support'
@@ -19,14 +19,19 @@ optdepends=('flac: native FLAC support'
             'libmms: MMS stream protocol support'
             'libmodplug: MOD playing library'
             'libsndfile: sampled sound support'
+            'projectm: visual efects'
             'ffmpeg' 'libsamplerate' 'wavpack')
 install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3db8a38da74ed4a8551c9215f4984f83831d5a4602e1daaf42fcb48313a73372')
+source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2
+        cdio-includes.patch)
+sha256sums=('dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99'
+            '7b3ff46dd30070cd79c5ca2dd6dfa1b9872bc09041f4bd985edf20a4333db07c')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
+#patch -Np1 -i ${srcdir}/cdio-includes.patch
+
   cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
@@ -36,4 +41,3 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
-sha256sums=('7a53af8228e0062eda5df5d34c00221587a1a3764e614b5d8b12541c2c75f080')
diff --git a/community/qmmp/cdio-includes.patch b/community/qmmp/cdio-includes.patch
new file mode 100644
index 000000000..4c471291f
--- /dev/null
+++ b/community/qmmp/cdio-includes.patch
@@ -0,0 +1,12 @@
+diff -upr qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+--- qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp	2013-01-10 21:55:55.000000000 +0200
++++ qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp	2013-01-10 21:56:26.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include <QFileInfo>
+ #include <QDir>
+ #include <cdio/cdio.h>
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #include <cdio/audio.h>
+ #include <cdio/cd_types.h>
+ #include <cdio/logging.h>
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 5e0dc389a..7a4a521d6 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.6.6-1
+
 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.6.5-1
 
-- 
cgit v1.2.3-54-g00ecf