| 1 |
commit: fd4bb68fdb241a27224144045f5ae757f8a76921 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 9 01:10:49 2015 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 9 01:10:49 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4bb68f |
| 7 |
|
| 8 |
media-libs/gegl: Fix USE="-jpeg -png" (bug #567582) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../gegl/files/gegl-0.3.4-without-jpeg-png.patch | 58 ++++++++++++++++++++++ |
| 13 |
media-libs/gegl/gegl-0.3.4.ebuild | 1 + |
| 14 |
2 files changed, 59 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-libs/gegl/files/gegl-0.3.4-without-jpeg-png.patch b/media-libs/gegl/files/gegl-0.3.4-without-jpeg-png.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..81f12d1 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-libs/gegl/files/gegl-0.3.4-without-jpeg-png.patch |
| 21 |
@@ -0,0 +1,58 @@ |
| 22 |
+From 86e5d9c3f51153afde57d8adbe22408cee6321d2 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 24 |
+Date: Wed, 9 Dec 2015 01:48:31 +0100 |
| 25 |
+Subject: [PATCH] Repair --without-libjpeg and --without-libpng |
| 26 |
+ |
| 27 |
+--- |
| 28 |
+ configure.ac | 15 ++++++++------- |
| 29 |
+ 1 file changed, 8 insertions(+), 7 deletions(-) |
| 30 |
+ |
| 31 |
+diff --git a/configure.ac b/configure.ac |
| 32 |
+index 5aa1f3b..95e519b 100644 |
| 33 |
+--- a/configure.ac |
| 34 |
++++ b/configure.ac |
| 35 |
+@@ -809,16 +809,16 @@ if test "x$with_libjpeg" != "xno" && test -z "$LIBJPEG"; then |
| 36 |
+ jpeg_ok="no (JPEG header file not found)" |
| 37 |
+ fi |
| 38 |
+ fi |
| 39 |
++ |
| 40 |
++ if test "$jpeg_ok" != "yes"; then |
| 41 |
++ AC_MSG_ERROR([Could not find a usable JPEG library with header files]) |
| 42 |
++ fi |
| 43 |
+ fi |
| 44 |
+ |
| 45 |
+ AM_CONDITIONAL(HAVE_JPEG, test "$jpeg_ok" = "yes") |
| 46 |
+ |
| 47 |
+ AC_SUBST(LIBJPEG) |
| 48 |
+ |
| 49 |
+-if test "$jpeg_ok" != "yes"; then |
| 50 |
+- AC_MSG_ERROR([Could not find a usable JPEG library with header files]) |
| 51 |
+-fi |
| 52 |
+- |
| 53 |
+ |
| 54 |
+ ################## |
| 55 |
+ # Check for libpng |
| 56 |
+@@ -831,6 +831,10 @@ if test "x$with_libpng" != "xno"; then |
| 57 |
+ PKG_CHECK_MODULES(PNG, libpng, |
| 58 |
+ have_libpng="yes", |
| 59 |
+ have_libpng="no (libpng not found)") |
| 60 |
++ |
| 61 |
++ if test "$have_libpng" != "yes"; then |
| 62 |
++ AC_MSG_ERROR([Could not find a usable PNG library with header files]) |
| 63 |
++ fi |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
+ AM_CONDITIONAL(HAVE_PNG, test "$have_libpng" = "yes") |
| 67 |
+@@ -838,9 +842,6 @@ AM_CONDITIONAL(HAVE_PNG, test "$have_libpng" = "yes") |
| 68 |
+ AC_SUBST(PNG_CFLAGS) |
| 69 |
+ AC_SUBST(PNG_LIBS) |
| 70 |
+ |
| 71 |
+-if test "$have_libpng" != "yes"; then |
| 72 |
+- AC_MSG_ERROR([Could not find a usable PNG library with header files]) |
| 73 |
+-fi |
| 74 |
+ |
| 75 |
+ ################### |
| 76 |
+ # Check for librsvg |
| 77 |
+-- |
| 78 |
+2.6.3 |
| 79 |
+ |
| 80 |
|
| 81 |
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild |
| 82 |
index c2b9409..40fea6e 100644 |
| 83 |
--- a/media-libs/gegl/gegl-0.3.4.ebuild |
| 84 |
+++ b/media-libs/gegl/gegl-0.3.4.ebuild |
| 85 |
@@ -81,6 +81,7 @@ pkg_setup() { |
| 86 |
src_prepare() { |
| 87 |
epatch \ |
| 88 |
"${FILESDIR}"/${PN}-0.3.4-endian.patch \ |
| 89 |
+ "${FILESDIR}"/${P}-without-jpeg-png.patch \ |
| 90 |
"${FILESDIR}"/${P}-underlinking.patch |
| 91 |
|
| 92 |
# FIXME: the following should be proper patch sent to upstream |
Archives