Added patch for new header location in ffmpeg-0.4.9_p20080326, Bug #218094. Fixed quoting.

(Portage version: 2.1.5_rc5)

3 files changed, 66 insertions, 6 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index 68f24ae0f6ba..5c3508de4805 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.8 2007/06/24 12:45:41 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.9 2008/04/21 10:56:40 zzam Exp $
+
+  21 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
+  , vdr-audiorecorder-0.1.0_pre6.ebuild:
+  Added patch for new header location in ffmpeg-0.4.9_p20080326, Bug
+  #218094. Fixed quoting.
 
   24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff,
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..77cf86c8b19e
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,46 @@
+Nur in audiorecorder-0.1.0-pre6: audioreceiver.o.
+diff -ru audiorecorder-0.1.0-pre6-orig/audiorecorder.c audiorecorder-0.1.0-pre6/audiorecorder.c
+--- audiorecorder-0.1.0-pre6-orig/audiorecorder.c	2008-04-21 12:48:24.858682169 +0200
++++ audiorecorder-0.1.0-pre6/audiorecorder.c	2008-04-21 12:49:40.198680861 +0200
+@@ -21,7 +21,7 @@
+ #include <iostream>
+ 
+ extern "C" {
+-        #include <ffmpeg/avcodec.h>
++        #include <libavcodec/avcodec.h>
+ }
+ 
+ 
+Nur in audiorecorder-0.1.0-pre6: audiorecorder.o.
+Nur in audiorecorder-0.1.0-pre6: browse-item.o.
+Nur in audiorecorder-0.1.0-pre6: browse.o.
+Nur in audiorecorder-0.1.0-pre6: cache.o.
+Nur in audiorecorder-0.1.0-pre6: column.o.
+diff -ru audiorecorder-0.1.0-pre6-orig/convert.h audiorecorder-0.1.0-pre6/convert.h
+--- audiorecorder-0.1.0-pre6-orig/convert.h	2008-04-21 12:48:24.858682169 +0200
++++ audiorecorder-0.1.0-pre6/convert.h	2008-04-21 12:49:22.928686427 +0200
+@@ -10,7 +10,7 @@
+ #include "a-tools.h"
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ 
+Nur in audiorecorder-0.1.0-pre6: convert.o.
+Nur in audiorecorder-0.1.0-pre6: dispatcher.o.
+Nur in audiorecorder-0.1.0-pre6: libvdr-audiorecorder.so.
+Nur in audiorecorder-0.1.0-pre6: libvdr-audiorecorder.so.1.6.0.
+Nur in audiorecorder-0.1.0-pre6: mainmenu.o.
+Nur in audiorecorder-0.1.0-pre6: mpa-frame.o.
+Nur in audiorecorder-0.1.0-pre6: postdata.o.
+Nur in audiorecorder-0.1.0-pre6: postproc.o.
+Nur in audiorecorder-0.1.0-pre6: rds.o.
+Nur in audiorecorder-0.1.0-pre6: setup.o.
+Nur in audiorecorder-0.1.0-pre6/tinyxml: tinyxmlerror.o.
+Nur in audiorecorder-0.1.0-pre6/tinyxml: tinyxml.o.
+Nur in audiorecorder-0.1.0-pre6/tinyxml: tinyxmlparser.o.
+Nur in audiorecorder-0.1.0-pre6: trackinfo.o.
+Nur in audiorecorder-0.1.0-pre6: xml-base.o.
+Nur in audiorecorder-0.1.0-pre6: xml-cache.o.
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
index 7bba7ec0be52..2f924f2ad0f9 100644
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild,v 1.4 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild,v 1.5 2008/04/21 10:56:40 zzam Exp $
 
 inherit vdr-plugin
 
@@ -24,10 +24,18 @@ DEPEND=">=media-video/vdr-1.3.31
 
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${P}-vdr-1.5.0.diff"
+PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff")
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
+		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
+	fi
+}
 
 src_install() {
 	vdr-plugin_src_install
 	keepdir /var/vdr/audiorecorder
-	chown -R vdr:vdr ${D}/var/vdr
+	chown -R vdr:vdr "${D}"/var/vdr
 }