Corrected calculation of requant factor. Added patch to get correct charset for vdr-1.5.

(Portage version: 2.1.3_rc6)

6 files changed, 184 insertions, 1 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 94ff5f895084..c45c2a3d10a0 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.23 2007/05/22 17:40:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.24 2007/06/30 17:19:43 zzam Exp $
+
+*vdr-burn-0.1.0_pre21-r3 (30 Jun 2007)
+
+  30 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.1.0_pre21/requantfactor.diff,
+  +files/0.1.0_pre21/charset-vdr-1.5.diff, +files/0.1.0_pre21/series,
+  +vdr-burn-0.1.0_pre21-r3.ebuild:
+  Corrected calculation of requant factor. Added patch to get correct charset
+  for vdr-1.5.
 
   22 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/0.1.0_pre21/rc-addon.sh:
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/charset-vdr-1.5.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/charset-vdr-1.5.diff
new file mode 100644
index 000000000000..e4efdd296e51
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/charset-vdr-1.5.diff
@@ -0,0 +1,20 @@
+Index: burn-0.1.0-pre21/burn.c
+===================================================================
+--- burn-0.1.0-pre21.orig/burn.c
++++ burn-0.1.0-pre21/burn.c
+@@ -45,8 +45,13 @@ namespace vdr_burn
+ 
+ 	string plugin::get_character_encoding()
+ 	{
+-#ifdef UTF8PATCH
+-		return "utf8";
++#if VDRVERSNUM >= 10503
++		if (cCharSetConv::SystemCharacterTable())
++			return cCharSetConv::SystemCharacterTable();
++		else
++			return "utf-8";
++#elif defined(UTF8PATCH)
++		return "utf-8";
+ #else
+ 		return tr("iso8859-15");
+ #endif
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/requantfactor.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/requantfactor.diff
new file mode 100644
index 000000000000..a595ab62a8ba
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/requantfactor.diff
@@ -0,0 +1,15 @@
+--- jobs.c.orig	2006-09-16 20:33:36.000000000 +0200
++++ jobs.c	2006-09-20 21:50:33.000000000 +0200
+@@ -304,10 +304,10 @@
+ 		size_pair::size_type diskFree =
+ 				size_pair::size_type( get_disk_size_mb() ) * MEGABYTE(1) - get_tracks_size( cut_, track_info::streamtype_audio );
+ 		size_pair::size_type videoSize =
+-				size_pair::size_type( double( get_tracks_size( cut_, track_info::streamtype_video ) ) * 1.06 );
++				size_pair::size_type( double( get_tracks_size( cut_, track_info::streamtype_video ) ) * 1.04 );
+ 
+ 		return videoSize > diskFree
+-				 ? double( get_tracks_size( cut_, track_info::streamtype_video ) ) / diskFree + .12
++				 ? double( videoSize ) / diskFree
+ 				 : 1;
+ 	}
+ 
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/series b/media-plugins/vdr-burn/files/0.1.0_pre21/series
new file mode 100644
index 000000000000..883c1f17be46
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/series
@@ -0,0 +1,8 @@
+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/digest-vdr-burn-0.1.0_pre21-r3 b/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r3
new file mode 100644
index 000000000000..1c12b83dff38
--- /dev/null
+++ b/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r3
@@ -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-r3.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild
new file mode 100644
index 000000000000..d6f0d66d0134
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild
@@ -0,0 +1,128 @@
+# 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-r3.ebuild,v 1.1 2007/06/30 17:19:43 zzam 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="~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}_setdefaults.diff
+		${FILESDIR}/${PV}/${P}-gentoo.diff
+		${FILESDIR}/${PV}/requantfactor.diff
+		${FILESDIR}/${PV}/charset-vdr-1.5.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-video/transcode
+		media-fonts/ttf-bitstream-vera
+		media-video/vdrtools-genindex
+		virtual/cdrtools
+		>=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
+
+	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
+
+	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
+}