Archives
Archives
| From: | "Matthias Schwarzott (zzam)" <zzam@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-text2skin/files/20070506: series 07_pkgconfig_magick.diff |
| Date: | Tue, 06 May 2008 20:35:18 |
| Message-Id: | E1JtTsZ-0007gA-SH@stork.gentoo.org |
| 1 | zzam 08/05/06 20:35:15 |
| 2 | |
| 3 | Modified: series |
| 4 | Added: 07_pkgconfig_magick.diff |
| 5 | Log: |
| 6 | Fix compile by removing old include path from Makefile to stop eclass destroying it. Find imagemagick via pkgconfig. Fixed quoting. |
| 7 | (Portage version: 2.1.5_rc6) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.3 media-plugins/vdr-text2skin/files/20070506/series |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/series?rev=1.3&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/series?rev=1.3&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/series?r1=1.2&r2=1.3 |
| 15 | |
| 16 | Index: series |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/series,v |
| 19 | retrieving revision 1.2 |
| 20 | retrieving revision 1.3 |
| 21 | diff -u -r1.2 -r1.3 |
| 22 | --- series 19 Aug 2007 12:13:12 -0000 1.2 |
| 23 | +++ series 6 May 2008 20:35:15 -0000 1.3 |
| 24 | @@ -4,3 +4,4 @@ |
| 25 | 04_no_direct_blit.diff |
| 26 | 05_vdr-1.5.4.diff |
| 27 | 06_vdr-1.5.7.diff |
| 28 | +07_pkgconfig_magick.diff |
| 29 | |
| 30 | |
| 31 | |
| 32 | 1.1 media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff |
| 33 | |
| 34 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff?rev=1.1&view=markup |
| 35 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff?rev=1.1&content-type=text/plain |
| 36 | |
| 37 | Index: 07_pkgconfig_magick.diff |
| 38 | =================================================================== |
| 39 | --- text2skin-1.1-cvs_ext-0.10/Makefile.orig 2008-05-06 22:27:03.133654132 +0200 |
| 40 | +++ text2skin-1.1-cvs_ext-0.10/Makefile 2008-05-06 22:28:19.793658721 +0200 |
| 41 | @@ -80,7 +80,8 @@ |
| 42 | |
| 43 | ifdef HAVE_IMAGEMAGICK |
| 44 | DEFINES += -DHAVE_IMAGEMAGICK |
| 45 | - LIBS += -lMagick -lMagick++ |
| 46 | + INCLUDES += $(shell pkg-config --cflags ImageMagick++) |
| 47 | + LIBS += $(shell pkg-config --libs ImageMagick++) |
| 48 | # LIBS += $(shell Magick++-config --ldflags --libs) |
| 49 | endif |
| 50 | |
| 51 | |
| 52 | |
| 53 | |
| 54 | -- |
| 55 | gentoo-commits@l.g.o mailing list |