beta5 bump

(Portage version: 2.1.9.25/cvs/Linux i686)

7 files changed, 233 insertions, 9 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index caec21fcd666..27e343cbe862 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,16 @@
 # 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.48 2011/01/28 17:53:27 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.49 2011/02/02 19:59:18 hd_brummy Exp $
+
+*vdr-burn-0.2.0_beta5 (02 Feb 2011)
+
+  02 Feb 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-burn-0.2.0_beta5.ebuild,
+  +files/vdr-burn-0.2.0_beta5_gentoo-path.diff,
+  +files/vdr-burn-0.2.0_beta5_makefile.diff,
+  +files/vdr-burn-0.2.0_beta5_setdefaults.diff, files/rc-addon.sh,
+  metadata.xml:
+  beta5 bump
 
   28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-burn-0.1.0_pre21-r6.ebuild, vdr-burn-0.1.0_pre22_p1.ebuild,
diff --git a/media-plugins/vdr-burn/files/rc-addon.sh b/media-plugins/vdr-burn/files/rc-addon.sh
index cc6f96a03ab8..cbae3df78647 100644
--- a/media-plugins/vdr-burn/files/rc-addon.sh
+++ b/media-plugins/vdr-burn/files/rc-addon.sh
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh,v 1.3 2009/10/10 10:07:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh,v 1.4 2011/02/02 19:59:18 hd_brummy Exp $
 #
 # rc-addon-script for plugin burn
 #
@@ -13,11 +13,11 @@
 
 # be shure BURN_ISODIR is available!
 make_isodir() {
-if [ ! -e "${BURN_ISODIR}" ]; then
-	mkdir "${BURN_ISODIR}"
-	touch "${BURN_ISODIR}"/.keep.rc-burn
-	chown -R vdr:vdr "${BURN_ISODIR}"
-fi
+	if [ ! -e "${BURN_ISODIR}" ]; then
+		mkdir "${BURN_ISODIR}"
+		touch "${BURN_ISODIR}"/.keep.rc-burn
+		chown -R vdr:vdr "${BURN_ISODIR}"
+	fi
 }
 
 make_isodir
@@ -28,6 +28,5 @@ plugin_pre_vdr_start() {
   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/vdr-burn-0.2.0_beta5_gentoo-path.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
new file mode 100644
index 000000000000..2d92f5d4cad2
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
@@ -0,0 +1,35 @@
+some path adaption to gentoo
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
+diff -Naur burn-0.2.0-beta5.orig/burn.c burn-0.2.0-beta5/burn.c
+--- burn-0.2.0-beta5.orig/burn.c	2011-02-02 01:04:23.000000000 +0100
++++ burn-0.2.0-beta5/burn.c	2011-02-02 01:10:36.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-beta5.orig/vdrburn-dvd.sh burn-0.2.0-beta5/vdrburn-dvd.sh
+--- burn-0.2.0-beta5.orig/vdrburn-dvd.sh	2011-02-02 01:04:23.000000000 +0100
++++ burn-0.2.0-beta5/vdrburn-dvd.sh	2011-02-02 01:07:21.000000000 +0100
+@@ -113,9 +113,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
+ 				$TTXT_OPTS \
+ 				$CUT -id $USED_TRACKS \
+ 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
new file mode 100644
index 000000000000..99c29aa4d7f9
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
@@ -0,0 +1,34 @@
+fix for fails to build with parallel make
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
+diff -Naur burn-0.2.0-beta5.orig/Makefile burn-0.2.0-beta5/Makefile
+--- burn-0.2.0-beta5.orig/Makefile	2011-02-02 01:32:42.000000000 +0100
++++ burn-0.2.0-beta5/Makefile	2011-02-02 01:34:20.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')
+@@ -144,7 +147,7 @@
+ 
+ SUBDIRS:
+ 	@for dir in $(SUBDIRS); do \
+-		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
++		$(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
+ 	done
+ 
+ libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
+@@ -176,7 +179,7 @@
+ 	@-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
+ 		scan-test test t/*.o
+ 	@for dir in $(SUBDIRS); do \
+-		make -C $$dir clean ; \
++		$(MAKE) -C $$dir clean ; \
+ 	done
+ 
+ ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
new file mode 100644
index 000000000000..c0973eec2e80
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
@@ -0,0 +1,34 @@
+set default settings
+unset gentoo unsupportede packages (m2vrequantizer)
+disable unneeded menuentrys
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
+diff -Naur burn-0.2.0-beta5.orig/setup.c burn-0.2.0-beta5/setup.c
+--- burn-0.2.0-beta5.orig/setup.c	2011-02-02 01:16:48.000000000 +0100
++++ burn-0.2.0-beta5/setup.c	2011-02-02 01:22:35.000000000 +0100
+@@ -88,11 +88,11 @@
+ 	//!--- 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_projectx ),
+-			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 ),
+@@ -217,9 +217,9 @@
+ 		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::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/metadata.xml b/media-plugins/vdr-burn/metadata.xml
index 907ab069be2f..1573b4e12d73 100644
--- a/media-plugins/vdr-burn/metadata.xml
+++ b/media-plugins/vdr-burn/metadata.xml
@@ -10,5 +10,6 @@
 	<use>
 		<flag name='projectx'>Enables support for
 			<pkg>media-video/projectx</pkg></flag>
+		<flag name='dvdarchive'>DMH DVD - Archive</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5.ebuild
new file mode 100644
index 000000000000..af9ef3defe78
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/02/02 19:59:18 hd_brummy Exp $
+
+EAPI="3"
+
+inherit vdr-plugin versionator
+
+VERSION="437" # every bump, new version!
+
+RESTRICT="test"
+
+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"
+
+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.10
+		>=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}/${MY_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}"/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
+
+	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
+}