Version bumped.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

6 files changed, 240 insertions, 2 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 112bbb8edd79..5acc2df43d0a 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.44 2009/11/18 21:04:07 zzam Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.45 2010/02/21 21:31:43 zzam Exp $
+
+*vdr-burn-0.2.0_beta1 (21 Feb 2010)
+
+  21 Feb 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-burn-0.2.0_beta1.ebuild,
+  +files/vdr-burn-0.2.0_beta1-gentoo-paths.diff,
+  +files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff,
+  +files/vdr-burn-0.2.0_beta1-makefile.diff,
+  +files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff:
+  Version bumped.
 
   18 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
   vdr-burn-0.1.0_pre22_p1.ebuild:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
new file mode 100644
index 000000000000..ebb27bd131fe
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
@@ -0,0 +1,18 @@
+Index: burn-0.2.0-beta1/burn.c
+===================================================================
+--- burn-0.2.0-beta1.orig/burn.c
++++ burn-0.2.0-beta1/burn.c
+@@ -96,11 +96,11 @@ namespace vdr_burn
+ 
+ 	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 --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
new file mode 100644
index 000000000000..3f31bedd4cbd
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
@@ -0,0 +1,16 @@
+Index: burn-0.2.0-beta1/vdrburn-dvd.sh
+===================================================================
+--- burn-0.2.0-beta1.orig/vdrburn-dvd.sh
++++ burn-0.2.0-beta1/vdrburn-dvd.sh
+@@ -111,9 +111,8 @@ case $1 in
+ 			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_beta1-makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
new file mode 100644
index 000000000000..20c2f80fb780
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
@@ -0,0 +1,22 @@
+Index: burn-0.2.0-beta1/Makefile
+===================================================================
+--- burn-0.2.0-beta1.orig/Makefile
++++ burn-0.2.0-beta1/Makefile
+@@ -136,7 +136,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
+ 
+ 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
+@@ -169,7 +169,7 @@ clean:
+ 	@-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_beta1-setdefaults-V2.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
new file mode 100644
index 000000000000..1f6e80fd837c
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
@@ -0,0 +1,45 @@
+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>
+
+Index: burn-0.2.0-beta1/setup.c
+===================================================================
+--- burn-0.2.0-beta1.orig/setup.c
++++ burn-0.2.0-beta1/setup.c
+@@ -88,11 +88,11 @@ bool cBurnParameters::ProcessArgs(int ar
+ 	//!--- 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 ),
+@@ -120,7 +120,7 @@ bool cBurnParameters::ProcessArgs(int ar
+ 			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 ),
+@@ -204,9 +204,9 @@ bool cBurnParameters::ProcessArgs(int ar
+ 		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.2.0_beta1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild
new file mode 100644
index 000000000000..aacc953d2ae1
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2010 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_beta1.ebuild,v 1.1 2010/02/21 21:31:43 zzam Exp $
+
+EAPI="2"
+
+inherit vdr-plugin eutils
+
+MY_P="${P/_/-}"
+
+S="${WORKDIR}/${MY_P#vdr-}"
+
+DESCRIPTION="VDR: DVD Burn Plugin"
+HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=93998"
+SRC_URI="http://firefly.vdr-developer.org/patches/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="projectx"
+RESTRICT="test"
+
+DEPEND=">=media-video/vdr-1.6
+		>=dev-libs/libcdio-0.71
+		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 )"
+
+# depends that are not rdepend
+DEPEND="${DEPEND}
+		>=dev-libs/boost-1.32.0"
+
+VDR_CONFD_FILE="${FILESDIR}/confd"
+VDR_RCADDON_FILE="${FILESDIR}/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() {
+	epatch "${FILESDIR}/vdr-burn-0.2.0_beta1-makefile.diff"
+	epatch "${FILESDIR}/vdr-burn-0.2.0_beta1-gentoo-projectx.diff"
+	epatch "${FILESDIR}/vdr-burn-0.2.0_beta1-gentoo-paths.diff"
+	epatch "${FILESDIR}/vdr-burn-0.2.0_beta1-setdefaults-V2.diff"
+
+	vdr-plugin_src_prepare
+
+	cd "${S}"
+	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
+
+	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
+}