From 39ffe67b5957039aa3baeda5dcc012291555d620 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 15 Jan 2013 14:03:10 +0000
Subject: [PATCH] community/mplayer-vaapi to 35107-4

---
 community/mplayer-vaapi/PKGBUILD            |  8 ++--
 community/mplayer-vaapi/cdio-includes.patch | 43 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 community/mplayer-vaapi/cdio-includes.patch

diff --git a/community/mplayer-vaapi/PKGBUILD b/community/mplayer-vaapi/PKGBUILD
index b4f63fb62..f5560b456 100644
--- a/community/mplayer-vaapi/PKGBUILD
+++ b/community/mplayer-vaapi/PKGBUILD
@@ -8,14 +8,14 @@
 
 pkgname=mplayer-vaapi
 pkgver=35107
-pkgrel=3
+pkgrel=4
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'sdl'
          'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
+         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
@@ -24,10 +24,12 @@ provides=("mplayer=$pkgver")
 conflicts=('mplayer')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+        cdio-includes.patch
         tweak-desktop-file.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
 sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
 
 build() {
diff --git a/community/mplayer-vaapi/cdio-includes.patch b/community/mplayer-vaapi/cdio-includes.patch
new file mode 100644
index 000000000..894650717
--- /dev/null
+++ b/community/mplayer-vaapi/cdio-includes.patch
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>