gentoo resync : 15.01.2020

5 files changed, 196 insertions, 0 deletions

diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 15aaa089b44f..96c411739d54 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -4,6 +4,11 @@ AUX vdr-burn-0.2.2-missing-include-for-function-setpriority.patch 257 BLAKE2B fe
 AUX vdr-burn-0.2.2-r1_gentoo-path.diff 1785 BLAKE2B bf3d30e237ffdbfc646c1164f29c1502929ba239abe3e68f4f65b59bfcf35ad722060974f28b2b2dc5d85af16f9648dd04c3975b812ab84b55e172453b39a113 SHA512 dc0de52eaca3cb2cca328ed5e43347ccdfee4ee7e788d1da5f9bd3c0b2b4eed2945bd270dccd726a6d3170e019c91faaa6b80cda55e9a56dc6bad438fadaf41b
 AUX vdr-burn-0.2.2_makefile.diff 563 BLAKE2B f10f9a5b1fd1033c142d0e805fadde5e9819989749380ef51deadf2e42231c5423e8c8d72fbab2148d6af6f3f07654d990abac48451bfe8565b0021a0fa7f41c SHA512 50afaabe343ef97625776b8bfcaef8c85a11af9fb285e997c6b4c297dc0ec0079454c9d05b1e904b858704e0738aaee7e5a70b406600861fc8c1ce9887b7dd95
 AUX vdr-burn-0.2.2_setdefaults.diff 1899 BLAKE2B f0635ba1234acea63cdd70737b1310fcf09b824671cbc1451a357b44e90e000366313ef49ec5748cde5601d20ebab4e3c29c2379e732bcb4a308a6eab65289a2 SHA512 29107da7b0dd0a1b149ff326dd4e593a59a9203aabcee7ac5f0bfa204d35e863ba6d296f4f804baab8f68cc42f09649e90814e65c90578b712c38e624ae819a7
+AUX vdr-burn-0.3.0_dmh-archive.patch 526 BLAKE2B d65d2a905c546c1ada1d831331fca1f67b5412450de12cedf6da035b89f7ed6339a53196747f0a140cdbdd9585994162ef95710f093548a04779a7b6d3d5b462 SHA512 e21d7446c629e7f5870a0d50c4cadb28f4b1a4b2fa97c681422d5dcfdca32fce376678bfe67abed044db85982a0c661b2428ceba0d43b518ad55cce0901dc37b
+AUX vdr-burn-0.3.0_gentoo-path.patch 1634 BLAKE2B a84b8d41d3b79aa92c1873390069ad4c11adb57ed6c92405a672695c382a754da0a7e2114c9cef67c93dbdb1cfca16db19dd053e21506a1ed6e1e7eadcf427e8 SHA512 42480240defbb3df63ec0a4fae64d4e5b153aa36fe05d2afa5436f013ac3d5404981d9d22aded02b788c49778f0d776b5e98cefd6a9de256bc518938ac307ebd
+AUX vdr-burn-0.3.0_setdefaults.patch 1904 BLAKE2B 382d146c2d642f0c97f259983f24367619d8d14b44ab495478b8fe7ad2b14aadb06314e6fa54dd8d20cab8da96b526c2f858dc9bc884ca248b2a3a2643b77d72 SHA512 b35f067c28129e592fda788e458831ea1e7f4bf43ffacb111f75da7163ae1f74014aa320acc3c56b1f0ef320c092266603e677c98947db3432913e9c5f05409c
 DIST vdr-burn-0.2.2.tgz 253570 BLAKE2B ac31f5d056e5fc92a43f12d506b7d91fc2063cd32f4dc591dd3c71003a98d1dd117c1869c954ac32ff85efea56429473f11429738d4d475f52c46bab1788c05a SHA512 06e490ff238f35122c2bcb7b2d98500a183409c8e855748609fa43dab661cd4ef5bf492cd17ccf5c7b9b26373cb994b3e35dd20edafccfa8bf186318c8fcc346
