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 E47ED139694 for ; Tue, 4 Apr 2017 15:42:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2484721C087; Tue, 4 Apr 2017 15:42:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E058821C087 for ; Tue, 4 Apr 2017 15:42:26 +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 A4E98340AC7 for ; Tue, 4 Apr 2017 15:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A45C73F3 for ; Tue, 4 Apr 2017 15:42:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1491320495.2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch media-gfx/ufraw/ufraw-0.22-r1.ebuild X-VCS-Directories: media-gfx/ufraw/files/ media-gfx/ufraw/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3 X-VCS-Branch: master Date: Tue, 4 Apr 2017 15:42:24 +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: e9851258-1ba6-47ed-b630-b00519861a1d X-Archives-Hash: f64001959d09ba601bf0136713184abb commit: 2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3 Author: Christophe Lermytte lermytte be> AuthorDate: Sun Nov 27 23:07:16 2016 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 4 15:41:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da389e5 media-gfx/ufraw: add explicit jpeg2k support Upstream links to libjasper when available. This commit patches configure.ac to make libjasper support explicit and adds a jpeg2k USE flag to enable/disable it. Gentoo-bug: 470836 Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2939 .../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 +++++++++++++++++++++ media-gfx/ufraw/ufraw-0.22-r1.ebuild | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch new file mode 100644 index 00000000000..93e1d691af1 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -159,8 +159,16 @@ + have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no} + + # Check for libjasper. +-AC_CHECK_LIB(jasper, jas_image_decode) +-have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no} ++AC_ARG_ENABLE([jasper], ++ AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support])) ++ ++have_jasper=no ++AS_IF([test "x$enable_jasper" = "xyes"], [ ++ AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [ ++ AC_MSG_ERROR([unable to find the jas_image_decode() function]) ++ ]) ++]) ++ + + # Check for tiff headers and library. + PKG_CHECK_MODULES(LIBTIFF, libtiff-4, diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild index 7f16fe8192f..225999943e4 100644 --- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild +++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="contrast fits gimp gnome gtk openmp timezone" +IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone" REQUIRED_USE="gimp? ( gtk )" @@ -31,12 +31,14 @@ RDEPEND=" >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) + jpeg2k? ( media-libs/jasper:= ) " DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch + "${FILESDIR}"/${P}-jasper-automagic.patch "${FILESDIR}"/${P}-crashfix.patch ) @@ -52,6 +54,7 @@ src_configure() { $(use_with gimp) \ $(use_enable gnome mime) \ $(use_with gtk) \ + $(use_enable jpeg2k jasper) \ $(use_enable openmp) \ $(use_enable timezone dst-correction) }