commit: bf8d9fa7c9bf8fd6f4291216eacbcc2cea9d6ddb Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon Aug 29 22:28:49 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 31 22:26:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8d9fa7
media-libs/gegl: 0.4.38 version bump Use 'filter-lto' to allow build in LTO profiles. Add USE="sdl2" flag. Closes: https://bugs.gentoo.org/859901 Closes: https://bugs.gentoo.org/860246 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/gegl/Manifest | 1 + .../gegl/{gegl-9999.ebuild => gegl-0.4.38.ebuild} | 23 +++++++++++++++++----- media-libs/gegl/gegl-9999.ebuild | 14 ++++++++----- media-libs/gegl/metadata.xml | 1 + 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index a76b1331fa67..be1c2d7dd569 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1 +1,2 @@ DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8 +DIST gegl-0.4.38.tar.xz 5722188 BLAKE2B 8079326f50b18b4698e83f90a4fa8fd26722a3b6fd8d81a9cc1a735e765591e1b76a3dbbef37e7a793231becf265b28bd0bd235076e43ae00c4071d8986a2edf SHA512 367aa67019557b10a19536c56dfbf6687ade183585eeefec65ce12d3c72f5d78330e02ae0ff403609bb7579dc25340a7132b81d36bbf84327c658a96a2d04d4c diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.38.ebuild similarity index 89% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.38.ebuild index bd02e5d34adf..3d430278ceea 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.38.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson optfeature python-any-r1 vala +inherit flag-o-matic meson optfeature python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -24,7 +24,7 @@ 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" +IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) test? ( introspection ) @@ -39,11 +39,11 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.90[introspection?,lcms?,vala?] + >=media-libs/babl-0.1.96[introspection?,lcms?,vala?] + media-libs/libjpeg-turbo 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 ) @@ -55,6 +55,7 @@ RDEPEND=" pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) + sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) @@ -94,9 +95,21 @@ src_prepare() { if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi + + # 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 } src_configure() { + # Bug #859901 + filter-lto + use vala && vala_setup local emesonargs=( @@ -111,7 +124,6 @@ src_configure() { -Dlua=disabled -Dmrg=disabled -Dpango=enabled - -Dsdl2=disabled # - Parameter -Dworkshop=false disables any use of Lua, effectivly -Dworkshop=false $(meson_feature cairo) @@ -123,6 +135,7 @@ src_configure() { $(meson_feature pdf poppler) $(meson_feature raw libraw) $(meson_feature sdl sdl1) + $(meson_feature sdl2 sdl2) $(meson_feature svg librsvg) $(meson_feature test pygobject) $(meson_feature tiff libtiff) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index bd02e5d34adf..00fa8f0bf995 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson optfeature python-any-r1 vala +inherit flag-o-matic meson optfeature python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -24,7 +24,7 @@ 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" +IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) test? ( introspection ) @@ -39,11 +39,11 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.90[introspection?,lcms?,vala?] + >=media-libs/babl-0.1.96[introspection?,lcms?,vala?] + media-libs/libjpeg-turbo 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 ) @@ -55,6 +55,7 @@ RDEPEND=" pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) + sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) @@ -97,6 +98,9 @@ src_prepare() { } src_configure() { + # Bug #859901 + filter-lto + use vala && vala_setup local emesonargs=( @@ -111,7 +115,6 @@ src_configure() { -Dlua=disabled -Dmrg=disabled -Dpango=enabled - -Dsdl2=disabled # - Parameter -Dworkshop=false disables any use of Lua, effectivly -Dworkshop=false $(meson_feature cairo) @@ -123,6 +126,7 @@ src_configure() { $(meson_feature pdf poppler) $(meson_feature raw libraw) $(meson_feature sdl sdl1) + $(meson_feature sdl2 sdl2) $(meson_feature svg librsvg) $(meson_feature test pygobject) $(meson_feature tiff libtiff) diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml index 6c5403ce1547..3a7a19add4b2 100644 --- a/media-libs/gegl/metadata.xml +++ b/media-libs/gegl/metadata.xml @@ -11,6 +11,7 @@ </maintainer> <use> <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag> + <flag name="sdl2">Add support for Simple Direct Layer 2.0 (<pkg>media-libs/libsdl2</pkg>)</flag> <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag> </use> </pkgmetadata>
