Gentoo Archives: gentoo-commits

From:	"Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-music/files: vdr-music-0.2.0-ImageMagick-header.diff
Date:	Thu, 30 Dec 2010 00:03:34
Message-Id:	`20101230000254.D21E020057@flycatcher.gentoo.org`

1	hd_brummy 10/12/30 00:02:54
2
3	Added: vdr-music-0.2.0-ImageMagick-header.diff
4	Log:
5	fixed includes newer ImageMagick; bug 274159
6
7	(Portage version: 2.1.9.24/cvs/Linux i686)
8
9	Revision Changes Path
10	1.1 media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff?rev=1.1&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff?rev=1.1&content-type=text/plain
14
15	Index: vdr-music-0.2.0-ImageMagick-header.diff
16	===================================================================
17	diff -Naur music-0.2.0.orig/bitmap.c music-0.2.0/bitmap.c
18	--- music-0.2.0.orig/bitmap.c 2010-12-30 00:51:40.000000000 +0100
19	+++ music-0.2.0/bitmap.c 2010-12-30 00:50:33.000000000 +0100
20	@@ -10,7 +10,7 @@
21	#define X_DISPLAY_MISSING
22
23	#ifdef HAVE_MAGICK
24	-#include <Magick++.h>
25	+#include <ImageMagick/Magick++.h>
26	using namespace Magick;
27	cBitmapCache cMP3Bitmap::mCache(MP3Setup.MaxCacheFill);
28	#else
29	diff -Naur music-0.2.0.orig/Makefile music-0.2.0/Makefile
30	--- music-0.2.0.orig/Makefile 2010-12-30 00:51:40.000000000 +0100
31	+++ music-0.2.0/Makefile 2010-12-30 00:50:17.000000000 +0100
32	@@ -141,7 +141,8 @@
33
34	ifdef HAVE_MAGICK
35	DEFINES += -DHAVE_MAGICK
36	- LIBS += -lMagick -lMagick++
37	+ LIBS += $(shell Magick++-config --libs)
38	+ INCLUDES += -I/usr/include/ImageMagick
39	else
40	DEFINES += -DHAVE_IMLIB2
41	LIBS += -lImlib2

Report Message

Find on MARC Find on Google Groups