From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4390B139694 for ; Tue, 23 May 2017 09:20:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83F7B21C084; Tue, 23 May 2017 09:20:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52C4E21C084 for ; Tue, 23 May 2017 09:20:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17B8C341747 for ; Tue, 23 May 2017 09:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DFA67454 for ; Tue, 23 May 2017 09:20:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1495531225.4be507464c01c3531105a43b470cb3c1df795906.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild X-VCS-Directories: media-gfx/zbar/files/ media-gfx/zbar/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4be507464c01c3531105a43b470cb3c1df795906 X-VCS-Branch: master Date: Tue, 23 May 2017 09:20:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0166c2bd-4f7b-46f2-aed6-1f816a068553 X-Archives-Hash: d5d01d20f8a6ffa0e8fd1752c8382047 commit: 4be507464c01c3531105a43b470cb3c1df795906 Author: Lars Wendler gentoo org> AuthorDate: Tue May 23 09:20:07 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue May 23 09:20:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be50746 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 .../files/zbar-0.10_p20121015-ImageMagick-7.diff | 24 ++++++++++++++++++++++ media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 4 ++++ 2 files changed, 28 insertions(+) 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 00000000000..a56ab7d913b --- /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 ++# include + + /* 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 ba683f81e1b..d07b29d8905 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