gentoo resync : 15.01.2020

4 files changed, 100 insertions, 6 deletions

diff --git a/media-plugins/vdr-mp3ng/Manifest b/media-plugins/vdr-mp3ng/Manifest
index 792a98c82ab2..bb96b0c71ebc 100644
--- a/media-plugins/vdr-mp3ng/Manifest
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -6,8 +6,10 @@ AUX vdr-mp3ng-0.0.1_pre4-gcc4.diff 806 BLAKE2B 59a25312b52283f7c5fedd89b5c77d989
 AUX vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 BLAKE2B 0e94b8114df7dd5a90d880cc55dee5be7b9a13d72421527c22e49d37c3579cedb9193f9eaac29e618f4a28a9144465aac680b5814cc0f0e786eae815574a42ba SHA512 1d3009dbf3874c44bcbd0a70ac0708351cd337f366e737abb8092e96cb9f2899678ef6a6560773980acb52a42732af3b314c3cc0777f687433033115555e6670
 AUX vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch 3319 BLAKE2B dc63234fd73f31a2f140d09252690fe3cf990dfdda2b6f7d4be4bc1428421e03a3d69f6c4bb9548bb9a62b8c3854cb9818e2af072e471cf7131f4bb68d8d5931 SHA512 358f33aa8afc87d071cc02e2a4eebba9651e032cf11ec56178175c539a2f72406307c02a888ba5653b95a6f6e29230f6ea568e262518c713c255ef724385b548
 AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1768 BLAKE2B 1feadeb440d2d616237b4bf9f6563705e6abba0a5c083428c270c390c9f9f1c7418bb25ec0e102972d37d0149963043d530b2304f396297a0ef75aaa83e7a37c SHA512 8922dc3c7a6d2f033573f0932bc4dcb050a65c7c852d8ca1112976f46f9625f178d4bfad531f91d1a2a7b7a2415b4c7e0a7d91a117c11570ec3a2f9a0bb276b6
+AUX vdr-mp3ng-0.0.1_pre5_gcc-9.patch 781 BLAKE2B b0086d4491a87616c1784a1376f598869fd5dd988fc466a81969ca7195e5a74e0b1fb86b1e343743327fb5c2349a572ce521f4f048ade126c5824b3a7f70cfde SHA512 4282ad0c7c0916bfbfff86cf41d168a185339c87d4acd50c0d9ee77833968ef8ac794098c0c4359cae90659de110ec413b93bb8fd1421ef89947568008628909
 DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 BLAKE2B e7fc0d039a97070cde24b13360862062bd7f65522ed4bf39eac039918e58b7389d84787492e5282115d62d6bd5a6654c73fc821e94438c762de94326378174f0 SHA512 537b876cf5ecdfe34969a79ec556196e48b4de1a411d7b1a50ad95c5534d5027b0d1548fb42c02cccf922f0ef961b99b1d23863b2048f12e79e0beafcd7e571f
 DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 BLAKE2B 11fa1d6e41704c45b2ea8effeb6800df84e86ac24150e0d4da91f398ec2711947c71bb60ada4a3c697520fb0c35282bccee5908466e294b7564ace7863f2a1bc SHA512 56bd73ab66276ff49670e3e7195a50b1f6560a53e88662e45d24e3bd1ffb6a7493dca3eade6ccecb887302dd4da2eb8ccc6b231ba45fbb315ace7ca3232fff99
 DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 BLAKE2B ec1afec76ccc3401ce0f6c49a44a64e4f729fbc801e2cfc33acbad01e366accc20ea75cc7d96727a78c6aa9128dec91aa0d1c0a1a30bb4b8e297507aed283c29 SHA512 f9b2e683db67f1a72b92e3a73b0f1e72132907568ec196f37f9484e076ca90bec6bd58b79438b70a3fb630badcd79b8ae1401fc911c60e5256131355c783392e
-EBUILD vdr-mp3ng-0.0.1_pre5-r2.ebuild 2002 BLAKE2B 75543eb9c14008cbef8358bee3f2b126143a3cf25bee0e899acbac74a046932939510648492f05a33fcc9e60ed425a0222b2e1a01d7ea005f58100a51b144a6f SHA512 cd0edcd7feda99617a4ed82336a2963eddf37c8ddd5f6dc50feb6e7a60c8619c2080ed050f96b68d8d19c00363bcc75a7bc5a5dbd25071921a1006de02278b6e
+EBUILD vdr-mp3ng-0.0.1_pre5-r2.ebuild 2030 BLAKE2B a6f2c82dc78d842d19b62c5342918773e77c53e604d288e0ede65d2fdea9f3befb45b195237197f8e7a0c9cda3d354252e9b971fdc91a04384c2fb8b1bcca38b SHA512 a2e808ae917a05fe038211e9f949370694d8e9c3dda8ae0d7d74c4d4b9ed72a79f945fadc8f6fe1504e55147e0863e738c8a483c9b749f329afee17ac5586bc7
+EBUILD vdr-mp3ng-0.0.1_pre5-r3.ebuild 2066 BLAKE2B 84aa6ae4ab8c18fb8e87f6d3dec7604a9b9bc70a04c3ef607f6ec2c9c48adcf4a5d2e76b8c2bfad74dbe65ce8a0251211a26fd870db8cad55ff46ad7d5ab6d4d SHA512 dfe038a754627c2da1858ada483a0247013e2293c00a56efbc2265c1e4d65b16706812c268ff03acb7015666e48acc3a63e72502b10182611022b4cd5c73a0f0
 MISC metadata.xml 500 BLAKE2B 049f10f9ae0dd1befdc0cfefe08a2b60e7bc489a360aac42d0109a66dfe955cdfc1ba061dc8d7634467d67eab76ece31be03b4bbd8de7a2592bccb3fbb95f671 SHA512 44e2c20557a743c548ff93782e55d96f10a56643cf8e60173ed182aba496506f53ccd007d234d06d99b5d266515135df4e0a25ad9c40b75adff0a489954926d4
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch
new file mode 100644
index 000000000000..e5edc26f044e
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/705372
+
+if you use use-flag oss,
+this will fix on gcc-9.x
+error: call of overloaded abs(unsigned int) is ambiguous
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 14 Jan 2020 )
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/player-mp3.c mp3ng-0.9.13-MKIV-pre3/player-mp3.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/player-mp3.c	2020-01-14 22:33:44.687155745 +0100
++++ mp3ng-0.9.13-MKIV-pre3/player-mp3.c	2020-01-14 22:35:25.490155745 +0100
+@@ -1435,7 +1435,7 @@
+         int real=sr;
+         CHECK(ioctl(fd,SNDCTL_DSP_SPEED,&real));
+         d(printf("oss: DSP samplerate now %d\n",real))
+-        if(abs(real-sr)<sr/50) {
++        if(std::abs( int(real-sr) )<sr/50) {
+           outSr=sr;
+           d(printf("mp3-oss: DSP reset done\n"))
+           return true;
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
index c64dcd95e6b9..e3887df119ec 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,16 +43,16 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
 	eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
 
-	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
-	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
+	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile || die
+	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile || die
 
 	has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
 	has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff"
 
-	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
+	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" || die
 
 	if has_version ">=media-video/vdr-2.1.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
 	fi
 }
 
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
new file mode 100644
index 000000000000..83b20cf1dcee
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2 flag-o-matic
+
+MY_PV=0.9.13-MKIV-pre3
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-0.9.13-MKIV-pre3.tar.gz
+		mirror://gentoo/${PN}-pictures-0.0.1.tar.gz
+		mirror://gentoo/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="oss vorbis"
+
+DEPEND="media-libs/imlib2
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libsndfile
+	media-video/vdr
+	sys-libs/zlib
+	vorbis? ( media-libs/libvorbis )"
+
+DOCS=(HISTORY MANUAL README README-MORONIMO examples/network.sh.example)
+
+S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# wrt bug 595248
+	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
+	eapply -p0 "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
+	eapply "${WORKDIR}/${PN}-0.0.1_pre4-span.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
+
+	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
+	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
+
+	has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
+	has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff"
+
+	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" || die
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+	fi
+
+	#wrt bug 705372
+	eapply "${FILESDIR}/${P}_gcc-9.patch"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/mp3ng
+	doins	"${FILESDIR}/mp3ngsources"
+
+	insinto /usr/share/vdr/mp3ng
+	doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg
+	doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
+
+	newbin examples/mount.sh.example mount-mp3ng.sh
+}