diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-05-23 11:20:07 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-05-23 11:20:25 +0200 |
| commit | 4be507464c01c3531105a43b470cb3c1df795906 (patch) | |
| tree | 910db5a49c4582f4dc5f081018c7887634388896 /media-gfx/zbar | |
| parent | app-arch/bsdsfv: amd64 stable wrt bug #618578 (diff) | |
| download | gentoo-4be507464c01c3531105a43b470cb3c1df795906.tar.gz gentoo-4be507464c01c3531105a43b470cb3c1df795906.tar.bz2 gentoo-4be507464c01c3531105a43b470cb3c1df795906.zip | |
media-gfx/zbar: Fixed build with imagemagick-7 (bug #592324).
Thanks to Jürgen Rose for providing a patch.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'media-gfx/zbar')
| -rw-r--r-- | media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff | 24 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 4 |
2 files changed, 28 insertions, 0 deletions
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff new file mode 100644 index 000000000000..a56ab7d913b0 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff @@ -0,0 +1,24 @@ +diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac +--- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200 ++++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200 +@@ -324,7 +324,7 @@ + dnl double check ImageMagick install (bug #2582232) + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" +- AC_CHECK_HEADER([wand/MagickWand.h], ++ AC_CHECK_HEADER([MagickWand/MagickWand.h], + [have_IM="yes"], + [have_IM="broken"]) + CPPFLAGS="$CPPFLAGS_save"])]) +diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c +--- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200 ++++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200 +@@ -44,7 +44,7 @@ + #endif + + #ifdef HAVE_IMAGEMAGICK +-# include <wand/MagickWand.h> ++# include <MagickWand/MagickWand.h> + + /* ImageMagick frequently changes API names - just use the original + * (more stable?) names to match GraphicsMagick diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild index ba683f81e1b0..d07b29d89057 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild @@ -52,6 +52,10 @@ src_prepare() { "${FILESDIR}"/${PN}-0.10-python-crash.patch \ "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + epatch "${FILESDIR}/${P}-ImageMagick-7.diff" + fi + use python && python_fix_shebang examples/upcrpc.py test/*.py java-pkg-opt-2_src_prepare |