bump; cleanup

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)

4 files changed, 96 insertions, 23 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index d7ee94db7e68..12ed1b92ccf3 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.44 2014/01/08 12:51:51 hd_brummy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.45 2015/02/08 11:00:57 hd_brummy Exp $
+
+*vdr-image-0.4.0 (08 Feb 2015)
+
+  08 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-image-0.4.0.ebuild,
+  +files/vdr-image-0.4.0-gentoo.diff, -files/rc-addon.sh:
+  bump; cleanup
 
   08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-image-0.3.0-gentoo.diff:
diff --git a/media-plugins/vdr-image/files/rc-addon.sh b/media-plugins/vdr-image/files/rc-addon.sh
deleted file mode 100644
index a70848daf0d0..000000000000
--- a/media-plugins/vdr-image/files/rc-addon.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.4 2007/04/17 09:45:24 zzam Exp $
-#
-# rc-addon plugin-startup-skript for vdr-image
-#
-
-: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh}
-: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh}
-
-plugin_pre_vdr_start() {
-	add_plugin_param "-m ${IMAGE_MOUNT}"
-	add_plugin_param "-C ${IMAGE_CONVERT}"
-	
-	if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then
-		. /usr/lib/vdr/inc/commands-functions.sh
-	else
-		#source /usr/share/vdr/inc/functions.sh
-		include commands-functions
-	fi
-
-	merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}"
-}
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff
new file mode 100644
index 000000000000..11479f2fc8a2
--- /dev/null
+++ b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff
@@ -0,0 +1,24 @@
+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 --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
new file mode 100644
index 000000000000..a1b0c75b1c5e
--- /dev/null
+++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 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.4.0.ebuild,v 1.1 2015/02/08 11:00:57 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1325" #every bump, new version
+
+DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-image"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="exif"
+
+COMMON_DEPEND=">=media-video/vdr-2
+	>=virtual/ffmpeg-9
+	>=media-libs/netpbm-10.0
+	exif? ( media-libs/libexif )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	media-tv/gentoo-vdr-scripts"
+
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	#wrong include
+	sed -e 's:<liboutput/stillimage-player.h>:"liboutput/stillimage-player.h":'\
+		-i player-image.h
+
+	# dangerous warning
+	sed -e "s:mktemp:mkstemp:" -i data-image.c
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	# ffmpeg-2.2.12, libav10
+	sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \
+		-e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:" \
+		-i liboutput/encode.c
+}
+
+src_install() {
+	vdr-plugin-2_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
+}