new setdefault.diff, removed all mekakine/m2vrequant crap

(Portage version: 2.1.6.7/cvs/Linux i686)

5 files changed, 179 insertions, 34 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index b0d44f0456e3..bfc1c8fb8fc9 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-burn
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.37 2009/03/12 02:23:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.38 2009/03/12 03:15:34 hd_brummy Exp $
+
+*vdr-burn-0.1.0_pre21-r6 (12 Mar 2009)
+
+  12 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff,
+  -files/0.1.0_pre21/series,
+  +files/0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults-V2.diff,
+  +vdr-burn-0.1.0_pre21-r6.ebuild:
+  new setdefault.diff, removed all mekakine/m2vrequant crap
 
   12 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   files/0.1.0_pre21/rc-addon.sh:
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/series b/media-plugins/vdr-burn/files/0.1.0_pre21/series
deleted file mode 100644
index 883c1f17be46..000000000000
--- a/media-plugins/vdr-burn/files/0.1.0_pre21/series
+++ /dev/null
@@ -1,8 +0,0 @@
-i18n.diff -p0
-menuburn.diff -p0
-menuitems.diff -p0
-vdr-burn-0.1.0_pre21_setdefaults.diff
-vdr-burn-0.1.0_pre21-gentoo.diff
-requantfactor.diff -p0
-charset-vdr-1.5.diff
-
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
deleted file mode 100644
index 2221658df8f9..000000000000
--- a/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_RemovePath-fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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/0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults-V2.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults-V2.diff
new file mode 100644
index 000000000000..4039d1a43a48
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults-V2.diff
@@ -0,0 +1,44 @@
+will set a always missconfigured part to a default setup 
+remove the config part (RemovePath, RequantTyp)
+from osd plugin setup 
+
+12 Mar 2009 ,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	2009-03-12 03:33:46.387393024 +0100
++++ burn-0.1.0-pre21/setup.c	2009-03-12 03:37:56.204037636 +0100
+@@ -83,11 +83,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_vdrsync ),
+-			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 ),
+@@ -115,7 +115,7 @@
+ 			PROCTOOLS_INIT_PROPERTY( SkinIndex,           0 ),
+ 			PROCTOOLS_INIT_PROPERTY( ChaptersMode,        chaptersmode_10 ),
+ 			PROCTOOLS_INIT_PROPERTY( StoreMode,           storemode_burn ),
+-			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      true ),
++			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      false ),
+ 			PROCTOOLS_INIT_PROPERTY( DiskSize,            disksize_singlelayer ),
+ 			PROCTOOLS_INIT_PROPERTY( CutOnDemux,          false ),
+ 			PROCTOOLS_INIT_PROPERTY( SkipTitlemenu,       true ),
+@@ -199,9 +199,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/vdr-burn-0.1.0_pre21-r6.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild
new file mode 100644
index 000000000000..2256a7171d34
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2009 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-r6.ebuild,v 1.1 2009/03/12 03:15:34 hd_brummy Exp $
+
+EAPI="2"
+
+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="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="projectx"
+
+PATCHES=("${FILESDIR}/${PV}/i18n.diff"
+	"${FILESDIR}/${PV}/menuburn.diff"
+	"${FILESDIR}/${PV}/menuitems.diff"
+	"${FILESDIR}/${PV}/${P}-gentoo.diff"
+	"${FILESDIR}/${PV}/${P}_setdefaults-V2.diff"
+	"${FILESDIR}/${PV}/requantfactor.diff"
+	"${FILESDIR}/${PV}/charset-vdr-1.5.diff"
+	"${FILESDIR}/${PV}/${P}-gcc43.patch")
+
+DEPEND=">=media-video/vdr-1.4
+		>=dev-libs/libcdio-0.71
+		>=dev-libs/boost-1.32.0
+		media-libs/gd[png,truetype,jpeg]"
+
+RDEPEND="${DEPEND}
+		>=media-video/dvdauthor-0.6.10
+		>=media-video/mjpegtools-1.6.2[png]
+		>=media-video/vdrsync-0.1.3_pre1-r5
+		media-video/transcode
+		media-fonts/ttf-bitstream-vera
+		media-video/vdrtools-genindex
+		virtual/eject
+		virtual/cdrtools
+		>=app-cdr/dvd+rw-tools-5.21
+		projectx? ( >=media-video/projectx-0.90.4.00-r3 )"
+
+VDR_CONFD_FILE="${FILESDIR}/${PV}/confd"
+VDR_RCADDON_FILE="${FILESDIR}/${PV}/rc-addon.sh"
+
+pkg_setup() {
+	local error=0
+
+	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
+		eerror
+		eerror "ProjectX need an upgraded version of your Java install"
+		eerror "Please upgrade your Java/Java-config install"
+		eerror "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+		eerror
+		die "Requirements not satisfied"
+	fi
+
+	vdr-plugin_pkg_setup
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+	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
+
+	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
+}