version bump; total rewrite of vdr-burn sources

(Portage version: 2.1.2.2)

10 files changed, 346 insertions, 1 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index bda3d7e97230..af49feb196fd 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-plugins/vdr-burn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.18 2007/04/17 12:40:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.19 2007/05/07 10:26:30 hd_brummy Exp $
+
+*vdr-burn-0.1.0_pre21-r2 (07 May 2007)
+
+  07 May 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/0.1.0_pre21/confd, +files/0.1.0_pre21/i18n.diff,
+  +files/0.1.0_pre21/menuburn.diff, +files/0.1.0_pre21/menuitems.diff,
+  +files/0.1.0_pre21/vdr-burn-0.1.0_pre21-gentoo.diff,
+  +files/0.1.0_pre21/rc-addon.sh,
+  +files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff,
+  +vdr-burn-0.1.0_pre21-r2.ebuild:
+  version bump; total rewrite of vdr-burn sources
 
   17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/rc-addon-0.0.9.sh:
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/confd b/media-plugins/vdr-burn/files/0.1.0_pre21/confd
new file mode 100644
index 000000000000..dddd41d2fb1e
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/confd
@@ -0,0 +1,27 @@
+# Global config file for vdr burn plugin
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/0.1.0_pre21/confd,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
+
+############## Global config for vdr-burn #########################
+#
+# Restart of VDR is needed after some changes
+
+# Set way to your DVD Writer Drive
+#	allowed values: directory names
+#	default: /dev/dvd
+#
+#BURN_DVDWRITER="/dev/dvd"
+
+# Set your tmp DIR where the files will be converted
+# ! >= 10 Gb free Disc Space needed
+#	allowed values: directory names
+#	default: /var/vdr/video
+#
+#BURN_DATADIR="/var/vdr/video"
+
+# Way to your not burned iso files 
+#	allowed values: directory names
+#	default: /var/vdr/video/dvd-images
+#
+#BURN_ISODIR="/var/vdr/video/dvd-images" 
+
+ 
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/i18n.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/i18n.diff
new file mode 100644
index 000000000000..8819a6f86c0d
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/i18n.diff
@@ -0,0 +1,38 @@
+--- i18n.c	2006-09-16 20:33:36.000000000 +0200
++++ i18n.c.patched	2007-01-03 13:37:08.000000000 +0100
+@@ -2,7 +2,7 @@
+  * See the files COPYING and README for copyright information and how to reach
+  * the author.
+  *
+- *  $Id: i18n.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
++ *  $Id: i18n.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
+  */
+ 
+ #include "i18n.h"
+@@ -210,7 +210,7 @@
+ #endif
+ #endif
+ 		},
+-		{ "Total size: %1$.1f MB %2$s",
++		{ "$Total size: %1$.1f MB %2$s",
+ 		  "Gesamtgröße: %1$.1f MB %2$s",
+ 		  "",
+ 		  "",
+@@ -782,7 +782,7 @@
+ #endif
+ #endif
+ 		},
+-		{ "Job active (Writing: %1$d%%)",
++		{ "$Job active (Writing: %1$d%%)",
+ 		  "Auftrag aktiv (Schreibe: %1$d%%)",
+ 		  "",
+ 		  "",
+@@ -1874,7 +1874,7 @@
+ #endif
+ #endif
+ 		},
+-		{ "Recordings: %1$d, total size: %2$.1f MB",
++		{ "$Recordings: %1$d, total size: %2$.1f MB",
+ 		  "Aufzeichnungen: %1$d, Gesamtgröße: %2$.1f MB",
+ 		  "",
+ 		  "",
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/menuburn.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/menuburn.diff
new file mode 100644
index 000000000000..46acaa6e7ad7
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/menuburn.diff
@@ -0,0 +1,29 @@
+--- menuburn.c	2006-09-16 20:33:36.000000000 +0200
++++ menuburn.c.patched	2007-01-03 13:37:41.000000000 +0100
+@@ -2,7 +2,7 @@
+  * See the files COPYING and README for copyright information and how to reach
+  * the author.
+  *
+- *  $Id: menuburn.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
++ *  $Id: menuburn.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
+  */
+ 
+ #include "common.h"
+@@ -226,7 +226,7 @@
+ 		{
+ 			const recording_list& recordings( job_.get_recordings() );
+ 			if ( recordings.size() > 0 )
+-				return str( boost::format( tr("Recordings: %1$d, total size: %2$.1f MB") )
++				return str( boost::format( tr("$Recordings: %1$d, total size: %2$.1f MB") )
+ 							% recordings.size() % ( double( job_.get_tracks_size() ) / MEGABYTE(1) ) );
+ 			else
+ 				return tr("No recordings marked for burning");
+@@ -566,7 +566,7 @@
+ 
+ 				int percent;
+ 				if (manager::get_active()->get_is_burning(percent))
+-					Add( new menu::text_item( str( boost::format( tr("Job active (Writing: %1$d%%)") ) % percent ) ) );
++					Add( new menu::text_item( str( boost::format( tr("$Job active (Writing: %1$d%%)") ) % percent ) ) );
+ 				else
+ 					Add(new menu::text_item(tr("Job active (Converting)")));
+ 
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/menuitems.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/menuitems.diff
new file mode 100644
index 000000000000..0138637d2c1f
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/menuitems.diff
@@ -0,0 +1,20 @@
+--- menuitems.c	2006-09-16 20:33:36.000000000 +0200
++++ menuitems.c.patched	2007-01-03 13:38:09.000000000 +0100
+@@ -2,7 +2,7 @@
+  * See the files COPYING and README for copyright information and how to reach
+  * the author.
+  *
+- *  $Id: menuitems.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
++ *  $Id: menuitems.diff,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
+  */
+ 
+ #include "menuitems.h"
+@@ -102,7 +102,7 @@
+ 
+ 	void size_text_item::update( bool cut_ )
+ 	{
+-		SetText( str( boost::format( tr("Total size: %1$.1f MB %2$s") )
++		SetText( str( boost::format( tr("$Total size: %1$.1f MB %2$s") )
+ 						% ( double( m_job.get_tracks_size( cut_ ) ) / MEGABYTE(1) )
+ 						% ( m_job.get_requant_factor( cut_ ) > 1 ? tr("(would be shrinked)") : "" ) ).c_str() );
+ 	}
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/rc-addon.sh b/media-plugins/vdr-burn/files/0.1.0_pre21/rc-addon.sh
new file mode 100644
index 000000000000..fbb56d3f0545
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/rc-addon.sh
@@ -0,0 +1,22 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/0.1.0_pre21/rc-addon.sh,v 1.1 2007/05/07 10:26:31 hd_brummy Exp $
+#
+# rc-addon-script for plugin burn
+#
+# Joerg Bornkessel hd_brummy@gentoo.org
+
+source /etc/conf.d/vdr.burn
+
+: ${BURN_TMPDIR:=/tmp}
+: ${BURN_DATADIR:=/var/vdr/video}
+: ${BURN_DVDWRITER:=/dev/dvd}
+: ${BURN_ISODIR:=/var/vdr/video/dvd-images}
+
+plugin_pre_vdr_start() {
+
+  add_plugin_param "-t ${BURN_TMPDIR}"
+  add_plugin_param "-d ${BURN_DATADIR}"
+  add_plugin_param "-D ${BURN_DVDWRITER}"
+  add_plugin_param "-i ${BURN_ISODIR}"
+
+}
+ 
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-gentoo.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-gentoo.diff
new file mode 100644
index 000000000000..6541721a0499
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-gentoo.diff
@@ -0,0 +1,51 @@
+diff -Naur burn-0.1.0-pre21.orig/burn.c burn-0.1.0-pre21/burn.c
+--- burn-0.1.0-pre21.orig/burn.c	2006-09-17 18:36:06.572462419 +0200
++++ burn-0.1.0-pre21/burn.c	2006-09-17 18:40:10.319695668 +0200
+@@ -80,7 +80,7 @@
+ 
+ 	bool plugin::Start()
+ 	{
+-		m_configPath = ConfigDirectory(PLUGIN_NAME);
++		m_configPath = ("/usr/share/vdr/burn");
+ 
+ 		manager::start();
+ 		logger_vdr::start();
+diff -Naur burn-0.1.0-pre21.orig/vdrburn-dvd.sh burn-0.1.0-pre21/vdrburn-dvd.sh
+--- burn-0.1.0-pre21.orig/vdrburn-dvd.sh	2006-09-17 18:36:06.732472419 +0200
++++ burn-0.1.0-pre21/vdrburn-dvd.sh	2006-09-17 18:45:42.924482170 +0200
+@@ -32,10 +32,6 @@
+ 	export JAVA_HOME=/opt/j2re1.4.2
+ fi
+ 
+-if [ -z $PROJECTX_HOME ]; then
+-	export PROJECTX_HOME=/opt/ProjectX
+-fi
+-
+ # Some versions of growisofs refuse to start when run with sudo, and may
+ # misdetect this condition if vdr itself is started from a sudo session.
+ unset SUDO_COMMAND
+@@ -75,9 +71,8 @@
+ 			CUT="-cut $MPEG_DATA_PATH/px.cut"
+ 		fi
+ 
+-		$JAVA_HOME/bin/java -Djava.awt.headless=true \
+-				-jar $PROJECTX_HOME/ProjectX.jar \
+-				-ini $CONFIG_PATH/ProjectX.ini \
++				/usr/bin/projectx_nogui \
++				-ini /usr/share/vdr/burn/projectx-vdr.ini \
+ 				$CUT -id $USED_TRACKS,0x1f,0x20 \
+ 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
+ 				$(ls "$MPEG_TMP_PATH/convert/"[0-9][0-9][0-9].vdr)
+ 
+diff -Naur burn-0.1.0-pre21.orig/burn.c burn-0.1.0-pre21/burn.c
+--- burn-0.1.0-pre21.orig/burn.c	2006-09-19 21:23:48.871275190 +0200
++++ burn-0.1.0-pre21/burn.c	2006-09-19 21:31:52.173479689 +0200
+@@ -85,7 +85,7 @@
+ 		manager::start();
+ 		logger_vdr::start();
+ 		RegisterI18n( i18n::get_phrases() );
+-		gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
++		gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
+ 		if ( !skin_list::get().load( get_config_path() ) )
+ 			return false;
+ 
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff
new file mode 100644
index 000000000000..2221658df8f9
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff
@@ -0,0 +1,25 @@
+will set a always missconfigured part to a default setup and remove
+the config part from osd plugin setup
+
+07 May 2007 ,Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur burn-0.1.0-pre21.orig/setup.c burn-0.1.0-pre21/setup.c
+--- burn-0.1.0-pre21.orig/setup.c	2007-01-16 22:57:03.078284171 +0100
++++ burn-0.1.0-pre21/setup.c	2007-01-16 22:57:45.124680261 +0100
+@@ -83,7 +83,7 @@
+ 	//!--- plugin_setup -----------------------------------------------------------
+ 
+ 	plugin_setup::plugin_setup():
+-			PROCTOOLS_INIT_PROPERTY( RemovePath,          false ),
++			PROCTOOLS_INIT_PROPERTY( RemovePath,          true ),
+ 			PROCTOOLS_INIT_PROPERTY( CustomDiskSize,      200 ),
+ 			PROCTOOLS_INIT_PROPERTY( BurnSpeed,           0 ),
+ 			PROCTOOLS_INIT_PROPERTY( DemuxType,           demuxtype_vdrsync ),
+@@ -199,7 +199,7 @@
+ 		m_defaults = job_defaults();
+ 
+ 		Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
+-		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
++//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
+ 		Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
+ 		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
+ 		Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
\ No newline at end of file
diff --git a/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2 b/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2
new file mode 100644
index 000000000000..1c12b83dff38
--- /dev/null
+++ b/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2
@@ -0,0 +1,3 @@
+MD5 11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz 257165
+RMD160 a1c838c698c71b4be626ec5e1bd089a1655f68c4 vdr-burn-0.1.0-pre21.tgz 257165
+SHA256 43bdcb6d52fc01f56cb36e865f2ed98f7a05d689c565b18de20a0a6830a68159 vdr-burn-0.1.0-pre21.tgz 257165
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild
new file mode 100644
index 000000000000..8a3413c82dcd
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild,v 1.1 2007/05/07 10:26:30 hd_brummy Exp $
+
+inherit vdr-plugin eutils
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+S="${WORKDIR}/burn-${MY_PV}"
+
+DESCRIPTION="VDR: DVD Burn Plugin"
+HOMEPAGE="http://www.xeatre.de/community/burn"
+SRC_URI="http://www.magoa.net/linux/contrib/${MY_P}.tgz"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="projectx"
+
+PATCHES="${FILESDIR}/${PV}/i18n.diff
+		${FILESDIR}/${PV}/menuburn.diff
+		${FILESDIR}/${PV}/menuitems.diff
+		${FILESDIR}/${PV}/${P}_RemovePath-fix.diff"
+
+DEPEND=">=media-video/vdr-1.4
+		>=dev-libs/libcdio-0.71
+		>=dev-libs/boost-1.32.0
+		media-libs/gd"
+
+RDEPEND=">=media-video/dvdauthor-0.6.10
+		>=media-video/mjpegtools-1.6.2
+		>=media-video/vdrsync-0.1.3_pre1-r5
+		>=media-video/m2vrequantizer-20060306
+		media-fonts/ttf-bitstream-vera
+		media-video/vdrtools-genindex
+		>=app-cdr/cdrtools-2.01.01_alpha10
+		>=app-cdr/dvd+rw-tools-5.21
+		projectx? ( >=media-video/projectx-0.90.4.00-r2 )"
+
+VDR_CONFD_FILE="${FILESDIR}/${PV}/confd"
+VDR_RCADDON_FILE="${FILESDIR}/${PV}/rc-addon.sh"
+
+pkg_setup() {
+
+	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
+		echo
+		eerror "ProjectX need an upgraded version of your Java install"
+		eerror "Please upgrade your Java/Java-config install"
+		einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
+		die "ProjectX need an upgrade of Java/Java-config"
+		echo
+	fi
+
+	if ! built_with_use media-libs/gd png truetype ; then
+		echo
+		eerror "Please recompile media-libs/gd with"
+		eerror "USE=\"png truetype\""
+		die "media-libs/gd need png and truetype support"
+	fi
+
+	vdr-plugin_pkg_setup
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	epatch ${FILESDIR}/${PV}/${P}-gentoo.diff
+
+	sed -i Makefile \
+		-e 's#^TMPDIR = .*$#TMPDIR = /tmp#' \
+		-e 's#^ISODIR=.*$#ISODIR=/var/vdr/video/dvd-images#'
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	dobin ${S}/burn-buffers
+	dobin ${S}/*.sh
+
+	insinto /usr/share/vdr/burn
+	doins ${S}/burn/menu-silence.mp2
+	newins ${S}/burn/menu-button.png menu-button-default.png
+	newins ${S}/burn/menu-bg.png menu-bg-default.png
+	dosym menu-bg-default.png /usr/share/vdr/burn/menu-bg.png
+	dosym menu-button-default.png /usr/share/vdr/burn/menu-button.png
+
+	use projectx && newins ${S}/burn/ProjectX.ini projectx-vdr.ini
+
+	if [[ ! -f ${root}/usr/share/vdr/burn/counters/standard ]]; then
+		insinto /usr/share/vdr/burn/counters
+		doins ${S}/burn/counters/standard
+	fi
+
+	fowners -R vdr:vdr /usr/share/vdr/burn
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/etc/vdr/plugins/burn && ( ! -L ${ROOT}/etc/vdr/plugins/burn ) ]]; then
+		einfo "Moving /etc/vdr/plugins/burn away"
+		mv ${ROOT}/etc/vdr/plugins/burn ${ROOT}/etc/vdr/plugins/burn_old
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	einfo "This ebuild comes only with the standard template"
+	einfo "'emerge vdr-burn-templates' for more templates"
+	einfo "To change the templates, use the vdr-image plugin"
+
+	if [[ -e ${ROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
+		echo
+		eerror "Please remove the following unneeded file:"
+		einfo "--> /etc/vdr/reccmds/reccmds.burn.conf"
+		echo
+	fi
+}