add new diff, support for vdr-burn plugin included

(Portage version: 2.0.54)

4 files changed, 57 insertions, 16 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 3f3c5e16193a..3b6aab9fc34d 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.5 2006/02/04 18:40:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.6 2006/03/06 13:18:10 hd_brummy Exp $
+
+  06 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-image-0.2.5-gentoo.diff, vdr-image-0.2.5.ebuild:
+  add new diff, support for vdr-burn plugin included
 
 *vdr-image-0.2.5 (04 Feb 2006)
 
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index dab91056d367..bbeb970ce2df 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1dc7632e6f9ab3f40e48ed2473bc27a4 ChangeLog 1116
+MD5 e934aae728bdafd48fb0628141264cbc ChangeLog 1287
 MD5 adae2ccfe37f39d4a68bc1d959716d0e files/digest-vdr-image-0.2.4 67
 MD5 72bc4fe734271d52d845e97722484824 files/digest-vdr-image-0.2.5 67
 MD5 5f738db9836efeb2362cc79961d8b236 files/rc-addon.sh 664
 MD5 f2dfff6d98dce8de321be81a251c45ac files/vdr-image-0.2.4-gentoo.diff 3468
+MD5 6cdf1cbf04e79395a00e2e0893207adf files/vdr-image-0.2.5-gentoo.diff 3497
 MD5 e7055a92958497a9a028c06b8223f110 metadata.xml 439
 MD5 6c233f3c73f3a6aef576a600ba2095c8 vdr-image-0.2.4.ebuild 1324
-MD5 41c9e4ffd8c3346df8c1a98c7293c9de vdr-image-0.2.5.ebuild 1430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-Comment: no further Information
-
-iD8DBQFD5PUbdn07HTTCgIoRAo7fAKCVBU9YHr2SY2WeQD1ctYlHSjulvgCfe01T
-o7DDbaal+qklXvAw2HQ7yhE=
-=NY4N
------END PGP SIGNATURE-----
+MD5 eeef6c7d7c7616c7f7a8d2c3f479fcdb vdr-image-0.2.5.ebuild 1423
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.5-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.5-gentoo.diff
new file mode 100644
index 000000000000..6f07df90090d
--- /dev/null
+++ b/media-plugins/vdr-image/files/vdr-image-0.2.5-gentoo.diff
@@ -0,0 +1,47 @@
+diff -Naur image-0.2.5.orig/control-image.c image-0.2.5/control-image.c
+--- image-0.2.5.orig/control-image.c	2006-03-06 13:53:36.131134750 +0100
++++ image-0.2.5/control-image.c	2006-03-06 13:57:06.248266250 +0100
+@@ -617,7 +617,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.5.orig/examples/imagecmds.conf image-0.2.5/examples/imagecmds.conf
+--- image-0.2.5.orig/examples/imagecmds.conf	2006-03-06 13:53:36.131134750 +0100
++++ image-0.2.5/examples/imagecmds.conf	2006-03-06 14:10:06.753044750 +0100
+@@ -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
+diff -Naur image-0.2.5.orig/examples/imagecmds.conf.DE image-0.2.5/examples/imagecmds.conf.DE
+--- image-0.2.5.orig/examples/imagecmds.conf.DE	2006-03-06 13:53:36.131134750 +0100
++++ image-0.2.5/examples/imagecmds.conf.DE	2006-03-06 14:09:52.112129750 +0100
+@@ -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.5.orig/image.c image-0.2.5/image.c
+--- image-0.2.5.orig/image.c	2006-03-06 13:53:36.143135500 +0100
++++ image-0.2.5/image.c	2006-03-06 13:57:59.203575750 +0100
+@@ -107,7 +107,7 @@
+     return false;
+   }
+ 
+-  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf"));
++  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf"));
+   if(ImageSources.Count()<1) {
+     esyslog("imageplugin: you must have defined at least one source in imagesources.conf");
+     return false;
diff --git a/media-plugins/vdr-image/vdr-image-0.2.5.ebuild b/media-plugins/vdr-image/vdr-image-0.2.5.ebuild
index 98a0a855b670..7d43786ce1f1 100644
--- a/media-plugins/vdr-image/vdr-image-0.2.5.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5.ebuild,v 1.1 2006/02/04 18:40:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.5.ebuild,v 1.2 2006/03/06 13:18:10 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -27,7 +27,7 @@ src_unpack() {
 
 	vdr-plugin_src_unpack
 
-	epatch ${FILESDIR}/${PN}-0.2.4-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
 }