version bump

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 215 insertions, 5 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 4df677009234..ba0d720357fc 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-burn
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.51 2011/05/29 18:35:19 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.52 2012/02/15 21:21:52 hd_brummy Exp $
+
+*vdr-burn-0.2.0 (15 Feb 2012)
+
+  15 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-burn-0.2.0_beta5-r1.ebuild, +vdr-burn-0.2.0.ebuild,
+  +files/vdr-burn-0.2.0_gentoo-path.diff, +files/vdr-burn-0.2.0_makefile.diff,
+  +files/vdr-burn-0.2.0_setdefaults.diff:
+  version bump
 
   29 May 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   files/vdr-burn-0.2.0_beta5_gentoo-path.diff:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_gentoo-path.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_gentoo-path.diff
new file mode 100644
index 000000000000..15fac268f1d9
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_gentoo-path.diff
@@ -0,0 +1,47 @@
+some path adaption to gentoo vdr
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (15 Feb 2011)
+diff -Naur burn-0.2.0.orig/burn.c burn-0.2.0/burn.c
+--- burn-0.2.0.orig/burn.c	2012-02-12 19:46:51.000000000 +0100
++++ burn-0.2.0/burn.c	2012-02-12 19:49:21.000000000 +0100
+@@ -96,11 +96,11 @@
+ 
+ 	bool plugin::Start()
+ 	{
+-		m_configPath = ConfigDirectory(PLUGIN_NAME);
++		m_configPath = "/usr/share/vdr/burn";
+ 
+ 		manager::start();
+ 		logger_vdr::start();
+-		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 -Naur burn-0.2.0.orig/vdrburn-dvd.sh burn-0.2.0/vdrburn-dvd.sh
+--- burn-0.2.0.orig/vdrburn-dvd.sh	2012-02-12 19:46:51.000000000 +0100
++++ burn-0.2.0/vdrburn-dvd.sh	2012-02-12 19:52:22.000000000 +0100
+@@ -92,9 +92,8 @@
+ 			CUT="-cut $MPEG_DATA_PATH/px.cut"
+ 		fi
+ 
+-		$IO_NICE $JAVA_EXE -Djava.awt.headless=true \
+-				-jar $PROJECTX_JAR \
+-				-ini $CONFIG_PATH/ProjectX.ini \
++				/usr/bin/projectx_nogui \
++				-ini /usr/share/vdr/burn/projectx-vdr.ini \
+ 				$TTXT_OPTS \
+ 				$CUT -id $USED_TRACKS \
+ 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
+diff -Naur burn-0.2.0.orig/vdrburn-dvd.sh burn-0.2.0/vdrburn-dvd.sh
+--- burn-0.2.0.orig/vdrburn-dvd.sh	2012-02-15 21:58:34.000000000 +0100
++++ burn-0.2.0/vdrburn-dvd.sh	2012-02-15 22:00:47.000000000 +0100
+@@ -78,7 +78,7 @@
+ 	;;
+ 
+ 	demux)
+-		[ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
++		PROJECTX_JAR="/usr/share/projectx/lib/projectx.jar"
+ 		[ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
+ 
+ 		[ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_makefile.diff
new file mode 100644
index 000000000000..837321ef6874
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_makefile.diff
@@ -0,0 +1,15 @@
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (12 Feb 2012)
+
+diff -Naur burn-0.2.0.orig/Makefile burn-0.2.0/Makefile
+--- burn-0.2.0.orig/Makefile	2012-02-12 20:21:08.000000000 +0100
++++ burn-0.2.0/Makefile	2012-02-12 20:24:33.000000000 +0100
+@@ -9,6 +9,9 @@
+ #
+ PLUGIN = burn
+ 
++# Enable DMH Archive
++#ENABLE_DMH_ARCHIVE = 1
++
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'const char\* plugin::VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_setdefaults.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_setdefaults.diff
new file mode 100644
index 000000000000..676b11a9ceb4
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_setdefaults.diff
@@ -0,0 +1,32 @@
+set default settings
+unset gentoo unsupportede packages (m2vrequantizer)
+disable unneeded menuentrys
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (12 Feb 2012)
+diff -Naur burn-0.2.0.orig/setup.c burn-0.2.0/setup.c
+--- burn-0.2.0.orig/setup.c	2012-02-12 20:14:01.000000000 +0100
++++ burn-0.2.0/setup.c	2012-02-12 20:18:10.000000000 +0100
+@@ -88,10 +88,10 @@
+ 	//!--- 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( RequantType,         requanttype_metakine ),
++			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
+ 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
+ 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
+ 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
+@@ -226,8 +226,8 @@
+ 		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::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
++//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
++//		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") ) );
+ 		Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
+ 		Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild
new file mode 100644
index 000000000000..eb2c67b27cbb
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 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.2.0.ebuild,v 1.1 2012/02/15 21:21:52 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin
+
+VERSION="832" # every bump, new version!
+
+#RESTRICT="test"
+
+DESCRIPTION="VDR Plugin: burn records on DVD"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-burn"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="dvdarchive"
+
+DEPEND=">=media-video/vdr-1.6
+		media-libs/gd[png,truetype,jpeg]"
+RDEPEND="${DEPEND}
+		>=dev-libs/libcdio-0.71
+		>=media-video/dvdauthor-0.6.14
+		>=media-video/mjpegtools-1.6.2[png]
+		media-video/transcode
+		media-fonts/ttf-bitstream-vera
+		virtual/eject
+		>=app-cdr/dvd+rw-tools-5.21
+		>=media-video/projectx-0.90.4.00_p32
+		dvdarchive? ( media-video/vdrtools-genindex )"
+
+# depends that are not rdepend
+DEPEND="${DEPEND}
+		>=dev-libs/boost-1.32.0"
+
+S="${WORKDIR}/${P#vdr-}"
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	epatch "${FILESDIR}/${P}_gentoo-path.diff"
+	epatch "${FILESDIR}/${P}_setdefaults.diff"
+	epatch "${FILESDIR}/${P}_makefile.diff"
+
+	use dvdarchive && sed -i Makefile \
+		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:"
+
+	sed -i Makefile \
+		-e 's:^TMPDIR = .*$:TMPDIR = /tmp:' \
+		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:'
+
+	fix_vdr_libsi_include scanner.c
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	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
+
+	newins "${S}"/burn/ProjectX.ini projectx-vdr.ini
+
+	fowners -R vdr:vdr /usr/share/vdr/burn
+
+	(
+		diropts -ovdr -gvdr
+		keepdir /usr/share/vdr/burn/counters
+	)
+}
+
+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() {
+
+	local DMH_FILE="${ROOT}/usr/share/vdr/burn/counters/standard"
+	if [[ ! -e "${DMH_FILE}" ]]; then
+		echo 0001 > "${DMH_FILE}"
+		chown vdr:vdr "${DMH_FILE}"
+	fi
+
+	vdr-plugin_pkg_postinst
+
+	einfo
+	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
+		eerror
+		eerror "Please remove the following unneeded file:"
+		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf"
+		eerror
+	fi
+}
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild
index d3748ed1d0a2..2a01211c56a5 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2.0_beta5-r1.ebuild,v 1.1 2011/02/13 13:16:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild,v 1.2 2012/02/15 21:21:52 hd_brummy Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="VDR Plugin: burn records on DVD"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-burn"
-SRC_URI="http://projects.vdr-developer.org/attachments/download/${VERSION}/${MY_P}.tgz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${MY_P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"