summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2008-05-06 20:35:15 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2008-05-06 20:35:15 +0000
commitd382a53fb68da567439b08c053d1b4777aa8340a (patch)
tree867dd7453d2dfdcbd5fd236ed03f865ff7ed8385 /media-plugins/vdr-text2skin/files
parentremove myself from metadata.xml for dev-dotnet/xsp (diff)
downloadgentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.tar.gz
gentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.tar.bz2
gentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.zip
Fix compile by removing old include path from Makefile to stop eclass destroying it. Find imagemagick via pkgconfig. Fixed quoting.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'media-plugins/vdr-text2skin/files')
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff12
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/series1
2 files changed, 13 insertions, 0 deletions
diff --git a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
new file mode 100644
index 000000000000..0466fe2fc38b
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
@@ -0,0 +1,12 @@
+--- text2skin-1.1-cvs_ext-0.10/Makefile.orig 2008-05-06 22:27:03.133654132 +0200
++++ text2skin-1.1-cvs_ext-0.10/Makefile 2008-05-06 22:28:19.793658721 +0200
+@@ -80,7 +80,8 @@
+
+ ifdef HAVE_IMAGEMAGICK
+ DEFINES += -DHAVE_IMAGEMAGICK
+- LIBS += -lMagick -lMagick++
++ INCLUDES += $(shell pkg-config --cflags ImageMagick++)
++ LIBS += $(shell pkg-config --libs ImageMagick++)
+ # LIBS += $(shell Magick++-config --ldflags --libs)
+ endif
+
diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series
index d163a73f63ab..6c4b49da5bda 100644
--- a/media-plugins/vdr-text2skin/files/20070506/series
+++ b/media-plugins/vdr-text2skin/files/20070506/series
@@ -4,3 +4,4 @@
04_no_direct_blit.diff
05_vdr-1.5.4.diff
06_vdr-1.5.7.diff
+07_pkgconfig_magick.diff