summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin65959 -> 65951 bytes
-rw-r--r--media-libs/babl/Manifest4
-rw-r--r--media-libs/babl/babl-0.1.96.ebuild62
-rw-r--r--media-libs/babl/babl-9999.ebuild2
-rw-r--r--media-libs/gegl/Manifest6
-rw-r--r--media-libs/gegl/gegl-0.4.38.ebuild156
-rw-r--r--media-libs/gegl/gegl-9999.ebuild16
-rw-r--r--media-libs/gegl/metadata.xml1
-rw-r--r--media-libs/netpbm/Manifest9
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch22
-rw-r--r--media-libs/netpbm/netpbm-10.86.24-r1.ebuild220
-rw-r--r--media-libs/netpbm/netpbm-10.86.27.ebuild227
-rw-r--r--media-libs/netpbm/netpbm-10.86.34.ebuild (renamed from media-libs/netpbm/netpbm-10.86.30.ebuild)4
-rw-r--r--media-libs/opencolorio/Manifest3
-rw-r--r--media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch27
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.2.ebuild1
16 files changed, 271 insertions, 489 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 826936e3a126..6cb5da319386 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 22fa232d3f27..9c65ea9f1ba1 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,6 +1,8 @@
AUX babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch 687 BLAKE2B 5e582c0731ad659977111ad6d7c5ae85c756ff0c98aab94f8a7d06ffed25444654b2e63cf129207429d6f4bf1b6c4451026e30ce6d0fdf5fa1060fe3e6e2e2f7 SHA512 a938c501a20ffe7669c101196b3855d8cb97fa2277d9a8f36167a13e80880a970cf3b697aa262cff092cc3b726108ecd76459c24c1f481cb236717a3371e64d3
DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
+DIST babl-0.1.96.tar.xz 312184 BLAKE2B 6ee307054cf4d1e0f434a6070189ed143c60056decb59184f880b26863c8177d0c69294254651923f7dfb897555939602e6f4384e7561a839a3cf80ae9468859 SHA512 771d68b80f1123baa38256e4b1d7946284cd88997b2ab7c7092a74120e91ea5ee7ab4c001686ae4b3e363b6465484f185a64f9c75515a55d3ffb81fecbeaca42
EBUILD babl-0.1.92-r1.ebuild 1923 BLAKE2B 6d1c10dee304bfd6c40d431ec1fc0db206668a38ac2fdcbea816cd6fa75889f773d781b85e87043f246a81d9b2c51625c8201b291c38c80474d7ed940b412d03 SHA512 45679b51b69ae403bda0753af41f4890702dff5b530daaf763c8fb95f634f56c9dd5c56bcc69b86c670dd4dc838539ade13597616ed6c84423463e3af800b134
EBUILD babl-0.1.92.ebuild 1829 BLAKE2B 6b63020df7b902a92183e79000d342c13821ad3e87f005159cae04071750abe2f82f7fa7fd09a0cec6f94a65d6481522f08703ed6d1049133de3fbd2984ac2a4 SHA512 cad47bf1d01849165c502789f232d46c23c0d9bebec5725881ec1bc7cf0f1086f5f7bca804e0833bc06ab7a177e8ae754fe75670e0e8b602ee16932125480606
-EBUILD babl-9999.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
+EBUILD babl-0.1.96.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
+EBUILD babl-9999.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.96.ebuild b/media-libs/babl/babl-0.1.96.ebuild
new file mode 100644
index 000000000000..d97d11c00c37
--- /dev/null
+++ b/media-libs/babl/babl-0.1.96.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.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 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="https://gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+RDEPEND="
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ gnome2_environment_reset
+}
+
+src_configure() {
+ use vala && vala_setup
+
+ # Automagic rsvg support is just for website generation we do not call,
+ # so we don't need to fix it
+ # w3m is used for dist target thus no issue for us that it is automagically
+ # detected
+ local emesonargs=(
+ -Dwith-docs=false
+ $(meson_use introspection enable-gir)
+ $(meson_use lcms with-lcms)
+ $(meson_use vala enable-vapi)
+ $(meson_use cpu_flags_x86_avx2 enable-avx2)
+ $(meson_use cpu_flags_x86_f16c enable-f16c)
+ $(meson_use cpu_flags_x86_mmx enable-mmx)
+ $(meson_use cpu_flags_x86_sse enable-sse)
+ $(meson_use cpu_flags_x86_sse2 enable-sse2)
+ $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 9c019093af42..d97d11c00c37 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
SRC_URI=""
else
- SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+ 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 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
fi
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index fac89bdb0563..efa2f1d33cf6 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,4 +1,6 @@
DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
+DIST gegl-0.4.38.tar.xz 5722188 BLAKE2B 8079326f50b18b4698e83f90a4fa8fd26722a3b6fd8d81a9cc1a735e765591e1b76a3dbbef37e7a793231becf265b28bd0bd235076e43ae00c4071d8986a2edf SHA512 367aa67019557b10a19536c56dfbf6687ade183585eeefec65ce12d3c72f5d78330e02ae0ff403609bb7579dc25340a7132b81d36bbf84327c658a96a2d04d4c
EBUILD gegl-0.4.36-r1.ebuild 4588 BLAKE2B dc35ccabe00e2e53c759964de5556939ccb5047ccb2c70fe0039a52f410afb21696f501c1e51da20138920ba54c66781ee8c1cd0099677a866b7d68df9de01c7 SHA512 65ed7c2a49db5444b2ec2032658130dfd331fe1b1ba179f7d7a26ad81aed3236538ebc947f4991fd396b1370679566941cc9360ebf2ff4a334096659ec3902c0
-EBUILD gegl-9999.ebuild 4378 BLAKE2B 84ff73cd6821e16038c52a87daaa404d7b4c09b701c0251bd2744bdd57a546f90f636efce4e6dd838c99131e251bd6c710fbb0190449bb51e412c3a357df7416 SHA512 5aa398283404313498eb5638f0a0c9c31b0f8db59acde5d5fb244558cb8148510463217c850196d972e9eb8a5148401ed03604580dbaf3e0248ccaeb743921dd
-MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
+EBUILD gegl-0.4.38.ebuild 4697 BLAKE2B d9746761982eb13b9a01929ea87a92c8c3cc305265253e227e7a3f23f151cd70d1965cacd9941fbb93735ea65b6b31284bad8516dcecac31ea6ab3e7f7797bf1 SHA512 828b4f007b4e6f1123f6da8d5cc53ae3202ce02029b143f4e45c2bcbb1df82048902ee13fcb1e9aa5a953f1df73a25c862d3423edc5a1fff71b694f0fb16d4d0
+EBUILD gegl-9999.ebuild 4483 BLAKE2B 18ae15481a8fef93605238456bb5e03734d58aec6e33d91e72bfd9a8a4e9b3628efd2a0d2360b7bf1b5006175233a1c442121d7e4ef2ba8b24f1b320fa7e8f5c SHA512 39d9a36b5fc7be68ad7bba03248a3e1e6f2fbd93be044d482d3b14ad3569fc0a76a42fe3a1f4783b36897d1b6d82c68391bda6d95c8bbdf9ba3e6627ad6506a8
+MISC metadata.xml 680 BLAKE2B 6785a153412860b02b1ca6daa7c6e62f5f178c0a01346bd42dac8da5254ec9ada1c4aaab96944072216b414e5bdc5d8999fbb16dbe6c5127f8988873b07817e7 SHA512 c75bc64503925b586e6aaee3a38fceb793e0d9b3f17bb487fd72a32615ac24eb509e4efb7243d9606572507f41f98ba6b5fe8ac12ea23a87f012d69d24e92d5e
diff --git a/media-libs/gegl/gegl-0.4.38.ebuild b/media-libs/gegl/gegl-0.4.38.ebuild
new file mode 100644
index 000000000000..79681b0950fe
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.38.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic 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 sdl2 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.96[introspection?,lcms?,vala?]
+ media-libs/libjpeg-turbo
+ media-libs/libnsgif
+ >=media-libs/libpng-1.6.0:0=
+ >=sys-libs/zlib-1.2.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 )
+ 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 )
+ 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
+
+ # 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=(
+ # - 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
+ # - 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 sdl2 sdl2)
+ $(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
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index bd02e5d34adf..0039c8802478 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -3,11 +3,11 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
# 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>
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 48fa44097952..59e1b837f85f 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -3,13 +3,8 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c
AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
-AUX netpbm-10.86.24-fix-test-ppc64.patch 634 BLAKE2B 41f42436d5f77a37a1e8cb9200cb470d894953f85a3ee3d0b754cb32960f1f60c28d7e2c4ac3578220f7f5f5b4eb68d98b3c0e8e5d5ac7a91a5851859c0ea555 SHA512 5f79bd90ea9ea8d1577a71ba9aebfb24d8c02f845b26b81a9403e411e284f4213af931769dfa367be6c5f4e0453771e480df684a64dedacc858f1e3171a39fd2
-DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
-DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
-DIST netpbm-10.86.30.tar.xz 3692036 BLAKE2B 2529adfe7f93cf2400547c107cf04b03478aef95bce6573195a6a9e20767b04371bcff13744aa547885ffa3137d948076de01ad0a979f4464c13e3fdeeb37bf7 SHA512 7643b279c59717b30130e7178be82638085d2ae28c0cea8c7595f5ff3a1cd3c5dd0201a051bed8997f8a8354b5eeb08949d4e8587d3e807df7859a4cb1a44534
DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca
-EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
-EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
-EBUILD netpbm-10.86.30.ebuild 6026 BLAKE2B 7233840edd237c92f5466d6c8f2b23e03f171cf922a64d944e434ed165327da0c0bc4b2263ffcc32541212ef0260275ef755a8ada8d2d5b4695e5f243880e982 SHA512 821581a46527b938fcc59a45c534baed81ad0ad673980ea7cce5ee2e79ae760621f17e398271763da8ca0c1fefc0f71df8805cd5d2ce258e9f7ab808725bb85d
+DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870
EBUILD netpbm-10.86.33.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc
+EBUILD netpbm-10.86.34.ebuild 6056 BLAKE2B d9f4109dd96128f1de18010ebb080e5dca5e3a85066b94d5af645ce2ccd7b81dc9133d7d5498ecaba84c08025ce9f5110473feff8747daf681aa82097a040e05 SHA512 9a286556e902e75dd88534f6c4740fc6807cc36b8307172daa501bd088701cd06b977a4a85f0bfa7d17e067e4c29e3a0dc71252041edc4100aefa52bdcd55596
MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
deleted file mode 100644
index e1b558d59117..000000000000
--- a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-char is unsigned by default on ppc64
-
---- a/converter/other/pnmtopalm/palmtopnm.c
-+++ b/converter/other/pnmtopalm/palmtopnm.c
-@@ -823,7 +823,7 @@
- unsigned int j;
-
- for (j = 0; j < bytesPerRow; ) {
-- char incount;
-+ signed char incount;
- pm_readchar(ifP, &incount);
- if (incount < 0) {
- /* How do we handle incount == -128 ? */
-@@ -865,7 +865,7 @@
- unsigned int j;
-
- for (j = 0; j < bytesPerRow; ) {
-- char incount;
-+ signed char incount;
- pm_readchar(ifP, &incount);
- if (incount < 0) {
- /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.86.24-r1.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
deleted file mode 100644
index bef703001a86..000000000000
--- a/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-# zlib USE flag is no longer used, enabled by default.
-# cannot remove it yet because of #801445
-
-BDEPEND="
- app-arch/xz-utils
- sys-devel/flex
- virtual/pkgconfig
-"
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-RDEPEND="jbig? ( media-libs/jbigkit:= )
- jpeg? ( virtual/jpeg:0 )
- png? (
- >=media-libs/libpng-1.4:0=
- sys-libs/zlib
- )
- postscript? (
- app-text/ghostscript-gpl
- sys-libs/zlib
- )
- rle? ( media-libs/urt:= )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/netpbm-10.86.21-build.patch
- "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
- "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
- "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
- "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
-)
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-
-netpbm_ldshlib() {
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use ${1} ; then
- [[ ${2} != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- default
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
- sed -i \
- -e 's:pkg-config:$(PKG_CONFIG):' \
- GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
- # The postscript knob is currently bound up with a fork test.
- if ! use postscript ; then
- sed -i \
- -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
- converter/other/Makefile generator/Makefile || die
- sed -i -r \
- -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
- sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
- fi
-
- # the new postscript test needs +x
- chmod +x test/lps-roundtrip.test
-
- # Do not test png if not built
- if ! use png ; then
- sed -i -r \
- -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
-
- sed -i -r \
- -e 's:(pamrgbatopng|pngtopnm).*::' \
- test/legacy-names.{ok,test} || die
- sed -i -e '/^$/d' test/legacy-names.ok || die
- sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
- fi
-}
-
-src_configure() {
- # cannot chain the die with the heredoc
- # repoman tries to parse the heredoc and fails
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # These vars let src_test work by default
- PKGDIR_DEFAULT = ${T}/netpbm
- RESULTDIR_DEFAULT = ${T}/netpbm-test
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
- PKG_CONFIG = $(tc-getPKG_CONFIG)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
- STATICLIB_TOO = $(usex static-libs Y N)
-
- # The var is called SSE, but the code is actually SSE2.
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = -lz
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = $(netpbm_config jbig)
- JBIGHDR_DIR =
- JASPERLIB = NONE
- JASPERHDR_DIR =
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- [[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
- emake -j1 pm_config.h version.h manual_importinc #149843
- emake
-}
-
-src_test() {
- # The code wants to install everything first and then test the result.
- emake install.{bin,lib,data}
- emake check
-}
-
-src_install() {
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr
-
- if [[ $(get_libdir) != "lib" ]] ; then
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
- dodir /usr/share
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- doman userguide/*.[0-9]
- dodoc README
-
- cd doc || die
- dodoc HISTORY Netpbm.programming USERDOC
- docinto html
- dodoc -r *.html
-
- use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.86.27.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
deleted file mode 100644
index f263c1e4370c..000000000000
--- a/media-libs/netpbm/netpbm-10.86.27.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-# zlib USE flag is no longer used, enabled by default.
-# cannot remove it yet because of #801445
-
-BDEPEND="
- app-arch/xz-utils
- sys-devel/flex
- virtual/pkgconfig
-"
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-RDEPEND="jbig? ( media-libs/jbigkit:= )
- jpeg? ( virtual/jpeg:0 )
- png? (
- >=media-libs/libpng-1.4:0=
- sys-libs/zlib
- )
- postscript? (
- app-text/ghostscript-gpl
- sys-libs/zlib
- )
- rle? ( media-libs/urt:= )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/netpbm-10.86.21-build.patch
- "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
- "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
- "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
-)
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-
-netpbm_ldshlib() {
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use ${1} ; then
- [[ ${2} != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-# for bug #828127
-netpbm_cflags_for_build() {
- if is-flagq -fPIC; then
- echo -fPIC
- fi
-}
-
-src_prepare() {
- default
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
- sed -i \
- -e 's:pkg-config:$(PKG_CONFIG):' \
- GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
- # The postscript knob is currently bound up with a fork test.
- if ! use postscript ; then
- sed -i \
- -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
- converter/other/Makefile generator/Makefile || die
- sed -i -r \
- -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
- sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
- fi
-
- # the new postscript test needs +x
- chmod +x test/lps-roundtrip.test
-
- # Do not test png if not built
- if ! use png ; then
- sed -i -r \
- -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
-
- sed -i -r \
- -e 's:(pamrgbatopng|pngtopnm).*::' \
- test/legacy-names.{ok,test} || die
- sed -i -e '/^$/d' test/legacy-names.ok || die
- sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
- fi
-}
-
-src_configure() {
- # cannot chain the die with the heredoc
- # repoman tries to parse the heredoc and fails
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # These vars let src_test work by default
- PKGDIR_DEFAULT = ${T}/netpbm
- RESULTDIR_DEFAULT = ${T}/netpbm-test
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
- PKG_CONFIG = $(tc-getPKG_CONFIG)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
- CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
- STATICLIB_TOO = $(usex static-libs Y N)
-
- # The var is called SSE, but the code is actually SSE2.
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = $(netpbm_config jbig)
- JBIGHDR_DIR =
- JASPERLIB = NONE
- JASPERHDR_DIR =
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- [[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
- emake -j1 pm_config.h version.h manual_importinc #149843
- emake
-}
-
-src_test() {
- # The code wants to install everything first and then test the result.
- emake install.{bin,lib,data}
- emake check
-}
-
-src_install() {
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr
-
- if [[ $(get_libdir) != "lib" ]] ; then
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
- dodir /usr/share
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- doman userguide/*.[0-9]
- dodoc README
-
- cd doc || die
- dodoc HISTORY Netpbm.programming USERDOC
- docinto html
- dodoc -r *.html
-
- use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.86.30.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild
index 08e5db5c969b..6bcdb4345f40 100644
--- a/media-libs/netpbm/netpbm-10.86.30.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
BDEPEND="
@@ -22,7 +22,7 @@ BDEPEND="
# app-text/ghostscript-gpl is really needed for postscript
# some utilities execute /usr/bin/gs
RDEPEND="jbig? ( media-libs/jbigkit:= )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
png? (
>=media-libs/libpng-1.4:0=
sys-libs/zlib
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index ca544bbdb4a3..d86e02787f4f 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,6 +1,7 @@
AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
+AUX opencolorio-2.1.2-musl-strtol.patch 1041 BLAKE2B 58384b1a2a6e2778219909aaabe95061f0348ea7302cf97f85f417b709511b250cec578b8c3d85f2b0c1d35a469c4ddde932cc0ee1040daec8664141e9c1df4e SHA512 d268ac0c55ff6dcf5e1756a65c0593e39b2a7b86ccb913d5cbeaf6877465b537592bd903187a4183ae69c96b3c420ac1bcdf2175ff2071339eaaeed49bb6f52e
DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5ccccd4383c SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B fc8fcf4425f54319d1682adbb75d10e826c0427e6e88df3235f8fc5eb0296ad95582d637adca5a4f8edc3acdb819ce5544c88e5da8ce5366c4fbae30959958d5 SHA512 a68e6e983ee08be66d6732304de7c775a4292797c13b350f93bdf4410cb2d47720869c7d4d66514be011df6aea70c407a6ddfccd975c2eef87cddab42f73e54c
-EBUILD opencolorio-2.1.2.ebuild 3211 BLAKE2B d25624a37c728daa4cd55a3f4bea0fbf24de5a4da9b0272a867e7a6130a973236cc1845854df64074ee0f67544f856eb135a318aa69a6ab3548667fc2cba1446 SHA512 15c374d5d95bf03d0701658ee7d8f380eba81fb3f6cf634c1397198401e7f29f7021870ff278087300691c3c25c22dfe9c90b0579e27623e515cfd4ff55d7fd4
+EBUILD opencolorio-2.1.2.ebuild 3256 BLAKE2B 2269c61cee1e8a6dd89a6e2b38055521ef796905602edfa5516878a3d8d283557f5d02ba6b569edf0541f79362ddc52734b0c28e09876b48f8d1ad21e4e6539f SHA512 ec43b26e9c2fdec44cc432665709e68f5595b919dbe7014526456d9fc670d4e5897f1152dbf118541bf6cac412072dc793e2c7da323df2452a1221c5957b9fba
MISC metadata.xml 475 BLAKE2B a5e021764a849b172bc4e5a70bcf9c45930f2be703ec8b9db4ad2b6c0395eeab9cbe404d9146f2d48df5c7fb1d68b11bc1a5dc235c58ca6d6e715676fe2dea21 SHA512 823dba870b69fabaa8a61351ea24bbca701fec4a5d64d6a9a75a2306910b663447caaac7ef6e06ccb6d945a5e9eea4ebcb5322154eadcdc2d191abf879bf786d
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
new file mode 100644
index 000000000000..87059614ff03
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
@@ -0,0 +1,27 @@
+# Fix strtol_l missing on musl. On musl libc use strtol
+# Taken from Alpine Linux, please refer:
+# https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch?id=dd7ba461824ab0618f0493cbb450b221fdc2513c
+# Please refer: https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1624
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif defined(__GLIBC__)
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
diff --git a/media-libs/opencolorio/opencolorio-2.1.2.ebuild b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
index 17b4b7fb8e1f..eda322b00de6 100644
--- a/media-libs/opencolorio/opencolorio-2.1.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
@@ -55,6 +55,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-gcc12.patch
+ "${FILESDIR}"/${PN}-2.1.2-musl-strtol.patch
)
pkg_setup() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 08:55:05 +0000