+DIST vdr-burn-0.3.0.tgz 469211 BLAKE2B e4448f40a058e6e51834966c8a8e6f407f8a2badaa1a5517a761a65d0087ef910445f8f35225c65335ac8407c1948fb7f35ed25c0fcf098addcfccfc9bf2b8df SHA512 a2ffe264c4fb33807bcc37f69e969a61c6af5de320a4564595f1520593dddb90f62d380ab1266ca07f7f2cda8b10b45f3cff545e185dbe1b204e813d2f06ccda
 EBUILD vdr-burn-0.2.2-r1.ebuild 2951 BLAKE2B 62e3b33b145b9b5b6bd42002a7c98382f20de42b8ac5aef9adf79c49e6a70515d06effcbdf06d1470e5cefe09bdfc21365e938965224eccecb5eb7450456cee9 SHA512 ca0c9322166a8b335cd6e4d72cfb2568c3dbd23a805d17ee7f0a5746739659b26cdc0080e39ea9b07f5263e90794ad0a031ad92b1a23a86ca911c88e932a8403
+EBUILD vdr-burn-0.3.0.ebuild 2609 BLAKE2B 274d95cc616c0f98835a565dbf94e9c7b37d0e45fdb6ed2325dc76ad4485a5b1a0d8022b061a5014f21e1ebf77d72c7e5173d213edd3be8629803d4d52e82f44 SHA512 846b2f1669010068662c685c9ceaeb7d73b4e2bf5ac6bb745ebb8a85dcc8f9fc5f52762e5b697e9f40b9d32e5a3c89740e3251b6286f2658377843ec07a17d7a
 MISC metadata.xml 400 BLAKE2B 0683406aa4dc53b7f5eb0f98f0d93ac693776fcbdad8082b651f47e2a67b15b740918c26a62bb20648124573352b3d1ad1b04e381b40e981099b6579bfda5d02 SHA512 8f042c060eb2358756e19aa592dadfb351b26f9db2f4cb8c4538f0d60a84794b74d2ef1d4bf982e1bf035f4d33fac48df71db72a8a33adcaf39d89d1beb77e05
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch
new file mode 100644
index 000000000000..bd5f47853e1c
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch
@@ -0,0 +1,14 @@
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dev 2019)
+diff -Naur burn-0.3.0.orig/Makefile burn-0.3.0/Makefile
+--- burn-0.3.0.orig/Makefile	2019-12-27 17:55:11.518492713 +0100
++++ burn-0.3.0/Makefile	2019-12-27 17:55:53.903492713 +0100
+@@ -12,6 +12,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.3.0_gentoo-path.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_gentoo-path.patch
new file mode 100644
index 000000000000..6c16cdab9888
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_gentoo-path.patch
@@ -0,0 +1,45 @@
+fixed some path for gentoo
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dec 2019)
+diff -Naur burn-0.3.0.orig/burn.c burn-0.3.0/burn.c
+--- burn-0.3.0.orig/burn.c	2019-12-27 17:35:29.724492713 +0100
++++ burn-0.3.0/burn.c	2019-12-27 17:40:46.640492713 +0100
+@@ -90,12 +90,12 @@
+ 
+ 	bool plugin::Start()
+ 	{
+-        m_configPath = ConfigDirectory(PLUGIN_NAME);
++        m_configPath = "/usr/share/vdr/burn";
+         m_resourcePath = ResourceDirectory(PLUGIN_NAME);
+ 
+ 		manager::start();
+ 		logger_vdr::start();
+-		gdwrapper::setup::set_font_path( get_resource_path() + "/fonts" );
++		gdwrapper::setup::set_font_path( "/usr/share/fonts/corefonts" );
+ 		if ( !skin_list::get().load( get_resource_path() ) )
+ 			return false;
+ 
+diff -Naur burn-0.3.0.orig/scripts/vdrburn-dvd.sh burn-0.3.0/scripts/vdrburn-dvd.sh
+--- burn-0.3.0.orig/scripts/vdrburn-dvd.sh	2019-12-27 17:35:29.726492713 +0100
++++ burn-0.3.0/scripts/vdrburn-dvd.sh	2019-12-27 17:44:42.407492713 +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
+@@ -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_cli \
++				-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.3.0_setdefaults.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_setdefaults.patch
new file mode 100644
index 000000000000..ce8b968e5bc0
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_setdefaults.patch
@@ -0,0 +1,32 @@
+set default settings
+unset gentoo unsupported packages (m2vrequantizer)
+disable unneeded menuentrys
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dec 2019)
+diff -Naur burn-0.3.0.orig/setup.c burn-0.3.0/setup.c
+--- burn-0.3.0.orig/setup.c	2019-12-27 17:47:45.556492713 +0100
++++ burn-0.3.0/setup.c	2019-12-27 17:50:10.063492713 +0100
+@@ -85,10 +85,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_m2vrequantiser ),
++			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
+ 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
+ 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
+ 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
+@@ -228,8 +228,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.3.0.ebuild b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
new file mode 100644
index 000000000000..dc8e31f4c6a3
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="2028" # every bump, new version!
+
+DESCRIPTION="VDR Plugin: burn records on DVD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-burn"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="dvdarchive"
+
+DEPEND="media-libs/gd[png,truetype,jpeg]
+	media-video/vdr"
+RDEPEND="${DEPEND}
+	app-cdr/dvd+rw-tools
+	dev-libs/libcdio
+	media-fonts/corefonts
+	media-video/dvdauthor
+	media-video/mjpegtools[png]
+	media-video/projectx
+	media-video/transcode
+	virtual/eject"
+
+# depends that are not rdepend
+DEPEND="${DEPEND}
+		dev-libs/boost"
+
+S="${WORKDIR}/${P#vdr-}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply \
+		"${FILESDIR}"/${P}_gentoo-path.patch \
+		"${FILESDIR}"/${P}_setdefaults.patch \
+		"${FILESDIR}"/${P}_dmh-archive.patch
+
+	use dvdarchive && sed -i Makefile \
+		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:" || die
+
+	sed -i Makefile \
+		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:' || die
+
+	sed -i Makefile -e 's:DEFINES += -DTTXT_SUBTITLES:#DEFINES += -DTTXT_SUBTITLES:' || die
+
+	# do not install deprecated fonts, do not install in /etc/vdr/plugin config dir
+	sed -i Makefile \
+		-e "s:install-res install-conf::" || die
+
+	# ttf-bitstream-vera deprecated, bug #335782
+	sed -e "s:Vera:arial:" -i skins.c || die
+
+	# fix deprecated warnings pkg-config
+	sed -i Makefile \
+		-e "s:gdlib-config:pkg-config gdlib:" || die
+
+	fix_vdr_libsi_include scanner.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/burn
+	doins "${S}"/resource/menu-silence.mp2
+	newins "${S}"/resource/menu-button.png menu-button-default.png
+	newins "${S}"/resource/menu-bg.png menu-bg-default.png
+
+	newins "${S}"/config/ProjectX.ini projectx-vdr.ini
+
+	dosym "${EPREFIX}"menu-bg-default.png "${EPREFIX}"/usr/share/vdr/burn/menu-bg.png
+	dosym "${EPREFIX}"menu-button-default.png "${EPREFIX}"/usr/share/vdr/burn/menu-button.png
+
+	insinto /usr/share/vdr/burn/counters/
+	doins "${S}/config/counters/standard"
+
+	fowners -R vdr:vdr /usr/share/vdr/burn
+}
+
+pkg_preinst() {
+	if [[ -d ${EROOT}/etc/vdr/plugins/burn && ( ! -L ${EROOT}/etc/vdr/plugins/burn ) ]]; then
+		einfo "Moving /etc/vdr/plugins/burn away"
+		mv "${EROOT}"/etc/vdr/plugins/burn "${EROOT}"/etc/vdr/plugins/burn_old
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e ${EROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
+		eerror "\nPlease remove the following unneeded file:"
+		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf\n"
+	fi
+}