commit: 54f13d641f0b356b05fbaa567b321c51a67ce988
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 13:43:29 2016 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 13:56:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f13d64
media-libs/gegl: jpeg/png always on for >=0.3.4 (bug #589648)
Also affected:
* media-gfx/gimp-2.9.4
* media-gfx/gimp-9999
Package-Manager: portage-2.2.28
media-gfx/gimp/gimp-2.9.4.ebuild | 2 +-
media-gfx/gimp/gimp-9999.ebuild | 2 +-
.../gegl/files/gegl-0.3.4-without-jpeg-png.patch | 58 ----------------------
media-libs/gegl/gegl-0.3.4.ebuild | 13 +++--
media-libs/gegl/gegl-0.3.8.ebuild | 9 ++--
5 files changed, 11 insertions(+), 73 deletions(-)
diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild
index 49d72a0..deb92ec 100644
--- a/media-gfx/gimp/gimp-2.9.4.ebuild
+++ b/media-gfx/gimp/gimp-2.9.4.ebuild
@@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
>=media-libs/babl-0.1.18
- >=media-libs/gegl-0.3.8:0.3[cairo,png]
+ >=media-libs/gegl-0.3.8:0.3[cairo]
>=dev-libs/glib-2.43
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 19b005e..040199d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
>=media-libs/babl-0.1.14
- >=media-libs/gegl-0.3.4:0.3[cairo,png]
+ >=media-libs/gegl-0.3.4:0.3[cairo]
>=dev-libs/glib-2.43
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
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
deleted file mode 100644
index 81f12d1..0000000
--- a/media-libs/gegl/files/gegl-0.3.4-without-jpeg-png.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 86e5d9c3f51153afde57d8adbe22408cee6321d2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <[email protected]>
-Date: Wed, 9 Dec 2015 01:48:31 +0100
-Subject: [PATCH] Repair --without-libjpeg and --without-libpng
-
----
- configure.ac | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5aa1f3b..95e519b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -809,16 +809,16 @@ if test "x$with_libjpeg" != "xno" && test -z "$LIBJPEG";
then
- jpeg_ok="no (JPEG header file not found)"
- fi
- fi
-+
-+ if test "$jpeg_ok" != "yes"; then
-+ AC_MSG_ERROR([Could not find a usable JPEG library with header files])
-+ fi
- fi
-
- AM_CONDITIONAL(HAVE_JPEG, test "$jpeg_ok" = "yes")
-
- AC_SUBST(LIBJPEG)
-
--if test "$jpeg_ok" != "yes"; then
-- AC_MSG_ERROR([Could not find a usable JPEG library with header files])
--fi
--
-
- ##################
- # Check for libpng
-@@ -831,6 +831,10 @@ if test "x$with_libpng" != "xno"; then
- PKG_CHECK_MODULES(PNG, libpng,
- have_libpng="yes",
- have_libpng="no (libpng not found)")
-+
-+ if test "$have_libpng" != "yes"; then
-+ AC_MSG_ERROR([Could not find a usable PNG library with header files])
-+ fi
- fi
-
- AM_CONDITIONAL(HAVE_PNG, test "$have_libpng" = "yes")
-@@ -838,9 +842,6 @@ AM_CONDITIONAL(HAVE_PNG, test "$have_libpng" = "yes")
- AC_SUBST(PNG_CFLAGS)
- AC_SUBST(PNG_LIBS)
-
--if test "$have_libpng" != "yes"; then
-- AC_MSG_ERROR([Could not find a usable PNG library with header files])
--fi
-
- ###################
- # Check for librsvg
---
-2.6.3
-
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild
b/media-libs/gegl/gegl-0.3.4.ebuild
index 876b376..4b07ad3 100644
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ b/media-libs/gegl/gegl-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.gegl.org/";
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0.3"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg jpeg2k lcms lensfun openexr png raw sdl svg test tiff umfpack vala v4l
webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_IUSE="
svg? ( cairo )
vala? ( introspection )
@@ -49,12 +49,12 @@ RDEPEND="
>=media-video/ffmpeg-2.8:0=
)
introspection? ( >=dev-libs/gobject-introspection-1.32 )
- jpeg? ( virtual/jpeg:0= )
+ virtual/jpeg:0=
jpeg2k? ( >=media-libs/jasper-1.900.1 )
lcms? ( >=media-libs/lcms-2.2:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( media-libs/openexr )
- png? ( media-libs/libpng:0= )
+ media-libs/libpng:0=
raw? ( >=media-libs/libraw-0.15.4 )
sdl? ( media-libs/libsdl )
svg? ( >=gnome-base/librsvg-2.14:2 )
@@ -81,7 +81,6 @@ pkg_setup() {
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.3.4-endian.patch \
- "${FILESDIR}"/${P}-without-jpeg-png.patch \
"${FILESDIR}"/${P}-underlinking.patch
# FIXME: the following should be proper patch sent to upstream
@@ -152,14 +151,14 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-gexiv2 \
--without-graphviz \
- $(use_with jpeg libjpeg) \
+ --with-libjpeg \
$(use_with jpeg2k jasper) \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
--without-mrg \
$(use_with openexr) \
- $(use_with png libpng) \
+ --with-libpng \
$(use_with raw libraw) \
$(use_with sdl) \
$(use_with svg librsvg) \
diff --git a/media-libs/gegl/gegl-0.3.8.ebuild
b/media-libs/gegl/gegl-0.3.8.ebuild
index da51dd7..93807a7 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.gegl.org/";
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0.3"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg jpeg2k lcms lensfun openexr png raw sdl svg test tiff umfpack vala v4l
webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_IUSE="
svg? ( cairo )
vala? ( introspection )
@@ -47,12 +47,12 @@ RDEPEND="
>=media-video/ffmpeg-2.8:0=
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- jpeg? ( virtual/jpeg:0= )
+ virtual/jpeg:0=
jpeg2k? ( >=media-libs/jasper-1.900.1 )
lcms? ( >=media-libs/lcms-2.2:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( media-libs/openexr )
- png? ( media-libs/libpng:0= )
+ media-libs/libpng:0=
raw? ( >=media-libs/libraw-0.15.4 )
sdl? ( media-libs/libsdl )
svg? ( >=gnome-base/librsvg-2.14:2 )
@@ -78,7 +78,6 @@ pkg_setup() {
src_prepare() {
default
- eapply "${FILESDIR}"/${PN}-0.3.4-without-jpeg-png.patch
# FIXME: the following should be proper patch sent to upstream
# fix OSX loadable module filename extension
@@ -149,14 +148,12 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-gexiv2 \
--without-graphviz \
- $(use_with jpeg libjpeg) \
$(use_with jpeg2k jasper) \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
--without-mrg \
$(use_with openexr) \
- $(use_with png libpng) \
$(use_with raw libraw) \
$(use_with sdl) \
$(use_with svg librsvg) \
