mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
media-libs/gegl: drop <gegl-0.4.34, CVE-2021-45463 affected
Bug: https://bugs.gentoo.org/829880 Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Signed-off-by: John Helmert III <ajak@gentoo.org>
This commit is contained in:
committed by
John Helmert III
parent
2ca46676c9
commit
3ed3104af9
@@ -1,6 +1,2 @@
|
||||
DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
|
||||
DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
|
||||
DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
|
||||
DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef SHA512 68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
|
||||
DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
|
||||
DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Sun, 27 Oct 2019 21:55:03 +0100
|
||||
Subject: [PATCH] Drop failing tests
|
||||
|
||||
---
|
||||
tests/compositions/meson.build | 2 ++
|
||||
tests/python/meson.build | 2 --
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
|
||||
index 8699e7c..5e76e8c 100644
|
||||
--- a/tests/compositions/meson.build
|
||||
+++ b/tests/compositions/meson.build
|
||||
@@ -87,6 +87,7 @@ test('compositions_with_opencl',
|
||||
)
|
||||
endif
|
||||
|
||||
+if false
|
||||
test('compositions_without_opencl',
|
||||
python,
|
||||
args: [
|
||||
@@ -100,3 +101,4 @@ test('compositions_without_opencl',
|
||||
suite: 'compositions',
|
||||
is_parallel: false,
|
||||
)
|
||||
+endif
|
||||
diff --git a/tests/python/meson.build b/tests/python/meson.build
|
||||
index c6782e6..47a160b 100644
|
||||
--- a/tests/python/meson.build
|
||||
+++ b/tests/python/meson.build
|
||||
@@ -2,8 +2,6 @@
|
||||
testnames = [
|
||||
'gegl-buffer',
|
||||
'gegl-color',
|
||||
- 'gegl-format',
|
||||
- 'gegl-node',
|
||||
'gegl',
|
||||
]
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Sun, 27 Oct 2019 22:05:58 +0100
|
||||
Subject: [PATCH] Add suffix "-0.4" to installed programs
|
||||
|
||||
---
|
||||
bin/meson.build | 2 +-
|
||||
tools/meson.build | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bin/meson.build b/bin/meson.build
|
||||
index 4daf6cb..b77b692 100644
|
||||
--- a/bin/meson.build
|
||||
+++ b/bin/meson.build
|
||||
@@ -42,7 +42,7 @@ if libspiro.found()
|
||||
gegl_deps += [ libspiro, ]
|
||||
endif
|
||||
|
||||
-gegl_bin = executable('gegl',
|
||||
+gegl_bin = executable('gegl-0.4',
|
||||
gegl_sources,
|
||||
include_directories: [ rootInclude, geglInclude, ],
|
||||
dependencies: gegl_deps,
|
||||
diff --git a/tools/meson.build b/tools/meson.build
|
||||
index 43c5495..c1b0d63 100644
|
||||
--- a/tools/meson.build
|
||||
+++ b/tools/meson.build
|
||||
@@ -19,7 +19,7 @@ detect_opencl = executable(
|
||||
install: false,
|
||||
)
|
||||
gegl_imgcmp = executable(
|
||||
- 'gegl-imgcmp',
|
||||
+ 'gegl-imgcmp-0.4',
|
||||
'gegl-imgcmp.c',
|
||||
include_directories: [ rootInclude, geglInclude, ],
|
||||
dependencies: [ tools_deps, ],
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Tilloy <olivier.tilloy@canonical.com>
|
||||
Date: Fri, 5 Mar 2021 12:58:18 +0100
|
||||
Subject: [PATCH] Fix build with glib 2.67.3 (see
|
||||
https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
|
||||
|
||||
---
|
||||
operations/external/exr-load.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
|
||||
index e864f7e3e..28403639c 100644
|
||||
--- a/operations/external/exr-load.cpp
|
||||
+++ b/operations/external/exr-load.cpp
|
||||
@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
|
||||
#define GEGL_OP_NAME exr_load
|
||||
#define GEGL_OP_C_FILE "exr-load.cpp"
|
||||
|
||||
-extern "C" {
|
||||
#include "gegl-op.h"
|
||||
-}
|
||||
|
||||
#include <ImfInputFile.h>
|
||||
#include <ImfChannelList.h>
|
||||
@@ -1,22 +0,0 @@
|
||||
From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Sat, 24 Apr 2021 10:51:09 +0000
|
||||
Subject: [PATCH] Fix build with OpenEXR 3
|
||||
|
||||
Add a header that is no longer transitively included
|
||||
---
|
||||
operations/external/exr-save.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
|
||||
index 1e8c09d96..87abed511 100644
|
||||
--- a/operations/external/exr-save.cc
|
||||
+++ b/operations/external/exr-save.cc
|
||||
@@ -45,6 +45,7 @@ extern "C" {
|
||||
#include <ImfChromaticities.h>
|
||||
#include <ImfStandardAttributes.h>
|
||||
#include <ImfArray.h>
|
||||
+#include <ImfFrameBuffer.h>
|
||||
#include "ImathRandom.h"
|
||||
|
||||
|
||||
@@ -1,167 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
# 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A graph based image processing framework"
|
||||
HOMEPAGE="https://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.68.2:2
|
||||
>=dev-libs/json-glib-1.2.6
|
||||
>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
|
||||
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="
|
||||
${PYTHON_DEPS}
|
||||
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}"/${PN}-0.4.18-drop-failing-tests.patch
|
||||
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
|
||||
"${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
|
||||
"${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
use test || return 0
|
||||
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
|
||||
pushd "${S}/opencl/" || die
|
||||
for file in *.cl; do
|
||||
if [ -f "$file" ]; then
|
||||
"${EPYTHON}" cltostring.py "${file}" || die
|
||||
fi
|
||||
done
|
||||
popd || die
|
||||
|
||||
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 pdf poppler)
|
||||
$(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
|
||||
}
|
||||
@@ -1,167 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
# 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A graph based image processing framework"
|
||||
HOMEPAGE="https://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.68.2:2
|
||||
>=dev-libs/json-glib-1.2.6
|
||||
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
|
||||
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="
|
||||
${PYTHON_DEPS}
|
||||
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}"/${PN}-0.4.18-drop-failing-tests.patch
|
||||
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
|
||||
"${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
|
||||
"${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
use test || return 0
|
||||
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
|
||||
pushd "${S}/opencl/" || die
|
||||
for file in *.cl; do
|
||||
if [ -f "$file" ]; then
|
||||
"${EPYTHON}" cltostring.py "${file}" || die
|
||||
fi
|
||||
done
|
||||
popd || die
|
||||
|
||||
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 pdf poppler)
|
||||
$(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
|
||||
}
|
||||
@@ -1,161 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
# vala and introspection support is broken, bug #468208
|
||||
VALA_USE_DEPEND=vapigen
|
||||
|
||||
inherit meson optfeature 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A graph based image processing framework"
|
||||
HOMEPAGE="https://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.68.2:2
|
||||
>=dev-libs/json-glib-1.2.6
|
||||
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
|
||||
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="
|
||||
${PYTHON_DEPS}
|
||||
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}-fix-build-openexr-3.patch
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
use test || return 0
|
||||
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# patch executables suffix
|
||||
sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
|
||||
sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
|
||||
sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
|
||||
# skip UNEXPECTED PASSED 'matting-levin' test
|
||||
sed -i -e "s/composition_tests += 'matting-levin'//" \
|
||||
-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || 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/meson.build || die
|
||||
|
||||
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
|
||||
pushd "${S}/opencl/" || die
|
||||
for file in *.cl; do
|
||||
if [[ -f ${file} ]]; then
|
||||
"${EPYTHON}" cltostring.py "${file}" || die
|
||||
fi
|
||||
done
|
||||
popd || die
|
||||
|
||||
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
|
||||
-Djasper=disabled
|
||||
# - 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 pdf poppler)
|
||||
$(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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
|
||||
}
|
||||
@@ -1,157 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
# vala and introspection support is broken, bug #468208
|
||||
VALA_USE_DEPEND=vapigen
|
||||
|
||||
inherit meson optfeature 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A graph based image processing framework"
|
||||
HOMEPAGE="https://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.68.2:2
|
||||
>=dev-libs/json-glib-1.2.6
|
||||
>=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
|
||||
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="
|
||||
${PYTHON_DEPS}
|
||||
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.adoc )
|
||||
|
||||
python_check_deps() {
|
||||
use test || return 0
|
||||
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# patch executables suffix
|
||||
sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
|
||||
sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
|
||||
sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
|
||||
# skip UNEXPECTED PASSED 'matting-levin' test
|
||||
sed -i -e "s/composition_tests += 'matting-levin'//" \
|
||||
-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || 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/meson.build || die
|
||||
|
||||
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
|
||||
pushd "${S}/opencl/" || die
|
||||
for file in *.cl; do
|
||||
if [[ -f ${file} ]]; then
|
||||
"${EPYTHON}" cltostring.py "${file}" || die
|
||||
fi
|
||||
done
|
||||
popd || die
|
||||
|
||||
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
|
||||
-Djasper=disabled
|
||||
# - 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 pdf poppler)
|
||||
$(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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
|
||||
}
|
||||
Reference in New Issue
Block a user