* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2020-08-30 7:58 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-08-30 7:58 UTC (permalink / raw
To: gentoo-commits
commit: f31d84455b49bff742e837991f0ca3878ad844bd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 07:26:23 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 07:58:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31d8445
media-libs/gegl: Drop 0.4.18* and obsolete patches
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/gegl/Manifest | 1 -
.../gegl/files/gegl-0.3.34-failing-tests.patch | 27 ----
media-libs/gegl/files/gegl-0.3.34-fno-common.patch | 11 --
.../files/gegl-0.4.18-cltostring_force_utf8.patch | 30 ----
.../files/gegl-0.4.18-meson_cpu_detection.patch | 51 -------
media-libs/gegl/gegl-0.4.18-r1.ebuild | 161 --------------------
media-libs/gegl/gegl-0.4.18.ebuild | 163 ---------------------
7 files changed, 444 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a02306475c3..b63767947c7 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,3 +1,2 @@
-DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
diff --git a/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
deleted file mode 100644
index c388ac556e9..00000000000
--- a/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a/tests/ff-load-save/Makefile.am b/tests/ff-load-save/Makefile.am
---- a/tests/ff-load-save/Makefile.am 2017-09-21 22:11:00.000000000 +0300
-+++ b/tests/ff-load-save/Makefile.am 2020-03-07 16:33:21.000000000 +0300
-@@ -6,13 +6,7 @@
-
- EXTRA_DIST = $(TESTS)
-
--check: vids images
--
--images:
-- for a in *.avi *.mp4 *.ogv ;do \
-- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/gegl-video \
-- $$a -s 74 -e 74 -of $$a- ;\
-- done
-+check: vids
-
- vids: $(TESTS) $(top_builddir)/examples/frame-counter
- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
-@@ -27,8 +21,6 @@
- --video-codec mpeg4 --fps 12 --video-bit-rate 128 128kb-12fps.mp4
- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
- --video-codec mpeg4 --fps 100 --video-bit-rate 128 128kb-100fps.mp4
-- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
-- --fps 28 --video-bit-rate 512 512kb-28fps.ogv
-
- clean-local:
- rm -f *.png *.avi *.ogv *.mp4 *.webm
diff --git a/media-libs/gegl/files/gegl-0.3.34-fno-common.patch b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
deleted file mode 100644
index 8c1c045758b..00000000000
--- a/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gcut/gcut.h
-+++ b/gcut/gcut.h
-@@ -172,7 +172,7 @@
- GMutex mutex;
- };
-
--struct _GeglEDL
-+extern struct _GeglEDL
- {
- GFileMonitor *monitor;
- char *path;
diff --git a/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch b/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch
deleted file mode 100644
index ecb1be4c735..00000000000
--- a/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/opencl/cltostring.py 2019-10-27 02:01:07.000000000 +0300
-+++ b/opencl/cltostring.py 2020-01-12 21:22:25.000000000 +0300
-@@ -1,8 +1,10 @@
- #!/usr/bin/env python
- from __future__ import print_function
-+from __future__ import unicode_literals
-
- import os
- import sys
-+import io
-
- # Search for lines that look like #include "blah.h" and replace them
- # with the contents of blah.h.
-@@ -34,12 +36,12 @@
-
-
- if len(sys.argv) == 2:
-- infile = open(sys.argv[1], "r")
-- outfile = open(sys.argv[1] + '.h', "w")
-+ infile = io.open(sys.argv[1], "r", encoding="utf-8")
-+ outfile = io.open(sys.argv[1] + '.h', "w", encoding="utf-8")
-
- elif len(sys.argv) == 3:
-- infile = open(sys.argv[1], "r")
-- outfile = open(sys.argv[2], "w")
-+ infile = io.open(sys.argv[1], "r", encoding="utf-8")
-+ outfile = io.open(sys.argv[2], "w", encoding="utf-8")
-
- else:
- print("Usage: %s input [output]" % sys.argv[0])
diff --git a/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch b/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch
deleted file mode 100644
index 7f6b3624f36..00000000000
--- a/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 27 Oct 2019 14:10:08 +0100
-Subject: [PATCH] meson: fix cpu detection
-
-Use host_machine.cpu_family() instead of cpu(). Only the former
-provides a stable/defined set of values.
-
-Also don't error out on some arches for no good reason.
-
-This fixes the build on 32bit Windows.
----
- meson.build | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index af133a0f1..540498921 100644
---- a/meson.build
-+++ b/meson.build
-@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang'
- endif
-
-
--host_cpu = host_machine.cpu()
--if host_cpu.startswith('i') and host_cpu.endswith('86')
-+host_cpu_family = host_machine.cpu_family()
-+if host_cpu_family == 'x86'
- have_x86 = true
- config.set10('ARCH_X86', true)
--elif host_cpu == 'x86_64'
-+elif host_cpu_family == 'x86_64'
- have_x86 = true
- config.set10('ARCH_X86', true)
- config.set10('ARCH_X86_64', true)
--elif host_cpu == 'ppc' or host_cpu == 'powerpc'
-+elif host_cpu_family == 'ppc'
- have_ppc = true
- config.set10('ARCH_PPC', true)
--elif host_cpu == 'ppc64' or host_cpu == 'powerpc64'
-+elif host_cpu_family == 'ppc64'
- have_ppc = true
- config.set10('ARCH_PPC', true)
- config.set10('ARCH_PPC64', true)
--else
-- error('Unknown host architecture')
- endif
-
- ################################################################################
---
-2.22.0
-
diff --git a/media-libs/gegl/gegl-0.4.18-r1.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild
deleted file mode 100644
index 799cc107712..00000000000
--- a/media-libs/gegl/gegl-0.4.18-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- test? ( introspection )
- vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.72[introspection?,lcms?]
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( media-video/ffmpeg:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- dev-lang/perl
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-drop-failing-tests.patch
- "${FILESDIR}"/${P}-program-suffix.patch
- "${FILESDIR}"/${P}-meson_cpu_detection.patch
- "${FILESDIR}"/${P}-cltostring_force_utf8.patch
-)
-
-python_check_deps() {
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
- # fix skipping mipmap tests due to executable not found
- for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
- sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
- sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
- done
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- # - Disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
- -Ddocs=false
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Dgexiv2=disabled
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- -Dgraphviz=disabled
- -Djasper=disabled
- -Dlibjpeg=enabled
- -Dlibpng=enabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- -Dsdl2=disabled
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_feature cairo)
- $(meson_feature cairo pangocairo)
- $(meson_feature ffmpeg libav)
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature openexr)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature svg librsvg)
- $(meson_feature test pygobject)
- $(meson_feature tiff libtiff)
- $(meson_feature umfpack)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
- $(meson_feature vala vapigen)
- $(meson_feature webp)
- $(meson_use introspection)
- )
- meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
deleted file mode 100644
index 3aac36f5af6..00000000000
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- test? ( introspection )
- vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.72[introspection?]
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( media-video/ffmpeg:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- dev-lang/perl
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-drop-failing-tests.patch
- "${FILESDIR}"/${P}-program-suffix.patch
- "${FILESDIR}"/${P}-meson_cpu_detection.patch
- "${FILESDIR}"/${P}-cltostring_force_utf8.patch
-)
-
-python_check_deps() {
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
- # fix skipping mipmap tests due to executable not found
- for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
- sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
- sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
- done
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- # - Disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
- -Ddocs=false
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Dgexiv2=disabled
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- -Dgraphviz=disabled
- -Djasper=disabled
- -Dlibjpeg=enabled
- -Dlibpng=enabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- -Dsdl2=disabled
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_feature cairo)
- $(meson_feature cairo pangocairo)
- $(meson_feature ffmpeg libav)
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature openexr)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature svg librsvg)
- $(meson_feature test pygobject)
- $(meson_feature tiff libtiff)
- $(meson_feature umfpack)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
- $(meson_feature vala vapigen)
- $(meson_feature webp)
- $(meson_use introspection)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2022-12-21 23:52 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-12-21 23:52 UTC (permalink / raw
To: gentoo-commits
commit: e37f1398f63db9f2a6fe4133599a7169f6780e38
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 23:47:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 23:52:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37f1398
media-libs/gegl: fix build w/ libraw-0.21
Closes: https://bugs.gentoo.org/887421
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gegl/files/gegl-0.4.40-libraw-0.21.patch | 26 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.40-r1.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
new file mode 100644
index 000000000000..84d80d96503c
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/887421
+https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
+
+From ef71b865a301514fcd13f50d421942f7b6b92d5e Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 21 Dec 2022 19:32:02 +0000
+Subject: [PATCH] raw-load: make compatible with LibRaw 0.21.0
+
+imgdata.params.shot_select moved to imgdata.rawparams.shot_select
+https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L182
+--- a/operations/external/raw-load.c
++++ b/operations/external/raw-load.c
+@@ -114,7 +114,11 @@ prepare (GeglOperation *operation)
+ g_warning ("raw-load: Error Initializing raw library");
+ else
+ {
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++ p->LibRaw->rawparams.shot_select = o->image_num;
++#else
+ p->LibRaw->params.shot_select = o->image_num;
++#endif
+
+ p->LibRaw->params.aber[0] = 1.0;
+ p->LibRaw->params.aber[2] = 1.0;
+--
+GitLab
diff --git a/media-libs/gegl/gegl-0.4.40-r1.ebuild b/media-libs/gegl/gegl-0.4.40-r1.ebuild
index bcb10baa5cb6..a84d7725a292 100644
--- a/media-libs/gegl/gegl-0.4.40-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.40-r1.ebuild
@@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
+ "${FILESDIR}"/${PN}-0.4.40-libraw-0.21.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2020-06-25 8:08 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-06-25 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 326f8fd1dfe00a5b424bf2e4b13f02441894a5a5
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon May 25 00:33:53 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 08:07:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326f8fd1
media-libs/gegl: 0.3.34, add gegl-0.3.34-fno-common.patch
Closes: https://bugs.gentoo.org/719198
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/gegl/files/gegl-0.3.34-fno-common.patch | 11 +++++++++++
media-libs/gegl/gegl-0.3.34-r1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.3.34-fno-common.patch b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
new file mode 100644
index 00000000000..8c1c045758b
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/gcut/gcut.h
++++ b/gcut/gcut.h
+@@ -172,7 +172,7 @@
+ GMutex mutex;
+ };
+
+-struct _GeglEDL
++extern struct _GeglEDL
+ {
+ GFileMonitor *monitor;
+ char *path;
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
index bd05c114d0d..90f06bc1e08 100644
--- a/media-libs/gegl/gegl-0.3.34-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.34-r1.ebuild
@@ -75,6 +75,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
"${FILESDIR}"/${PN}-0.3.34-failing-tests.patch # bug 631930, 686202
+ "${FILESDIR}"/${PN}-0.3.34-fno-common.patch # bug 719198
"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
)
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2020-01-20 13:03 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-01-20 13:03 UTC (permalink / raw
To: gentoo-commits
commit: e5106d923c2d796469a4da6e0e8d5524cf958126
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Jan 19 07:02:27 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 13:03:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5106d92
media-libs/gegl: Fix compilation error due to non-ascii symbols
This patch force using utf8 while reading files on converting .cl files
to .h files in env where for some reasons sandbox system codepage isn't utf8.
The patch provides compatibility both with python2.7 and python3.x.
When python2.7 support will be dropped the addition of
from __future__ import unicode_literals
import io
and "io."
could be removed as not neccessary for python3.x.
Closes: https://bugs.gentoo.org/705286
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/14387
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/gegl-0.4.18-cltostring_force_utf8.patch | 30 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.18.ebuild | 5 ++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch b/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch
new file mode 100644
index 00000000000..ecb1be4c735
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch
@@ -0,0 +1,30 @@
+--- a/opencl/cltostring.py 2019-10-27 02:01:07.000000000 +0300
++++ b/opencl/cltostring.py 2020-01-12 21:22:25.000000000 +0300
+@@ -1,8 +1,10 @@
+ #!/usr/bin/env python
+ from __future__ import print_function
++from __future__ import unicode_literals
+
+ import os
+ import sys
++import io
+
+ # Search for lines that look like #include "blah.h" and replace them
+ # with the contents of blah.h.
+@@ -34,12 +36,12 @@
+
+
+ if len(sys.argv) == 2:
+- infile = open(sys.argv[1], "r")
+- outfile = open(sys.argv[1] + '.h', "w")
++ infile = io.open(sys.argv[1], "r", encoding="utf-8")
++ outfile = io.open(sys.argv[1] + '.h', "w", encoding="utf-8")
+
+ elif len(sys.argv) == 3:
+- infile = open(sys.argv[1], "r")
+- outfile = open(sys.argv[2], "w")
++ infile = io.open(sys.argv[1], "r", encoding="utf-8")
++ outfile = io.open(sys.argv[2], "w", encoding="utf-8")
+
+ else:
+ print("Usage: %s input [output]" % sys.argv[0])
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index f2c662e0cba..56b18bcd87a 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -82,9 +82,10 @@ BDEPEND="
DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
- "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
- "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+ "${FILESDIR}"/${P}-drop-failing-tests.patch
+ "${FILESDIR}"/${P}-program-suffix.patch
"${FILESDIR}"/${P}-meson_cpu_detection.patch
+ "${FILESDIR}"/${P}-cltostring_force_utf8.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2019-11-14 15:59 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2019-11-14 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 3da3adbf0f1c3c950114c22ba22db5646f03709a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 15:48:43 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 15:59:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da3adbf
media-libs/gegl: Use upstream CPU detection patch
Bug: https://bugs.gentoo.org/698744
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/gegl/files/gegl-0.4.18-arch.patch | 11 -----
.../files/gegl-0.4.18-meson_cpu_detection.patch | 51 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.18.ebuild | 2 +-
3 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.4.18-arch.patch b/media-libs/gegl/files/gegl-0.4.18-arch.patch
deleted file mode 100644
index 57bfaf4a6c7..00000000000
--- a/media-libs/gegl/files/gegl-0.4.18-arch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -88,8 +88,6 @@
- have_ppc = true
- config.set10('ARCH_PPC', true)
- config.set10('ARCH_PPC64', true)
--else
-- error('Unknown host architecture')
- endif
-
- ################################################################################
diff --git a/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch b/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch
new file mode 100644
index 00000000000..7f6b3624f36
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch
@@ -0,0 +1,51 @@
+From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 27 Oct 2019 14:10:08 +0100
+Subject: [PATCH] meson: fix cpu detection
+
+Use host_machine.cpu_family() instead of cpu(). Only the former
+provides a stable/defined set of values.
+
+Also don't error out on some arches for no good reason.
+
+This fixes the build on 32bit Windows.
+---
+ meson.build | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index af133a0f1..540498921 100644
+--- a/meson.build
++++ b/meson.build
+@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang'
+ endif
+
+
+-host_cpu = host_machine.cpu()
+-if host_cpu.startswith('i') and host_cpu.endswith('86')
++host_cpu_family = host_machine.cpu_family()
++if host_cpu_family == 'x86'
+ have_x86 = true
+ config.set10('ARCH_X86', true)
+-elif host_cpu == 'x86_64'
++elif host_cpu_family == 'x86_64'
+ have_x86 = true
+ config.set10('ARCH_X86', true)
+ config.set10('ARCH_X86_64', true)
+-elif host_cpu == 'ppc' or host_cpu == 'powerpc'
++elif host_cpu_family == 'ppc'
+ have_ppc = true
+ config.set10('ARCH_PPC', true)
+-elif host_cpu == 'ppc64' or host_cpu == 'powerpc64'
++elif host_cpu_family == 'ppc64'
+ have_ppc = true
+ config.set10('ARCH_PPC', true)
+ config.set10('ARCH_PPC64', true)
+-else
+- error('Unknown host architecture')
+ endif
+
+ ################################################################################
+--
+2.22.0
+
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 7de01528fc4..f23c5220119 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -80,7 +80,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
- "${FILESDIR}"/${PN}-0.4.18-arch.patch
+ "${FILESDIR}"/${P}-meson_cpu_detection.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2018-08-25 17:12 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2018-08-25 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 5c395b0a4a5164a2d7f046b7de9b7db53ae25a3a
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 23 17:01:29 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 17:06:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c395b0a
media-libs/gegl: version bump to 0.4.8
-0.4.x series is hardcoded to work with OpenEXR v2.2
--v0.4.6: Depend only on OpenEXR 2.2.x
--v0.4.8: Made OpenEXR 2.2 the minimum version
--v0.4.8: Added patch to remove hard-coded Imath_2_2 namespace
---Patch in upstream master
-Removed unused versionator eclass
-Synced 0.4.8 and 9999 ebuilds
media-libs/gegl/Manifest | 1 +
.../files/gegl-0.4.8-remove-imath-version.patch | 33 ++++
.../{gegl-9999.ebuild => gegl-0.4.6-r1.ebuild} | 54 ++++---
media-libs/gegl/gegl-0.4.8.ebuild | 174 +++++++++++++++++++++
media-libs/gegl/gegl-9999.ebuild | 160 +++++++++----------
5 files changed, 321 insertions(+), 101 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c37c0e08687..13739affc93 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -7,3 +7,4 @@ DIST gegl-0.4.0.tar.bz2 6762190 BLAKE2B c138ee79806178f60eab2fae492fcf441dc49b54
DIST gegl-0.4.2.tar.bz2 6781136 BLAKE2B 522d4e7b2ace519423a66b7e65faab49bd0740173be6a8e108ec95b65c0359937df7b142e0a68589a4d773b839689ad6cf2ee67c5ea5b89267d46199b23e3f15 SHA512 8d842f5e192d279529615e09da8a76b051baa9c257ac699eba5f8ce46b4511554949e35f494e99c190b1477a700e018e2243a9e84c3c79e331824ca364b6cefd
DIST gegl-0.4.4.tar.bz2 6817195 BLAKE2B 928e91e61bfee8b9954992e1ad4dbc874a5f53ef5a8274a6805b2c7d9bb007e3ff9ab5e8fc0a767f7e7d05c327581231b42eebcc6f9781f9feb5abe17c22bbdf SHA512 6953bf7df225914ce9c8166f5a0490615664c69d5a66cf8ca805f75cfbe272186c7745d273fcde29c685e22a66d4483dbdf45064ec9c0007fd6d0b8aa3ebb164
DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
+DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
diff --git a/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch b/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch
new file mode 100644
index 00000000000..54ee791a68e
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch
@@ -0,0 +1,33 @@
+diff -urN a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+--- a/operations/external/exr-save.cc 2018-07-11 23:15:19.000000000 +0100
++++ b/operations/external/exr-save.cc 2018-08-22 19:13:26.241432231 +0100
+@@ -145,10 +145,10 @@
+ &blue[0], &blue[1],
+ NULL, NULL, NULL);
+ {
+- Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+- Imath_2_2::V2f(green[0],green[1]),
+- Imath_2_2::V2f(blue[0],blue[1]),
+- Imath_2_2::V2f(wp[0],wp[1]));
++ Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++ Imath::V2f(green[0],green[1]),
++ Imath::V2f(blue[0],blue[1]),
++ Imath::V2f(wp[0],wp[1]));
+ Imf::addChromaticities (header, c1);
+ }
+ }
+@@ -184,10 +184,10 @@
+ &green[0], &green[1],
+ &blue[0], &blue[1],
+ NULL, NULL, NULL);
+- Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+- Imath_2_2::V2f(green[0],green[1]),
+- Imath_2_2::V2f(blue[0],blue[1]),
+- Imath_2_2::V2f(wp[0],wp[1]));
++ Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++ Imath::V2f(green[0],green[1]),
++ Imath::V2f(blue[0],blue[1]),
++ Imath::V2f(wp[0],wp[1]));
+ Imf::addChromaticities (header, c1);
+ }
+
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.6-r1.ebuild
similarity index 76%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.4.6-r1.ebuild
index 5fe47759f34..0334bc1b3cd 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,64 +7,67 @@ PYTHON_COMPAT=( python2_7 )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+inherit autotools gnome2-utils python-any-r1 vala
if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="git://git.gnome.org/gegl"
SRC_URI=""
else
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A graph based image processing framework"
HOMEPAGE="http://www.gegl.org/"
-LICENSE="|| ( GPL-3 LGPL-3 )"
+LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr 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_USE="
svg? ( cairo )
vala? ( introspection )
"
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
>=dev-libs/glib-2.44:2
dev-libs/json-glib
- >=media-libs/babl-0.1.30
+ >=media-libs/babl-0.1.54
sys-libs/zlib
>=x11-libs/gdk-pixbuf-2.32:2
x11-libs/pango
- cairo? ( x11-libs/cairo )
+ cairo? ( >=x11-libs/cairo-1.12.2 )
ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
+ >=media-video/ffmpeg-2.8:0=
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
virtual/jpeg:0=
jpeg2k? ( >=media-libs/jasper-1.900.1:= )
- lcms? ( >=media-libs/lcms-2.2:2 )
+ lcms? ( >=media-libs/lcms-2.8:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( media-libs/openexr:= )
- media-libs/libpng:0=
+ openexr? ( =media-libs/openexr-2.2*:= )
+ >=media-libs/libpng-1.6.0:0=
raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
tiff? ( >=media-libs/tiff-4:0 )
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19.8
dev-lang/perl
virtual/pkgconfig
>=sys-devel/libtool-2.2
- test? ( introspection? (
+ test? ( ffmpeg? ( media-libs/gexiv2 )
+ introspection? (
$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
vala? ( $(vala_depend) )
"
@@ -73,6 +76,10 @@ pkg_setup() {
use test && use introspection && python-any-r1_pkg_setup
}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
src_prepare() {
default
@@ -96,6 +103,14 @@ src_prepare() {
use vala && vala_src_prepare
}
+_use_with_both() {
+ if use "$1" && use "$2"; then
+ echo "--with-$3"
+ else
+ echo "--without-$3"
+ fi
+}
+
src_configure() {
# never enable altering of CFLAGS via profile option
# libspiro: not in portage main tree
@@ -110,6 +125,7 @@ src_configure() {
# (e.g. ruby, asciidoc, dot (of graphviz), enscript)
#
# - Parameter --with-exiv2 compiles a noinst-app only, no use
+ # but needed during testing
#
# - Parameter --disable-workshop disables any use of Lua, effectivly
#
@@ -141,7 +157,7 @@ src_configure() {
$(use_with cairo pangocairo) \
--without-exiv2 \
$(use_with ffmpeg libavformat) \
- --without-gexiv2 \
+ $(_use_with_both ffmpeg test gexiv2) \
--without-graphviz \
$(use_with jpeg2k jasper) \
$(use_with lcms) \
diff --git a/media-libs/gegl/gegl-0.4.8.ebuild b/media-libs/gegl/gegl-0.4.8.ebuild
new file mode 100644
index 00000000000..92178abdfdf
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.gnome.org/gegl"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+ svg? ( cairo )
+ vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.54
+ >=media-libs/libpng-1.6.0:0=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ >=x11-libs/gdk-pixbuf-2.32:2
+ x11-libs/pango
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? (
+ libav? ( media-video/libav:0= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-2.2.0:= )
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+ test? ( ffmpeg? ( media-libs/gexiv2 )
+ introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+ )
+ )
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+ "${FILESDIR}/${P}-remove-imath-version.patch"
+)
+
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # FIXME: the following should be proper patch sent to upstream
+ # fix OSX loadable module filename extension
+ sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/Makefile.am || die
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+ --disable-docs
+ # never enable altering of CFLAGS via profile option
+ --disable-profile
+ --disable-silent-rules
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ --disable-workshop
+ --program-suffix=-${SLOT}
+ --with-gdk-pixbuf
+ --with-pango
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ # but needed during testing
+ --without-exiv2
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ --without-graphviz
+ # libspiro: not in portage main tree
+ --without-libspiro
+ --without-lua
+ --without-mrg
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable debug)
+ $(use_enable introspection)
+ $(use_with cairo)
+ $(use_with cairo pangocairo)
+ $(use_with ffmpeg libavformat)
+ $(use_with jpeg2k jasper)
+ $(use_with lcms)
+ $(use_with lensfun)
+ $(use_with openexr)
+ $(use_with raw libraw)
+ $(use_with sdl)
+ $(use_with svg librsvg)
+ $(use_with tiff libtiff)
+ $(use_with umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(use_with v4l libv4l)
+ $(use_with v4l libv4l2)
+ $(use_with vala)
+ $(use_with webp)
+ )
+
+ if use test; then
+ myeconfargs+=( $(use_with ffmpeg gexiv2) )
+ else
+ myeconfargs+=( --without-gexiv2 )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 5fe47759f34..07ea6ab5146 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,21 +7,21 @@ PYTHON_COMPAT=( python2_7 )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+inherit autotools gnome2-utils python-any-r1 vala
if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://git.gnome.org/gegl"
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
SRC_URI=""
else
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A graph based image processing framework"
HOMEPAGE="http://www.gegl.org/"
-LICENSE="|| ( GPL-3 LGPL-3 )"
+LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
@@ -30,42 +30,47 @@ REQUIRED_USE="
vala? ( introspection )
"
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
>=dev-libs/glib-2.44:2
dev-libs/json-glib
- >=media-libs/babl-0.1.30
+ >=media-libs/babl-0.1.54
+ >=media-libs/libpng-1.6.0:0=
sys-libs/zlib
+ virtual/jpeg:0=
>=x11-libs/gdk-pixbuf-2.32:2
x11-libs/pango
-
- cairo? ( x11-libs/cairo )
+ cairo? ( >=x11-libs/cairo-1.12.2 )
ffmpeg? (
libav? ( media-video/libav:0= )
!libav? ( media-video/ffmpeg:0= )
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- virtual/jpeg:0=
jpeg2k? ( >=media-libs/jasper-1.900.1:= )
- lcms? ( >=media-libs/lcms-2.2:2 )
+ lcms? ( >=media-libs/lcms-2.8:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( media-libs/openexr:= )
- media-libs/libpng:0=
+ openexr? ( >=media-libs/openexr-2.2.0:= )
raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
tiff? ( >=media-libs/tiff-4:0 )
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
"
DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
>=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+ test? ( ffmpeg? ( media-libs/gexiv2 )
+ introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+ )
+ )
vala? ( $(vala_depend) )
"
@@ -97,68 +102,59 @@ src_prepare() {
}
src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-silent-rules \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- $(use_with jpeg2k jasper) \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
+ local myeconfargs=(
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+ --disable-docs
+ # never enable altering of CFLAGS via profile option
+ --disable-profile
+ --disable-silent-rules
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ --disable-workshop
+ --program-suffix=-${SLOT}
+ --with-gdk-pixbuf
+ --with-pango
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ # but needed during testing
+ --without-exiv2
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ --without-graphviz
+ # libspiro: not in portage main tree
+ --without-libspiro
+ --without-lua
+ --without-mrg
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable debug)
+ $(use_enable introspection)
+ $(use_with cairo)
+ $(use_with cairo pangocairo)
+ $(use_with ffmpeg libavformat)
+ $(use_with jpeg2k jasper)
+ $(use_with lcms)
+ $(use_with lensfun)
+ $(use_with openexr)
+ $(use_with raw libraw)
+ $(use_with sdl)
+ $(use_with svg librsvg)
+ $(use_with tiff libtiff)
+ $(use_with umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(use_with v4l libv4l)
+ $(use_with v4l libv4l2)
+ $(use_with vala)
$(use_with webp)
+ )
+
+ if use test; then
+ myeconfargs+=( $(use_with ffmpeg gexiv2) )
+ else
+ myeconfargs+=( "--without-gexiv2" )
+ fi
+
+ econf "${myeconfargs[@]}"
}
src_compile() {
@@ -169,5 +165,5 @@ src_compile() {
src_install() {
default
- prune_libtool_files --all
+ find "${ED}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2017-12-13 19:02 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2017-12-13 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 4a101a83992ba7ee9419652ea36a8902f050eb51
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 17:59:06 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 19:02:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a101a83
media-libs/gegl: Drop old versions
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-libs/gegl/Manifest | 4 -
.../gegl/files/gegl-0.3.14-g_log_domain.patch | 47 ------
.../files/gegl-0.3.14-implicit-declaration.patch | 37 ----
media-libs/gegl/files/gegl-0.3.4-endian.patch | 11 --
.../gegl/files/gegl-0.3.4-underlinking.patch | 31 ----
media-libs/gegl/gegl-0.3.10.ebuild | 179 --------------------
media-libs/gegl/gegl-0.3.12.ebuild | 179 --------------------
media-libs/gegl/gegl-0.3.14.ebuild | 181 --------------------
media-libs/gegl/gegl-0.3.4.ebuild | 188 ---------------------
9 files changed, 857 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 951fc7cffdd..c21b10299cf 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,8 +1,4 @@
DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
-DIST gegl-0.3.10.tar.bz2 5905157 BLAKE2B 18e2d1957286ac30836f611f653ff99a1add39ef1bda9d565220828e7cdbdc53d94df2b92a30d4b07999325f01ce18035dcd8306a8666ec84cf22e402078d2cd SHA512 54df7e0cb26be2f2664eb9373fc2e1dff809df505007c95e72c896f3e2829e2159df7b9701c31b4dc20953a9476de69d603e8d5c1c42078284edfa6cf05dccd7
-DIST gegl-0.3.12.tar.bz2 6037107 BLAKE2B 9972324dd1de9a381eb632995d59d7a8122c8031f8b3f6397bac1a75a16bfbb3de6336b67cb7f90a9f23958437167ea9c9747c273698c4230f83aaf3f4d08448 SHA512 a8c9d1d21b042d2c848a540f69f58c2224c6617e21a6e25b47eb885a0388242195569a81101242041eba2b7c486dbbc47f516fae8d7ab35f4d67ab5f5c2b0fe4
-DIST gegl-0.3.14.tar.bz2 5985306 BLAKE2B fadf3984c9fda413664422b3ab0c6b7fce6b7b110abdbbb89cf4a0e6fb3cc3b13dde10f0f618772213c867e5183756f304e733159e1875ae6cda6de60456bb7f SHA512 8d03bb15433777af3baae20bb987587cef2ae80315116e7e8a3197278c3ca2ff2814aa533ebe2ad4c2cca58a618a8a24b0b6faff0d0ce1194e3d31cfe85beaf9
DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B 4d1dea5b479dc56599d884c43dd8042f6c1c836fe3b5acdadc9b1a909ab4c4be549322767293cfbc065a5f9386b22a579c9c9d78fbad58a4eb6771eccf3a3b45 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
-DIST gegl-0.3.4.tar.bz2 5328192 BLAKE2B 7679f114c5c094a57cf87b6d225050d4f1b1fb3fb2205c1712224668e03b70c8bb13a7e89dcab2df3a970f1d73859aea7d9f3e290aeb2b877044f93a048118a2 SHA512 7fe14c1534d61cfc253bce54cc707f93882ad96302068fe672e6cdcb613430e835ee5d39a5398537f845a6d101eed6fd3d1ff7e4204d51bc9ab5a59c9e09d2ec
DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
diff --git a/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch
deleted file mode 100644
index 4fb81a2b2bb..00000000000
--- a/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 81fb956b221e4b1f919788d8a5f6a3a5462b86ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
-Date: Thu, 23 Mar 2017 14:59:28 +0100
-Subject: build: move G_LOG_DOMAIN define to a Makefile.am as suggested in glib
- docs...
-
----
- configure.ac | 2 --
- gegl/Makefile.am | 2 ++
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 41ed17e..36e8e2a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1269,8 +1269,6 @@ done
- # We should support this at some point if possible
- #LDFLAGS="-Wl,-z,defs"
-
--CFLAGS="$CFLAGS -DG_LOG_DOMAIN=\\\"GEGL\\\""
--
- dnl bin/node-editors/Makefile
- AC_CONFIG_FILES([
- Makefile
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index 2030ebb..b5f70d8 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -12,6 +12,7 @@ endif
-
- SUBDIRS = buffer graph module operation process property-types opencl
-
-+
- CLEANFILES =
-
- AM_CPPFLAGS = \
-@@ -31,6 +32,7 @@ AM_CPPFLAGS = \
- -I$(top_builddir)/gegl/property-types \
- -I$(top_srcdir)/gegl/property-types \
- -DLIBDIR=\""$(libdir)"\" \
-+ -DG_LOG_DOMAIN=\"GEGL\" \
- -DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
-
- AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
---
-cgit v0.12
-
diff --git a/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch b/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
deleted file mode 100644
index 0a7943aebc1..00000000000
--- a/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 72905e2865b4f352da7caa8f722b1db77c07a173 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 2 Apr 2017 00:13:54 +0200
-Subject: [PATCH] Apply upstream fixes for implicit function declaration
- warnings
-
-Source commits:
-https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=7cb72e3a9ade11a506e252623bead17635de2047
-https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=52f01ba49e2246df24a504084863b12794682d37
----
- tests/simple/test-buffer-sharing.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/simple/test-buffer-sharing.c b/tests/simple/test-buffer-sharing.c
-index 94eccda..a52bfa8 100644
---- a/tests/simple/test-buffer-sharing.c
-+++ b/tests/simple/test-buffer-sharing.c
-@@ -16,6 +16,7 @@
- */
-
- #include <gegl.h>
-+#include <glib/gstdio.h>
-
- // in order of progression
- typedef enum _TestState {
-@@ -164,6 +165,8 @@ on_timeout(gpointer user_data) {
- return FALSE;
- }
-
-+#include <unistd.h>
-+
- static void
- test_init(TestData *data) {
-
---
-2.12.2
-
diff --git a/media-libs/gegl/files/gegl-0.3.4-endian.patch b/media-libs/gegl/files/gegl-0.3.4-endian.patch
deleted file mode 100644
index 3df13e69ab0..00000000000
--- a/media-libs/gegl/files/gegl-0.3.4-endian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/operations/external/tiff-load.c
-+++ b/operations/external/tiff-load.c
-@@ -505,7 +505,7 @@
- GeglRectangle line = { 0, p->height - row - 1, p->width, 1 };
- #if G_BYTE_ORDER != G_LITTLE_ENDIAN
- guint row_start = row * p->width;
-- guint row end = row * p->width + p->width;
-+ guint row_end = row * p->width + p->width;
- guint i;
-
- for (i = row_start; i < row_end; i++)
diff --git a/media-libs/gegl/files/gegl-0.3.4-underlinking.patch b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
deleted file mode 100644
index a7a62909efd..00000000000
--- a/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8dd23b1ed5f1ce065839f15a21ca28766835f1fd Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Sat, 5 Dec 2015 17:34:48 +0100
-Subject: [PATCH] Fix underlinking (-lm) of libgegl.so
-
-When linking with ld.gold the builds fails due to underlinking of libgegl.so
-./.libs/libgegl-0.3.so: error: undefined reference to 'tanhf'
-
-Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- gegl/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index e26099c..e53777d 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -39,7 +39,7 @@ AM_LDFLAGS = \
- $(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
-
- LIBS = \
-- $(DEP_LIBS) $(BABL_LIBS)
-+ $(DEP_LIBS) $(BABL_LIBS) -lm
-
- GEGL_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)
-
---
-2.6.3
-
diff --git a/media-libs/gegl/gegl-0.3.10.ebuild b/media-libs/gegl/gegl-0.3.10.ebuild
deleted file mode 100644
index 6ac39e18502..00000000000
--- a/media-libs/gegl/gegl-0.3.10.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://git.gnome.org/gegl"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.14
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.18:2
- x11-libs/pango
-
- cairo? ( x11-libs/cairo )
- ffmpeg? (
- >=media-video/ffmpeg-2.8:0=
- )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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:= )
- media-libs/libpng:0=
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # FIXME: the following should be proper patch sent to upstream
- # fix OSX loadable module filename extension
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- #epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/Makefile.am || die
-
- epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-silent-rules \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- $(use_with jpeg2k jasper) \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_compile() {
- default
-
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.12.ebuild b/media-libs/gegl/gegl-0.3.12.ebuild
deleted file mode 100644
index 650df9398ca..00000000000
--- a/media-libs/gegl/gegl-0.3.12.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://git.gnome.org/gegl"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.24
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.18:2
- x11-libs/pango
-
- cairo? ( x11-libs/cairo )
- ffmpeg? (
- >=media-video/ffmpeg-2.8:0=
- )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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:= )
- media-libs/libpng:0=
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # FIXME: the following should be proper patch sent to upstream
- # fix OSX loadable module filename extension
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- #epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/Makefile.am || die
-
- epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-silent-rules \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- $(use_with jpeg2k jasper) \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_compile() {
- default
-
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild
deleted file mode 100644
index 7a50c447bbf..00000000000
--- a/media-libs/gegl/gegl-0.3.14.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://git.gnome.org/gegl"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.24
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.32:2
- x11-libs/pango
-
- cairo? ( x11-libs/cairo )
- ffmpeg? (
- >=media-video/ffmpeg-2.8:0=
- )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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:= )
- media-libs/libpng:0=
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # FIXME: the following should be proper patch sent to upstream
- # fix OSX loadable module filename extension
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=617618
- epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/Makefile.am || die
-
- epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
- epatch "${FILESDIR}"/${P}-implicit-declaration.patch
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-silent-rules \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- $(use_with jpeg2k jasper) \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_compile() {
- default
-
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
deleted file mode 100644
index c1ed4063b2e..00000000000
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_MIN_API_VERSION=0.20
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://git.gnome.org/gegl"
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.14
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.18:2
- x11-libs/pango
-
- cairo? ( x11-libs/cairo )
- ffmpeg? (
- >=media-video/ffmpeg-2.8:0=
- )
- introspection? ( >=dev-libs/gobject-introspection-1.32 )
- 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 )
- media-libs/libpng:0=
- raw? ( >=media-libs/libraw-0.15.4 )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40.1
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.3.4-endian.patch \
- "${FILESDIR}"/${P}-underlinking.patch
-
- # FIXME: the following should be proper patch sent to upstream
- # fix OSX loadable module filename extension
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- #epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/Makefile.am || die
-
- epatch_user
- eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-silent-rules \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- --with-libjpeg \
- $(use_with jpeg2k jasper) \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- --with-libpng \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_test() {
- gnome2_environment_reset # sandbox issues
- default
-}
-
-src_compile() {
- gnome2_environment_reset # sandbox issues (bug #396687)
- default
-
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2017-05-10 15:41 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2017-05-10 15:41 UTC (permalink / raw
To: gentoo-commits
commit: d8459d23f6d6b328c222a4fa469ffdb8cda7972f
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 15:40:47 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed May 10 15:41:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8459d23
media-libs/gegl: Fix 0.2.0-r2 underlinking (bug #617430)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../gegl/files/gegl-0.2.0-underlinking.patch | 22 ++++++++++++++++++----
media-libs/gegl/gegl-0.2.0-r2.ebuild | 1 +
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
index 4468f387855..53f29c49da7 100644
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -1,6 +1,6 @@
-From db19965ad957edee3c2ef3e321c3904b436749da Mon Sep 17 00:00:00 2001
+From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 9 Jan 2017 21:38:42 +0100
+Date: Wed, 10 May 2017 17:33:05 +0200
Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
Source:
@@ -8,7 +8,8 @@ https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74
---
bin/Makefile.am | 2 +-
examples/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ tools/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c85ecbd..08a156b 100644
@@ -33,6 +34,19 @@ index c29a1dd..5c4ac3a 100644
$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
+ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 8f1077d..4dd3845 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -22,7 +22,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
+ AM_LDFLAGS = \
+ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(BABL_LIBS)
++ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
+
+ noinst_PROGRAMS = introspect operation_reference img_cmp
+
--
-2.11.0
+2.12.2
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index 15d56a636c2..a1199a76cbf 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-g_log_domain.patch
# https://bugs.gentoo.org/show_bug.cgi?id=605216
+ # https://bugs.gentoo.org/show_bug.cgi?id=617430
epatch "${FILESDIR}"/${P}-underlinking.patch
eautoreconf
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2017-03-22 19:28 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2017-03-22 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 5222e472b9882373b5e46adb82968f4126d0b8c6
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 19:25:12 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:28:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5222e472
media-libs/gegl: Disable two failing tests (bug #595332)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../gegl/files/gegl-0.3.12-failing-tests.patch | 33 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.10.ebuild | 4 ++-
media-libs/gegl/gegl-0.3.12.ebuild | 2 ++
media-libs/gegl/gegl-0.3.8.ebuild | 4 ++-
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
new file mode 100644
index 00000000000..c886419925a
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
@@ -0,0 +1,33 @@
+From e3ffef75aabd2d078cf341124ba42ce7673419b3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 22 Mar 2017 19:59:38 +0100
+Subject: [PATCH] Disable failing tests
+
+https://bugs.gentoo.org/show_bug.cgi?id=595332#c3
+---
+ tests/simple/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/simple/Makefile.am b/tests/simple/Makefile.am
+index e28680a..aa7efd8 100644
+--- a/tests/simple/Makefile.am
++++ b/tests/simple/Makefile.am
+@@ -15,7 +15,6 @@ noinst_PROGRAMS = \
+ test-gegl-rectangle \
+ test-gegl-color \
+ test-gegl-tile \
+- test-image-compare \
+ test-license-check \
+ test-misc \
+ test-node-connections \
+@@ -23,7 +22,6 @@ noinst_PROGRAMS = \
+ test-node-properties \
+ test-object-forked \
+ test-opencl-colors \
+- test-serialize \
+ test-path \
+ test-proxynop-processing \
+ test-scaled-blit \
+--
+2.12.0
+
diff --git a/media-libs/gegl/gegl-0.3.10.ebuild b/media-libs/gegl/gegl-0.3.10.ebuild
index 4623228a29c..6ac39e18502 100644
--- a/media-libs/gegl/gegl-0.3.10.ebuild
+++ b/media-libs/gegl/gegl-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -93,6 +93,8 @@ src_prepare() {
-e '/composite-transform.xml/d' \
-i tests/compositions/Makefile.am || die
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+
eautoreconf
gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.12.ebuild b/media-libs/gegl/gegl-0.3.12.ebuild
index 37b1e5de89d..650df9398ca 100644
--- a/media-libs/gegl/gegl-0.3.12.ebuild
+++ b/media-libs/gegl/gegl-0.3.12.ebuild
@@ -93,6 +93,8 @@ src_prepare() {
-e '/composite-transform.xml/d' \
-i tests/compositions/Makefile.am || die
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+
eautoreconf
gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild
index d93f96153ff..c1bd4c14c7b 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -93,6 +93,8 @@ src_prepare() {
-e '/composite-transform.xml/d' \
-i tests/compositions/Makefile.am || die
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+
eautoreconf
gnome2_environment_reset
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/
@ 2015-12-09 1:11 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2015-12-09 1:11 UTC (permalink / raw
To: gentoo-commits
commit: fd4bb68fdb241a27224144045f5ae757f8a76921
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 01:10:49 2015 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 01:10:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4bb68f
media-libs/gegl: Fix USE="-jpeg -png" (bug #567582)
Package-Manager: portage-2.2.26
.../gegl/files/gegl-0.3.4-without-jpeg-png.patch | 58 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.4.ebuild | 1 +
2 files changed, 59 insertions(+)
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
new file mode 100644
index 0000000..81f12d1
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.4-without-jpeg-png.patch
@@ -0,0 +1,58 @@
+From 86e5d9c3f51153afde57d8adbe22408cee6321d2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+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 c2b9409..40fea6e 100644
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ b/media-libs/gegl/gegl-0.3.4.ebuild
@@ -81,6 +81,7 @@ 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
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-12-21 23:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-30 7:58 [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-12-21 23:52 Sam James
2020-06-25 8:08 Joonas Niilola
2020-01-20 13:03 Joonas Niilola
2019-11-14 15:59 Lars Wendler
2018-08-25 17:12 Sebastian Pipping
2017-12-13 19:02 Sebastian Pipping
2017-05-10 15:41 Sebastian Pipping
2017-03-22 19:28 Sebastian Pipping
2015-12-09 1:11 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox