added svn snapshot 26, to fix problems with new ffmpeg api changes

Package-Manager: portage-2.1.4.5

3 files changed, 120 insertions, 1 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 4eb4f315a030..db5699ca1558 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.26 2008/07/03 11:08:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.27 2008/10/25 22:19:26 hd_brummy Exp $
+
+*vdr-image-0.2.7.26 (25 Oct 2008)
+
+  25 Oct 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-image-0.2.7.26-gentoo.diff, +vdr-image-0.2.7.26.ebuild:
+  added svn snapshot 26, to fix problems with new ffmpeg api changes
 
   03 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-image-0.2.7-r1.ebuild:
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff
new file mode 100644
index 000000000000..76e1e13ac00e
--- /dev/null
+++ b/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff
@@ -0,0 +1,48 @@
+diff -Naur image-0.2.7.26.orig/control-image.c image-0.2.7.26/control-image.c
+--- image-0.2.7.26.orig/control-image.c	2008-10-25 23:48:18.000000000 +0200
++++ image-0.2.7.26/control-image.c	2008-10-25 23:49:01.000000000 +0200
+@@ -606,7 +606,7 @@
+       return osContinue;
+       
+     // Load additional Commands
+-    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf"));
++    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf"));
+   
+     if(pCmd->Count() <= 0)  {
+       delete pCmd;
+diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf
+--- image-0.2.7.26.orig/examples/imagecmds.conf	2008-10-25 23:48:18.000000000 +0200
++++ image-0.2.7.26/examples/imagecmds.conf	2008-10-25 23:50:53.000000000 +0200
+@@ -20,3 +20,5 @@
+ Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+ Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+ Delete picture                                          ?: rm -f %s
++Change burn template									 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
++Change burn template ( Button )							 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
+\ Kein Zeilenumbruch am Dateiende.
+diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE
+--- image-0.2.7.26.orig/examples/imagecmds.conf.DE	2008-10-25 23:48:18.000000000 +0200
++++ image-0.2.7.26/examples/imagecmds.conf.DE	2008-10-25 23:55:49.000000000 +0200
+@@ -11,6 +11,8 @@
+ Informationen über das Bild                              : identify -verbose
+ Größe des Bildes                                         : du -chs %s
+ Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
+-Rotatiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+-Rotatiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
++Rotiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
++Rotiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+ Lösche Bild                                             ?: rm -f %s
++Hintergrund vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
++Button vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
+diff -Naur image-0.2.7.26.orig/image.c image-0.2.7.26/image.c
+--- image-0.2.7.26.orig/image.c	2008-10-25 23:48:18.000000000 +0200
++++ image-0.2.7.26/image.c	2008-10-25 23:53:43.000000000 +0200
+@@ -102,7 +102,7 @@
+     return false;
+   }
+   
+-  cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf");
++  cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf");
+   ImageSources.Load(szConfSource);
+   if(ImageSources.Count()<1) {
+     const char* sz = szConfSource;
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild
new file mode 100644
index 000000000000..bda64ecff6dd
--- /dev/null
+++ b/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild,v 1.1 2008/10/25 22:19:26 hd_brummy Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
+HOMEPAGE="http://vdr-image.berlios.de/"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="exif"
+
+COMMON_DEPEND=">=media-video/vdr-1.3.38
+	>=media-video/ffmpeg-0.4.8_p20080326
+	>=media-libs/netpbm-10.0
+	exif? ( media-libs/libexif )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-tv/gentoo-vdr-scripts-0.2.2"
+
+BUILD_PARAMS="-j1"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
+	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
+		BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
+	fi
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto /etc/vdr/imagecmds
+	newins examples/imagecmds.conf imagecmds.example.conf
+	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
+
+	insinto /etc/vdr/plugins/image
+	doins examples/imagesources.conf
+
+	into /usr/share/vdr/image
+	dobin scripts/imageplugin.sh
+	newbin scripts/mount.sh mount-image.sh
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	elog "Also check /etc/vdr/plugins/image/imagesources.conf"
+	echo
+	elog "Multilanguage will automaticly supported, just take a look in"
+	elog "/etc/vdr/imagecmds/* how it works"
+	elog "By the moment only EN + DE"
+	echo
+}