| 1 |
commit: bf8d9fa7c9bf8fd6f4291216eacbcc2cea9d6ddb |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Mon Aug 29 22:28:49 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 22:26:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8d9fa7 |
| 7 |
|
| 8 |
media-libs/gegl: 0.4.38 version bump |
| 9 |
|
| 10 |
Use 'filter-lto' to allow build in LTO profiles. |
| 11 |
Add USE="sdl2" flag. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/859901 |
| 14 |
Closes: https://bugs.gentoo.org/860246 |
| 15 |
|
| 16 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
media-libs/gegl/Manifest | 1 + |
| 20 |
.../gegl/{gegl-9999.ebuild => gegl-0.4.38.ebuild} | 23 +++++++++++++++++----- |
| 21 |
media-libs/gegl/gegl-9999.ebuild | 14 ++++++++----- |
| 22 |
media-libs/gegl/metadata.xml | 1 + |
| 23 |
4 files changed, 29 insertions(+), 10 deletions(-) |
| 24 |
|
| 25 |
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest |
| 26 |
index a76b1331fa67..be1c2d7dd569 100644 |
| 27 |
--- a/media-libs/gegl/Manifest |
| 28 |
+++ b/media-libs/gegl/Manifest |
| 29 |
@@ -1 +1,2 @@ |
| 30 |
DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8 |
| 31 |
+DIST gegl-0.4.38.tar.xz 5722188 BLAKE2B 8079326f50b18b4698e83f90a4fa8fd26722a3b6fd8d81a9cc1a735e765591e1b76a3dbbef37e7a793231becf265b28bd0bd235076e43ae00c4071d8986a2edf SHA512 367aa67019557b10a19536c56dfbf6687ade183585eeefec65ce12d3c72f5d78330e02ae0ff403609bb7579dc25340a7132b81d36bbf84327c658a96a2d04d4c |
| 32 |
|
| 33 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.38.ebuild |
| 34 |
similarity index 89% |
| 35 |
copy from media-libs/gegl/gegl-9999.ebuild |
| 36 |
copy to media-libs/gegl/gegl-0.4.38.ebuild |
| 37 |
index bd02e5d34adf..3d430278ceea 100644 |
| 38 |
--- a/media-libs/gegl/gegl-9999.ebuild |
| 39 |
+++ b/media-libs/gegl/gegl-0.4.38.ebuild |
| 40 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) |
| 41 |
# vala and introspection support is broken, bug #468208 |
| 42 |
VALA_USE_DEPEND=vapigen |
| 43 |
|
| 44 |
-inherit meson optfeature python-any-r1 vala |
| 45 |
+inherit flag-o-matic meson optfeature python-any-r1 vala |
| 46 |
|
| 47 |
if [[ ${PV} == *9999* ]]; then |
| 48 |
inherit git-r3 |
| 49 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://gegl.org/" |
| 50 |
LICENSE="|| ( GPL-3+ LGPL-3 )" |
| 51 |
SLOT="0.4" |
| 52 |
|
| 53 |
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" |
| 54 |
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" |
| 55 |
REQUIRED_USE=" |
| 56 |
svg? ( cairo ) |
| 57 |
test? ( introspection ) |
| 58 |
@@ -39,11 +39,11 @@ RESTRICT="!test? ( test )" |
| 59 |
RDEPEND=" |
| 60 |
>=dev-libs/glib-2.68.2:2 |
| 61 |
>=dev-libs/json-glib-1.2.6 |
| 62 |
- >=media-libs/babl-0.1.90[introspection?,lcms?,vala?] |
| 63 |
+ >=media-libs/babl-0.1.96[introspection?,lcms?,vala?] |
| 64 |
+ media-libs/libjpeg-turbo |
| 65 |
media-libs/libnsgif |
| 66 |
>=media-libs/libpng-1.6.0:0= |
| 67 |
>=sys-libs/zlib-1.2.0 |
| 68 |
- virtual/jpeg:0= |
| 69 |
>=x11-libs/gdk-pixbuf-2.32:2 |
| 70 |
>=x11-libs/pango-1.38.0 |
| 71 |
cairo? ( >=x11-libs/cairo-1.12.2 ) |
| 72 |
@@ -55,6 +55,7 @@ RDEPEND=" |
| 73 |
pdf? ( >=app-text/poppler-0.71.0[cairo] ) |
| 74 |
raw? ( >=media-libs/libraw-0.15.4:0= ) |
| 75 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 76 |
+ sdl2? ( >=media-libs/libsdl2-2.0.20 ) |
| 77 |
svg? ( >=gnome-base/librsvg-2.40.6:2 ) |
| 78 |
tiff? ( >=media-libs/tiff-4:0 ) |
| 79 |
umfpack? ( sci-libs/umfpack ) |
| 80 |
@@ -94,9 +95,21 @@ src_prepare() { |
| 81 |
if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then |
| 82 |
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die |
| 83 |
fi |
| 84 |
+ |
| 85 |
+ # fix 'build'headers from *.cl on gentoo-hardened, bug 739816 |
| 86 |
+ pushd "${S}/opencl/" || die |
| 87 |
+ for file in *.cl; do |
| 88 |
+ if [[ -f ${file} ]]; then |
| 89 |
+ "${EPYTHON}" cltostring.py "${file}" || die |
| 90 |
+ fi |
| 91 |
+ done |
| 92 |
+ popd || die |
| 93 |
} |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
+ # Bug #859901 |
| 97 |
+ filter-lto |
| 98 |
+ |
| 99 |
use vala && vala_setup |
| 100 |
|
| 101 |
local emesonargs=( |
| 102 |
@@ -111,7 +124,6 @@ src_configure() { |
| 103 |
-Dlua=disabled |
| 104 |
-Dmrg=disabled |
| 105 |
-Dpango=enabled |
| 106 |
- -Dsdl2=disabled |
| 107 |
# - Parameter -Dworkshop=false disables any use of Lua, effectivly |
| 108 |
-Dworkshop=false |
| 109 |
$(meson_feature cairo) |
| 110 |
@@ -123,6 +135,7 @@ src_configure() { |
| 111 |
$(meson_feature pdf poppler) |
| 112 |
$(meson_feature raw libraw) |
| 113 |
$(meson_feature sdl sdl1) |
| 114 |
+ $(meson_feature sdl2 sdl2) |
| 115 |
$(meson_feature svg librsvg) |
| 116 |
$(meson_feature test pygobject) |
| 117 |
$(meson_feature tiff libtiff) |
| 118 |
|
| 119 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild |
| 120 |
index bd02e5d34adf..00fa8f0bf995 100644 |
| 121 |
--- a/media-libs/gegl/gegl-9999.ebuild |
| 122 |
+++ b/media-libs/gegl/gegl-9999.ebuild |
| 123 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) |
| 124 |
# vala and introspection support is broken, bug #468208 |
| 125 |
VALA_USE_DEPEND=vapigen |
| 126 |
|
| 127 |
-inherit meson optfeature python-any-r1 vala |
| 128 |
+inherit flag-o-matic meson optfeature python-any-r1 vala |
| 129 |
|
| 130 |
if [[ ${PV} == *9999* ]]; then |
| 131 |
inherit git-r3 |
| 132 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://gegl.org/" |
| 133 |
LICENSE="|| ( GPL-3+ LGPL-3 )" |
| 134 |
SLOT="0.4" |
| 135 |
|
| 136 |
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" |
| 137 |
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" |
| 138 |
REQUIRED_USE=" |
| 139 |
svg? ( cairo ) |
| 140 |
test? ( introspection ) |
| 141 |
@@ -39,11 +39,11 @@ RESTRICT="!test? ( test )" |
| 142 |
RDEPEND=" |
| 143 |
>=dev-libs/glib-2.68.2:2 |
| 144 |
>=dev-libs/json-glib-1.2.6 |
| 145 |
- >=media-libs/babl-0.1.90[introspection?,lcms?,vala?] |
| 146 |
+ >=media-libs/babl-0.1.96[introspection?,lcms?,vala?] |
| 147 |
+ media-libs/libjpeg-turbo |
| 148 |
media-libs/libnsgif |
| 149 |
>=media-libs/libpng-1.6.0:0= |
| 150 |
>=sys-libs/zlib-1.2.0 |
| 151 |
- virtual/jpeg:0= |
| 152 |
>=x11-libs/gdk-pixbuf-2.32:2 |
| 153 |
>=x11-libs/pango-1.38.0 |
| 154 |
cairo? ( >=x11-libs/cairo-1.12.2 ) |
| 155 |
@@ -55,6 +55,7 @@ RDEPEND=" |
| 156 |
pdf? ( >=app-text/poppler-0.71.0[cairo] ) |
| 157 |
raw? ( >=media-libs/libraw-0.15.4:0= ) |
| 158 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 159 |
+ sdl2? ( >=media-libs/libsdl2-2.0.20 ) |
| 160 |
svg? ( >=gnome-base/librsvg-2.40.6:2 ) |
| 161 |
tiff? ( >=media-libs/tiff-4:0 ) |
| 162 |
umfpack? ( sci-libs/umfpack ) |
| 163 |
@@ -97,6 +98,9 @@ src_prepare() { |
| 164 |
} |
| 165 |
|
| 166 |
src_configure() { |
| 167 |
+ # Bug #859901 |
| 168 |
+ filter-lto |
| 169 |
+ |
| 170 |
use vala && vala_setup |
| 171 |
|
| 172 |
local emesonargs=( |
| 173 |
@@ -111,7 +115,6 @@ src_configure() { |
| 174 |
-Dlua=disabled |
| 175 |
-Dmrg=disabled |
| 176 |
-Dpango=enabled |
| 177 |
- -Dsdl2=disabled |
| 178 |
# - Parameter -Dworkshop=false disables any use of Lua, effectivly |
| 179 |
-Dworkshop=false |
| 180 |
$(meson_feature cairo) |
| 181 |
@@ -123,6 +126,7 @@ src_configure() { |
| 182 |
$(meson_feature pdf poppler) |
| 183 |
$(meson_feature raw libraw) |
| 184 |
$(meson_feature sdl sdl1) |
| 185 |
+ $(meson_feature sdl2 sdl2) |
| 186 |
$(meson_feature svg librsvg) |
| 187 |
$(meson_feature test pygobject) |
| 188 |
$(meson_feature tiff libtiff) |
| 189 |
|
| 190 |
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml |
| 191 |
index 6c5403ce1547..3a7a19add4b2 100644 |
| 192 |
--- a/media-libs/gegl/metadata.xml |
| 193 |
+++ b/media-libs/gegl/metadata.xml |
| 194 |
@@ -11,6 +11,7 @@ |
| 195 |
</maintainer> |
| 196 |
<use> |
| 197 |
<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag> |
| 198 |
+ <flag name="sdl2">Add support for Simple Direct Layer 2.0 (<pkg>media-libs/libsdl2</pkg>)</flag> |
| 199 |
<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag> |
| 200 |
</use> |
| 201 |
</pkgmetadata> |
Archives