diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-30 09:26:23 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-30 09:58:21 +0200 |
commit | f31d84455b49bff742e837991f0ca3878ad844bd (patch) | |
tree | 4e6a5a000993b76fe1a80c604dd58787712b9343 /media-libs/gegl | |
parent | media-gfx/gimp: Drop 2.10.14-r1 (diff) | |
download | gentoo-f31d84455b49bff742e837991f0ca3878ad844bd.tar.gz gentoo-f31d84455b49bff742e837991f0ca3878ad844bd.tar.bz2 gentoo-f31d84455b49bff742e837991f0ca3878ad844bd.zip |
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@gentoo.org>
Diffstat (limited to 'media-libs/gegl')
-rw-r--r-- | media-libs/gegl/Manifest | 1 | ||||
-rw-r--r-- | media-libs/gegl/files/gegl-0.3.34-failing-tests.patch | 27 | ||||
-rw-r--r-- | media-libs/gegl/files/gegl-0.3.34-fno-common.patch | 11 | ||||
-rw-r--r-- | media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch | 30 | ||||
-rw-r--r-- | media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch | 51 | ||||
-rw-r--r-- | media-libs/gegl/gegl-0.4.18-r1.ebuild | 161 | ||||
-rw-r--r-- | media-libs/gegl/gegl-0.4.18.ebuild | 163 |
7 files changed, 0 insertions, 444 deletions
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index a02306475c30..b63767947c76 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 c388ac556e9b..000000000000 --- 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 8c1c045758b4..000000000000 --- 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 ecb1be4c7354..000000000000 --- 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 7f6b3624f361..000000000000 --- 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 799cc107712f..000000000000 --- 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 3aac36f5af6f..000000000000 --- 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 -} |