version bump; cleanup for bug #277577

(Portage version: 2.1.9.24/cvs/Linux i686)

5 files changed, 19 insertions, 88 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index 86f07e7f6c22..01c00ec4a255 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.11 2010/06/16 12:27:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.12 2010/12/23 16:28:15 hd_brummy Exp $
+
+*vdr-audiorecorder-0.1.0_pre14 (23 Dec 2010)
+
+  23 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-audiorecorder-0.1.0_pre6.ebuild,
+  +vdr-audiorecorder-0.1.0_pre14.ebuild,
+  -files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch,
+  -files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
+  , -files/vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff:
+  version bump; cleanup for bug #277577
 
   16 Jun 2010; Alexis Ballier <aballier@gentoo.org>
   vdr-audiorecorder-0.1.0_pre6.ebuild:
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch
deleted file mode 100644
index f14f92ccac32..000000000000
--- a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: audiorecorder-0.1.0-pre6/convert.c
-===================================================================
---- audiorecorder-0.1.0-pre6.orig/convert.c
-+++ audiorecorder-0.1.0-pre6/convert.c
-@@ -107,7 +107,8 @@ void cConvert::decode_mpa_frame(mpeg_aud
-                 return;
-         }
-         
--        avcodec_decode_audio(decoder_ctx, (short *)decoder_buf.data,
-+        decoder_buf.length = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+        avcodec_decode_audio2(decoder_ctx, (short *)decoder_buf.data,
-                 &decoder_buf.length, mpa_frame->data, mpa_frame->length);
- }
- 
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
deleted file mode 100644
index 77cf86c8b19e..000000000000
--- a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-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/files/vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff
deleted file mode 100644
index 71fe4ef22688..000000000000
--- a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NaurwB audiorecorder-0.1.0-pre6-1.4.5/audioreceiver.c audiorecorder-0.1.0-pre6-1.5.0/audioreceiver.c
---- audiorecorder-0.1.0-pre6-1.4.5/audioreceiver.c	2006-08-31 19:20:10.000000000 +0200
-+++ audiorecorder-0.1.0-pre6-1.5.0/audioreceiver.c	2007-01-19 17:43:51.000000000 +0100
-@@ -9,7 +9,11 @@
- /* --- cAudioReceiver ------------------------------------------------------- */
- 
- cAudioReceiver::cAudioReceiver(const cChannel *_channel) 
-+#if VDRVERSNUM >= 10500
-+:cReceiver(_channel->GetChannelID(), -2, _channel->Apid(0)), cThread()
-+#else
- :cReceiver(0, -2, _channel->Apid(0)), cThread()
-+#endif
- {
-         channel = _channel;
-         
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild
index f38998be189a..29801a6c9781 100644
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 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.7 2010/06/16 12:27:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild,v 1.1 2010/12/23 16:28:15 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin flag-o-matic
 
@@ -8,31 +10,25 @@ MY_P=${P/_pre/-pre}
 
 DESCRIPTION="VDR plugin: automatically record radio-channels and split it into tracks according to RadioText-Info"
 HOMEPAGE="http://www.a-land.de/audiorecorder/"
-SRC_URI="http://www.a-land.de/audiorecorder/${MY_P}.tgz"
+SRC_URI="http://www.zulu-entertainment.de/files/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P#vdr-}
 
-DEPEND=">=media-video/vdr-1.3.31
+DEPEND=">=media-video/vdr-1.6.0
 		media-libs/taglib
 		>=media-video/ffmpeg-0.4.9
 		"
 
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff"
-	"${FILESDIR}/${P}-avcodec52.patch" )
-
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
-	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
-		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
-	fi
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS
 }