Added new snapshot that also can work with ffmpeg-0.4.9_p20080326, Bug #218094. Fixed quoting.

(Portage version: 2.1.5_rc5)

6 files changed, 93 insertions, 8 deletions

diff --git a/media-plugins/vdr-softplay/ChangeLog b/media-plugins/vdr-softplay/ChangeLog
index 235b2d26b636..cd6beaac79cb 100644
--- a/media-plugins/vdr-softplay/ChangeLog
+++ b/media-plugins/vdr-softplay/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-softplay
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.4 2007/07/30 16:47:41 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.5 2008/04/21 10:45:33 zzam Exp $
+
+*vdr-softplay-0.0.2.20080421 (21 Apr 2008)
+
+  21 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/ffmpeg-0.4.9_p20080326-new_header.diff, +files/ffmpeg-linking.diff,
+  vdr-softplay-0.0.2.20060815.ebuild, vdr-softplay-0.0.2.20070730.ebuild,
+  +vdr-softplay-0.0.2.20080421.ebuild:
+  Added new snapshot that also can work with ffmpeg-0.4.9_p20080326, Bug
+  #218094. Fixed quoting.
 
   30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> +files/new-ffmpeg.diff,
   vdr-softplay-0.0.2.20070730.ebuild:
diff --git a/media-plugins/vdr-softplay/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-softplay/files/ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..f6e9a88b7286
--- /dev/null
+++ b/media-plugins/vdr-softplay/files/ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,24 @@
+diff -ru softplay-cvs-20080421-orig/SoftHandles.h softplay-cvs-20080421/SoftHandles.h
+--- softplay-cvs-20080421-orig/SoftHandles.h	2008-04-21 12:05:08.228686856 +0200
++++ softplay-cvs-20080421/SoftHandles.h	2008-04-21 12:05:49.088686674 +0200
+@@ -13,7 +13,7 @@
+ #define __SOFTHANDLES_H
+ 
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #if VDRVERSNUM >= 10330
+diff -ru softplay-cvs-20080421-orig/SoftPlayer.h softplay-cvs-20080421/SoftPlayer.h
+--- softplay-cvs-20080421-orig/SoftPlayer.h	2008-04-21 12:05:08.228686856 +0200
++++ softplay-cvs-20080421/SoftPlayer.h	2008-04-21 12:05:30.288687156 +0200
+@@ -16,7 +16,7 @@
+ #include <vdr/player.h>
+ 
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include "SoftHandles.h"
diff --git a/media-plugins/vdr-softplay/files/ffmpeg-linking.diff b/media-plugins/vdr-softplay/files/ffmpeg-linking.diff
new file mode 100644
index 000000000000..3fe54b226181
--- /dev/null
+++ b/media-plugins/vdr-softplay/files/ffmpeg-linking.diff
@@ -0,0 +1,12 @@
+diff -ru softplay-cvs-20080421-orig/Makefile softplay-cvs-20080421/Makefile
+--- softplay-cvs-20080421-orig/Makefile	2008-04-21 12:13:43.118686617 +0200
++++ softplay-cvs-20080421/Makefile	2008-04-21 12:14:07.148687085 +0200
+@@ -62,7 +62,7 @@
+ 
+ ### recent ffmpegs require -lavutil: 
+ 
+-LIBS += $(shell $(CXX) $(CXXFLAGS) $(INCLUDES) getFFmpegLibs.c -o getFFmpegLibs ; ./getFFmpegLibs)
++LIBS += -lavutil
+ 
+ ### Implicit rules:
+ 
diff --git a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20060815.ebuild b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20060815.ebuild
index ce8d798cd384..d7b907767951 100644
--- a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20060815.ebuild
+++ b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20060815.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 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-softplay/vdr-softplay-0.0.2.20060815.ebuild,v 1.2 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20060815.ebuild,v 1.3 2008/04/21 10:45:33 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -26,7 +26,7 @@ S=${WORKDIR}/${VDRPLUGIN}-${MY_PV}
 src_unpack() {
 	vdr-plugin_src_unpack
 
-	cd ${S}
+	cd "${S}"
 	# Inclusion of vdr-softdevice header-files from /usr/include/vdr-softdevice
 	sed -i SoftPlayer.h -e 's#../softdevice/softdevice.h#vdr-softdevice/softdevice.h#'
 
diff --git a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild
index 60ea1916e878..36f62f42eb6a 100644
--- a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild
+++ b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.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-softplay/vdr-softplay-0.0.2.20070730.ebuild,v 1.2 2007/07/30 16:47:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild,v 1.3 2008/04/21 10:45:33 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P#vdr-}
 src_unpack() {
 	vdr-plugin_src_unpack
 
-	cd ${S}
+	cd "${S}"
 	# Inclusion of vdr-softdevice header-files from /usr/include/vdr-softdevice
 	sed -i SoftHandles.h -e 's#../softdevice/softdevice.h#vdr-softdevice/softdevice.h#'
 
diff --git a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild
new file mode 100644
index 000000000000..d1ef2e57b00b
--- /dev/null
+++ b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild,v 1.1 2008/04/21 10:45:33 zzam Exp $
+
+inherit vdr-plugin versionator
+
+MY_PV=$(get_version_component_range 4)
+MY_P=${PN}-cvs-${MY_PV}
+
+DESCRIPTION="VDR plugin: play media-files with vdr+vdr-softdevice as output device"
+HOMEPAGE="http://softdevice.berlios.de/softplay/index.html"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.20
+		>=media-plugins/vdr-softdevice-0.2.3.20060814-r1
+		>=media-video/ffmpeg-0.4.9_pre1"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P#vdr-}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	cd "${S}"
+	# Inclusion of vdr-softdevice header-files from /usr/include/vdr-softdevice
+	sed -i SoftHandles.h -e 's#../softdevice/softdevice.h#vdr-softdevice/softdevice.h#'
+
+	# ffmpeg-header-directory
+	sed -i Makefile -e 's#^LIBFFMPEG=.*$#LIBFFMPEG=/usr/include/ffmpeg#'
+
+	epatch "${FILESDIR}/ffmpeg-linking.diff"
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
+		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+	fi
+}