public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jörg Bornkessel" <hd_brummy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-burn/, media-plugins/vdr-burn/files/
Date: Sun,  5 Jan 2020 13:19:47 +0000 (UTC)	[thread overview]
Message-ID: <1578230374.19fb36329fb04e92a84e9676f20d5ccb9e4eaba2.hd_brummy@gentoo> (raw)

commit:     19fb36329fb04e92a84e9676f20d5ccb9e4eaba2
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 13:18:42 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 13:19:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fb3632

media-plugins/vdr-burn: version bump

Closes: https://bugs.gentoo.org/703982
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-burn/Manifest                    |   1 +
 .../files/vdr-burn-0.3.0_dmh-archive.patch         |  14 +++
 .../files/vdr-burn-0.3.0_gentoo-path.patch         |  45 ++++++++++
 .../files/vdr-burn-0.3.0_setdefaults.patch         |  32 +++++++
 media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild       | 100 +++++++++++++++++++++
 5 files changed, 192 insertions(+)

diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 94406b2ce51..601c4107e68 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -1 +1,2 @@
 DIST vdr-burn-0.2.2.tgz 253570 BLAKE2B ac31f5d056e5fc92a43f12d506b7d91fc2063cd32f4dc591dd3c71003a98d1dd117c1869c954ac32ff85efea56429473f11429738d4d475f52c46bab1788c05a SHA512 06e490ff238f35122c2bcb7b2d98500a183409c8e855748609fa43dab661cd4ef5bf492cd17ccf5c7b9b26373cb994b3e35dd20edafccfa8bf186318c8fcc346
+DIST vdr-burn-0.3.0.tgz 469211 BLAKE2B e4448f40a058e6e51834966c8a8e6f407f8a2badaa1a5517a761a65d0087ef910445f8f35225c65335ac8407c1948fb7f35ed25c0fcf098addcfccfc9bf2b8df SHA512 a2ffe264c4fb33807bcc37f69e969a61c6af5de320a4564595f1520593dddb90f62d380ab1266ca07f7f2cda8b10b45f3cff545e185dbe1b204e813d2f06ccda

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 00000000000..bd5f47853e1
--- /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 00000000000..6c16cdab988
--- /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 00000000000..ce8b968e5bc
--- /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 00000000000..b6e88c96553
--- /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:"
+
+	sed -i Makefile \
+		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:'
+
+	sed -i Makefile -e 's:DEFINES += -DTTXT_SUBTITLES:#DEFINES += -DTTXT_SUBTITLES:'
+
+	# do not install deprecated fonts, do not install in /etc/vdr/plugin config dir
+	sed -i Makefile \
+		-e "s:install-res install-conf::"
+
+	# ttf-bitstream-vera deprecated, bug #335782
+	sed -e "s:Vera:arial:" -i skins.c
+
+	# fix deprecated warnings pkg-config
+	sed -i Makefile \
+		-e "s:gdlib-config:pkg-config gdlib:"
+
+	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
+}


                 reply	other threads:[~2020-01-05 13:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1578230374.19fb36329fb04e92a84e9676f20d5ccb9e4eaba2.hd_brummy@gentoo \
    --to=hd_brummy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox