summarylogtreecommitdiffstats
path: root/gem-magick6-fixes.patch
diff options
context:
space:
mode:
authorAlbert Graef2018-03-24 07:23:46 +0100
committerAlbert Graef2018-03-24 07:23:46 +0100
commit6df8ce5e6b8473793fb26b325765f628383cd247 (patch)
tree745ed0290657f6ffa20db82f24a2f83e454ecef3 /gem-magick6-fixes.patch
parentdd2b2db12a47b49b2a450d16fff63d1b6ec46d16 (diff)
downloadaur-6df8ce5e6b8473793fb26b325765f628383cd247.tar.gz
Latest upstream.
Diffstat (limited to 'gem-magick6-fixes.patch')
-rw-r--r--gem-magick6-fixes.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/gem-magick6-fixes.patch b/gem-magick6-fixes.patch
index 6f1eb8abe5f1..13a4059e4a50 100644
--- a/gem-magick6-fixes.patch
+++ b/gem-magick6-fixes.patch
@@ -1,15 +1,15 @@
diff --git a/externals/Makefile b/externals/Makefile
-index e60a73c9..09066109 100644
+index 414e1e2e..b7cfa952 100644
--- a/externals/Makefile
+++ b/externals/Makefile
-@@ -658,6 +658,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
+@@ -667,6 +667,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
test -s $(gem_src)/Gem.pd_linux || \
cd $(gem_src) && ./configure \
CXXFLAGS="-DHAVE_S_STUFF_H" \
-+ PKG_IMAGEMAGICK___CFLAGS="$(shell pkg-config --cflags ImageMagick-6.Q16HDRI)" \
-+ PKG_IMAGEMAGICK___LIBS="$(shell pkg-config --libs ImageMagick-6.Q16HDRI)" \
-+ PKG_MAGICKCORE_CFLAGS="$(shell pkg-config --cflags MagickCore-6.Q16HDRI)" \
-+ PKG_MAGICKCORE_LIBS="$(shell pkg-config --libs MagickCore-6.Q16HDRI)" \
++ PKG_IMAGEMAGICK___CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags ImageMagick-6.Q16HDRI)" \
++ PKG_IMAGEMAGICK___LIBS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --libs ImageMagick-6.Q16HDRI)" \
++ PKG_MAGICKCORE_CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags MagickCore-6.Q16HDRI)" \
++ PKG_MAGICKCORE_LIBS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --libs MagickCore-6.Q16HDRI)" \
--prefix=$(prefix) \
--with-video=plugins \
--with-film=plugins \