From 600d5378dadf22b8517d52ac19500594bce4b66d Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 13 Nov 2011 23:14:59 +0000
Subject: Sun Nov 13 23:14:59 UTC 2011

---
 community/deadbeef/PKGBUILD     | 10 +++++----
 community/deadbeef/ffmpeg.patch | 45 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 community/deadbeef/ffmpeg.patch

(limited to 'community/deadbeef')

diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 8d4a63c9e..1320b04d8 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55804 2011-09-21 11:27:26Z lfleischer $
+# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64')
 url='http://deadbeef.sourceforge.net'
@@ -32,11 +32,11 @@ optdepends=('libsamplerate: for Resampler plugin'
             'libzip: for vfs_zip plugin')
 options=('!libtool')
 install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('be8359d1bd9cf7679cf2ca748996e726')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/ffmpeg.patch
 
   ./configure --prefix=/usr
   make
@@ -47,3 +47,5 @@ package () {
 
   make prefix="${pkgdir}/usr" install
 }
+md5sums=('be8359d1bd9cf7679cf2ca748996e726'
+         '6cc7623734af310095534c361c9f64e8')
diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch
new file mode 100644
index 000000000..925b84408
--- /dev/null
+++ b/community/deadbeef/ffmpeg.patch
@@ -0,0 +1,45 @@
+diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
+--- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
++++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
+@@ -140,7 +140,12 @@
+     for (i = 0; i < info->fctx->nb_streams; i++)
+     {
+         info->ctx = info->fctx->streams[i]->codec;
+-        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (info->ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             info->codec = avcodec_find_decoder (info->ctx->codec_id);
+             if (info->codec != NULL) {
+@@ -490,7 +495,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
+@@ -745,7 +755,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++			            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL)
-- 
cgit v1.2.3-54-g00ecf