diff options
author | Jörg Bornkessel <hd_brummy@gentoo.org> | 2014-11-08 18:13:01 +0000 |
---|---|---|
committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2014-11-08 18:13:01 +0000 |
commit | 41dfb29c22ef4b96d0d213aea9f21e46444085ac (patch) | |
tree | d34640f62e5904e5c0b4990b53b4d29e582fccbc /media-plugins | |
parent | Remove old (diff) | |
download | gentoo-2-41dfb29c22ef4b96d0d213aea9f21e46444085ac.tar.gz gentoo-2-41dfb29c22ef4b96d0d213aea9f21e46444085ac.tar.bz2 gentoo-2-41dfb29c22ef4b96d0d213aea9f21e46444085ac.zip |
fixed wrt bug 528646, missing patch, thx to Enlik; wrt bug 314307 virtual depends
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/vdr-mp3ng/ChangeLog | 7 | ||||
-rw-r--r-- | media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog index 7066b0b7c991..a056f791f446 100644 --- a/media-plugins/vdr-mp3ng/ChangeLog +++ b/media-plugins/vdr-mp3ng/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-mp3ng # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.19 2014/01/08 18:29:40 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.20 2014/11/08 18:13:01 hd_brummy Exp $ + + 08 Nov 2014; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-mp3ng-0.0.1_pre5.ebuild: + fixed wrt bug 528646, missing patch, thx to Enlik; wrt bug 314307 virtual + depends 08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-mp3ng-0.0.1_pre4.ebuild: 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 510e26448c06..626b66dece30 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,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild,v 1.2 2014/01/08 14:40:20 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild,v 1.3 2014/11/08 18:13:01 hd_brummy Exp $ EAPI=5 @@ -28,7 +28,7 @@ DEPEND=">=media-video/vdr-1.6 sys-libs/zlib media-libs/libsndfile vorbis? ( media-libs/libvorbis ) - imagemagick? ( media-gfx/imagemagick ) + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) !imagemagick? ( media-libs/imlib2 )" src_prepare() { @@ -42,10 +42,11 @@ src_prepare() { 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:" \ + 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}/${P}-1.3.37.diff" + has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${PN}-001_pre4-1.3.37.diff" has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff" sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" |