* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2016-09-30 6:11 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2016-09-30 6:11 UTC (permalink / raw
To: gentoo-commits
commit: 3a059ddca5381eb7769adb3e63719e58b89f4945
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 06:11:17 2016 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 06:11:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a059ddc
media-plugins/vdr-mp3ng: fix gcc-6 compile, wrt bug 595248; fix compile >=vdr-2.1.2
Package-Manager: portage-2.3.0
media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
index 1972d64..ce1d732 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit vdr-plugin-2
+inherit vdr-plugin-2 flag-o-matic
MY_PV=0.9.13-MKIV-pre3
MY_P=${PN}-${MY_PV}
@@ -34,6 +34,9 @@ DEPEND=">=media-video/vdr-1.6
src_prepare() {
vdr-plugin-2_src_prepare
+ # wrt bug 595248
+ append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
epatch "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
epatch "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
epatch "${DISTDIR}/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
@@ -50,6 +53,10 @@ src_prepare() {
has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
+
+ if has_version ">=media-video/vdr-2.1.2"; then
+ sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2017-11-26 23:06 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2017-11-26 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 1f43dadaeabfd8a45ff244daf5b482d615ffbb1c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 12:09:51 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:06:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f43dada
media-plugins/vdr-mp3ng: [QA] Consistent whitespace in metadata.xml
media-plugins/vdr-mp3ng/metadata.xml | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/media-plugins/vdr-mp3ng/metadata.xml b/media-plugins/vdr-mp3ng/metadata.xml
index 0b68056b5a3..6e73c8bb891 100644
--- a/media-plugins/vdr-mp3ng/metadata.xml
+++ b/media-plugins/vdr-mp3ng/metadata.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- <description>
- Please contacts maintainer before you something change.
- </description>
-</maintainer>
- <longdescription>VDR Plugin to play audio files, supports mp3, wav and ogg audio format.
- You can provide and edit your own playlists.
- </longdescription>
+ <maintainer type="project">
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
+ <description>
+ Please contact maintainer before you change something.
+ </description>
+ </maintainer>
+ <longdescription>
+ VDR Plugin to play audio files, supports mp3, wav and ogg audio format.
+ You can provide and edit your own playlists.
+ </longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2019-12-11 22:43 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2019-12-11 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 4ad4e117eeb677a88ad5551cfc19554631ffe79d
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 22:42:35 2019 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 22:43:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad4e117
media-plugins/vdr-mp3ng: fixed Magick++.h: No such file or directory
removed imagemagick support, as it do not compile
with any versions of imagemagick in the tree.
plugin will still works with imlib2 support.
Bug: https://bugs.gentoo.org/590950
Closes: https://bugs.gentoo.org/590950
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
...e5-r1.ebuild => vdr-mp3ng-0.0.1_pre5-r2.ebuild} | 44 ++++++++++------------
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
similarity index 57%
rename from media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild
rename to media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
index da4eb768f83..c64dcd95e6b 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit vdr-plugin-2 flag-o-matic
MY_PV=0.9.13-MKIV-pre3
MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
-
DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
-HOMEPAGE="http://www.glaserei-franz.de/VDR/Moronimo2/vdrplugins.htm"
-SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo2/downloads/${MY_P}.tar.gz
+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="vorbis oss imagemagick"
+IUSE="oss vorbis"
-DEPEND=">=media-video/vdr-1.6
+DEPEND="media-libs/imlib2
media-libs/libmad
media-libs/libid3tag
- sys-libs/zlib
media-libs/libsndfile
- vorbis? ( media-libs/libvorbis )
- imagemagick? ( virtual/imagemagick-tools )
- !imagemagick? ( media-libs/imlib2 )"
+ 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
@@ -36,20 +37,17 @@ src_prepare() {
# wrt bug 595248
append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
- epatch "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
- epatch "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
- epatch "${DISTDIR}/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
- epatch "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
- epatch "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
+ 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
- use imagemagick && sed -i Makefile \
- -e "s:HAVE_IMLIB2:#HAVE_IMLIB2:" \
- -e "s:#HAVE_MAGICK:HAVE_MAGICK:"
- has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
- has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
+ 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:"
@@ -69,6 +67,4 @@ src_install() {
doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
newbin examples/mount.sh.example mount-mp3ng.sh
-
- dodoc HISTORY MANUAL README README-MORONIMO examples/network.sh.example
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2020-01-12 18:38 Jörg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Jörg Bornkessel @ 2020-01-12 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 9ba3fdf80e4136ed9729c4023df79a06c9a5b279
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 18:16:43 2020 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 18:38:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba3fdf8
media-plugins/vdr-mp3ng: missing die's added
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 c64dcd95e6b..e3887df119e 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
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2021-05-11 19:30 Jörg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Jörg Bornkessel @ 2021-05-11 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 35f2745302132c2211f46e92e56670fe05fa90c7
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 19:29:37 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue May 11 19:29:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f27453
media-plugins/vdr-mp3ng: compile fix
<error: ordered comparison between pointer and zero
('char *' and 'int') fixed
Closes: https://bugs.gentoo.org/740274
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild | 76 ++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild
new file mode 100644
index 00000000000..ba684b7d6a6
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+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 -e "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" -i Makefile
+ use oss && sed -e "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" -i 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
+
+ # >=vdr-2.1.2
+ sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
+
+ #wrt bug 705372
+ eapply "${FILESDIR}/${P}_gcc-9.patch"
+
+ #wrt bug 740247, 786240
+ sed -e "s:while(fgets(buffer,sizeof(buffer),f)>0:while(fgets(buffer,sizeof(buffer),f)> (char *)0:" \
+ -i data-mp3.c || die
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2021-05-13 18:16 Jörg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Jörg Bornkessel @ 2021-05-13 18:16 UTC (permalink / raw
To: gentoo-commits
commit: a7f29f1953d35c146abe7a6d2e98821ceb566dbd
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 18:15:04 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Thu May 13 18:15:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f29f19
media-plugins/vdr-mp3ng: calls g++ directly fixed
cleanup old
Closes: https://bugs.gentoo.org/789687
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild | 70 ---------------------
.../vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild | 73 ----------------------
...e5-r4.ebuild => vdr-mp3ng-0.0.1_pre5-r5.ebuild} | 3 +
3 files changed, 3 insertions(+), 143 deletions(-)
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
deleted file mode 100644
index e3887df119e..00000000000
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 || 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:" || die
-
- if has_version ">=media-video/vdr-2.1.2"; then
- sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
- fi
-}
-
-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
-}
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
deleted file mode 100644
index 83b20cf1dce..00000000000
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
-}
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
similarity index 96%
rename from media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild
rename to media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
index ba684b7d6a6..f7836ebf4e8 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
use !vorbis && sed -e "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" -i Makefile
use oss && sed -e "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" -i Makefile
+ #wrt bug 789687
+ sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i 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"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2021-08-16 21:28 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-08-16 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 2864d84a8a48cfaf72921f325696446785e57a30
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 21:13:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 21:22:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2864d84a
media-plugins/vdr-mp3ng: add missing slot operator dep (libid3tag)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
index f7836ebf4e8..becef782b2f 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
@@ -21,7 +21,7 @@ IUSE="oss vorbis"
DEPEND="media-libs/imlib2
media-libs/libmad
- media-libs/libid3tag
+ media-libs/libid3tag:=
media-libs/libsndfile
media-video/vdr
sys-libs/zlib
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/
@ 2023-12-24 23:07 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-12-24 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 7664c78db72b094eda12cb127a9e91d0d5099273
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 17 14:14:43 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 23:03:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7664c78d
media-plugins/vdr-mp3ng: add missing flag-o-matic inherit
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
index becef782b2f5..e9c1f5f5dba5 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit vdr-plugin-2
+inherit flag-o-matic vdr-plugin-2
MY_PV=0.9.13-MKIV-pre3
MY_P=${PN}-${MY_PV}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-24 23:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-26 23:06 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-12-24 23:07 Conrad Kostecki
2021-08-16 21:28 Sam James
2021-05-13 18:16 Jörg Bornkessel
2021-05-11 19:30 Jörg Bornkessel
2020-01-12 18:38 Jörg Bornkessel
2019-12-11 22:43 Joerg Bornkessel
2016-09-30 6:11 Joerg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox