| 1 |
commit: 2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3 |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Sun Nov 27 23:07:16 2016 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 4 15:41:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da389e5 |
| 7 |
|
| 8 |
media-gfx/ufraw: add explicit jpeg2k support |
| 9 |
|
| 10 |
Upstream links to libjasper when available. This commit patches |
| 11 |
configure.ac to make libjasper support explicit and adds a jpeg2k |
| 12 |
USE flag to enable/disable it. |
| 13 |
|
| 14 |
Gentoo-bug: 470836 |
| 15 |
Package-Manager: portage-2.3.2 |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/2939 |
| 17 |
|
| 18 |
.../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 +++++++++++++++++++++ |
| 19 |
media-gfx/ufraw/ufraw-0.22-r1.ebuild | 5 ++++- |
| 20 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..93e1d691af1 |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch |
| 27 |
@@ -0,0 +1,21 @@ |
| 28 |
+--- a/configure.ac |
| 29 |
++++ b/configure.ac |
| 30 |
+@@ -159,8 +159,16 @@ |
| 31 |
+ have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no} |
| 32 |
+ |
| 33 |
+ # Check for libjasper. |
| 34 |
+-AC_CHECK_LIB(jasper, jas_image_decode) |
| 35 |
+-have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no} |
| 36 |
++AC_ARG_ENABLE([jasper], |
| 37 |
++ AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support])) |
| 38 |
++ |
| 39 |
++have_jasper=no |
| 40 |
++AS_IF([test "x$enable_jasper" = "xyes"], [ |
| 41 |
++ AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [ |
| 42 |
++ AC_MSG_ERROR([unable to find the jas_image_decode() function]) |
| 43 |
++ ]) |
| 44 |
++]) |
| 45 |
++ |
| 46 |
+ |
| 47 |
+ # Check for tiff headers and library. |
| 48 |
+ PKG_CHECK_MODULES(LIBTIFF, libtiff-4, |
| 49 |
|
| 50 |
diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild |
| 51 |
index 7f16fe8192f..225999943e4 100644 |
| 52 |
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild |
| 53 |
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild |
| 54 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 55 |
LICENSE="GPL-2" |
| 56 |
SLOT="0" |
| 57 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 58 |
-IUSE="contrast fits gimp gnome gtk openmp timezone" |
| 59 |
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone" |
| 60 |
|
| 61 |
REQUIRED_USE="gimp? ( gtk )" |
| 62 |
|
| 63 |
@@ -31,12 +31,14 @@ RDEPEND=" |
| 64 |
>=media-gfx/gtkimageview-1.5 |
| 65 |
>=x11-libs/gtk+-2.6:2 |
| 66 |
) |
| 67 |
+ jpeg2k? ( media-libs/jasper:= ) |
| 68 |
" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
virtual/pkgconfig" |
| 71 |
|
| 72 |
PATCHES=( |
| 73 |
"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch |
| 74 |
+ "${FILESDIR}"/${P}-jasper-automagic.patch |
| 75 |
"${FILESDIR}"/${P}-crashfix.patch |
| 76 |
) |
| 77 |
|
| 78 |
@@ -52,6 +54,7 @@ src_configure() { |
| 79 |
$(use_with gimp) \ |
| 80 |
$(use_enable gnome mime) \ |
| 81 |
$(use_with gtk) \ |
| 82 |
+ $(use_enable jpeg2k jasper) \ |
| 83 |
$(use_enable openmp) \ |
| 84 |
$(use_enable timezone dst-correction) |
| 85 |
} |
Archives