diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2010-12-30 00:02:54 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2010-12-30 00:02:54 +0000 |
| commit | 934738495153af97172275fcb883891ec52205ed (patch) | |
| tree | 2c93eabf6d274d5e7d951ce2895692b0b9ef8915 /media-plugins/vdr-music | |
| parent | Avoid test failures with root permissions. (diff) | |
| download | gentoo-2-934738495153af97172275fcb883891ec52205ed.tar.gz gentoo-2-934738495153af97172275fcb883891ec52205ed.tar.bz2 gentoo-2-934738495153af97172275fcb883891ec52205ed.zip | |
fixed includes newer ImageMagick; bug 274159
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-music')
| -rw-r--r-- | media-plugins/vdr-music/ChangeLog | 8 | ||||
| -rw-r--r-- | media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff | 25 | ||||
| -rw-r--r-- | media-plugins/vdr-music/vdr-music-0.2.0.ebuild | 7 |
3 files changed, 35 insertions, 5 deletions
diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog index 14546d471a9c..05f9ba4accc1 100644 --- a/media-plugins/vdr-music/ChangeLog +++ b/media-plugins/vdr-music/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-music -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.9 2009/11/06 17:33:17 caster Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.10 2010/12/30 00:02:54 hd_brummy Exp $ + + 30 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-music-0.2.0.ebuild, +files/vdr-music-0.2.0-ImageMagick-header.diff: + fixed includes newer ImageMagick; bug 274159 06 Nov 2009; Vlastimil Babka <caster@gentoo.org> vdr-music-0.2.0.ebuild: Depend on virtual/jre instead of hardwired blackdown-jre diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff new file mode 100644 index 000000000000..2dc217633aa1 --- /dev/null +++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff @@ -0,0 +1,25 @@ +diff -Naur music-0.2.0.orig/bitmap.c music-0.2.0/bitmap.c +--- music-0.2.0.orig/bitmap.c 2010-12-30 00:51:40.000000000 +0100 ++++ music-0.2.0/bitmap.c 2010-12-30 00:50:33.000000000 +0100 +@@ -10,7 +10,7 @@ + #define X_DISPLAY_MISSING + + #ifdef HAVE_MAGICK +-#include <Magick++.h> ++#include <ImageMagick/Magick++.h> + using namespace Magick; + cBitmapCache cMP3Bitmap::mCache(MP3Setup.MaxCacheFill); + #else +diff -Naur music-0.2.0.orig/Makefile music-0.2.0/Makefile +--- music-0.2.0.orig/Makefile 2010-12-30 00:51:40.000000000 +0100 ++++ music-0.2.0/Makefile 2010-12-30 00:50:17.000000000 +0100 +@@ -141,7 +141,8 @@ + + ifdef HAVE_MAGICK + DEFINES += -DHAVE_MAGICK +- LIBS += -lMagick -lMagick++ ++ LIBS += $(shell Magick++-config --libs) ++ INCLUDES += -I/usr/include/ImageMagick + else + DEFINES += -DHAVE_IMLIB2 + LIBS += -lImlib2 diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild index 811918947046..baaf70dabedd 100644 --- a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild +++ b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.7 2009/11/06 17:33:17 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.8 2010/12/30 00:02:54 hd_brummy Exp $ EAPI="2" @@ -19,7 +19,8 @@ PATCHES=( "${FILESDIR}/${P}-gentoo.diff" "${FILESDIR}/${P}-vdr-1.5.x.diff" "${FILESDIR}/${P}-lyrics.diff" "${FILESDIR}/${P}-gcc4.3.diff" - "${FILESDIR}/${P}-glibc-2.10.patch" ) + "${FILESDIR}/${P}-glibc-2.10.patch" + "${FILESDIR}/${P}-ImageMagick-header.diff" ) DEPEND=">=media-video/vdr-1.3.30 media-libs/libmad |