commit: dca13d0a3b8907389c166cc7c3ad2045e070225c
Author: NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Mon Apr 7 15:36:58 2025 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri May 2 00:46:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca13d0a
media-libs/imlib2: add v1.12.5, drop v1.12.4
- adds y4m useflag
- new config switch rtld-local-support is enabled unconditionally
as dev-perl/Image-Imlib2 might be depending on it. note that
before imlib2 v1.12.4 this was non-configureable and always
enabled.
Signed-off-by: NRK <nrk <AT> disroot.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
media-libs/imlib2/Manifest | 2 +-
.../imlib2/{imlib2-1.12.4.ebuild => imlib2-1.12.5.ebuild} | 12 +++++++++---
media-libs/imlib2/metadata.xml | 1 +
profiles/arch/alpha/package.use.mask | 4 ++++
profiles/arch/loong/package.use.mask | 4 ++++
profiles/arch/mips/package.use.mask | 4 ++++
profiles/arch/powerpc/ppc64/package.use.mask | 4 ++++
profiles/arch/ppc/package.use.mask | 4 ++++
profiles/arch/s390/package.use.mask | 4 ++++
profiles/arch/sparc/package.use.mask | 4 ++++
10 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 9f8bc08d639f..10e4ed4cdf89 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
DIST imlib2-1.11.0.tar.xz 820368 BLAKE2B
2e1dec04c44ce14429910c0dd6b7b5173bc70e8968912c9c25e8b47d38fdfd6753c29de2e5a2ae0b0e6498550e207989ae927682b09032b637baf759744dfbec
SHA512
2727b217ae18e1015591f2587f885a5a8d59471d6051f1aefb761329fd0fc979163e228154b2bff8728a3a2acc28437f189989d24a4d6e37bfc6f69445bd47e7
DIST imlib2-1.12.3.tar.xz 833128 BLAKE2B
3c02b103bf65ed54319b30d3112b8c4a1b8f41333f2a8848fc44bc1380e1e5dbe3a21e311685d80f77f08815bb11a2a1073beb1683df852919f2c6003535fcaf
SHA512
79feea73fb67508ffdce52f8430c2c887b06d8bcb70f6e3bc551c86d521ebf61fc1eff10994b69def4d7a237873f107066aefa367e05b5f89b5d675751d9314f
-DIST imlib2-1.12.4.tar.xz 840092 BLAKE2B
016521328d519d32950d371695aecdae562e73fcfccf9f037dedeb98641ea66183a53ba6c9cab2a45236222b55c4fcbd5df28d5960b8f51dfb15a356ef53fe75
SHA512
7eaf971a4a949697e04af838ea26f366e0f82faaa5d42ad748da979baef12ea3b05bc2e4eabf8963767a2313b400341f625ed740de457ccaa0aa038fdc2135b9
+DIST imlib2-1.12.5.tar.xz 839464 BLAKE2B
13370398b8aaa876d98910122949ec40ae8f7eea6c68fd8cdea991cef617e7619cc7b5dc59871b09fc08100c4d4039e13b82467ee6ee5a8f4d0aa41ee3d624a9
SHA512
ac83840506b3c104936c57fab370b11e460854857218f91975bf8b589f3037dd628e5ff274caf67af4a64c0930ef3ad4884bef048b889fc926410cc068e3144c
diff --git a/media-libs/imlib2/imlib2-1.12.4.ebuild
b/media-libs/imlib2/imlib2-1.12.5.ebuild
similarity index 89%
rename from media-libs/imlib2/imlib2-1.12.4.ebuild
rename to media-libs/imlib2/imlib2-1.12.5.ebuild
index 3cc42f3245e3..095ecccfa95e 100644
--- a/media-libs/imlib2/imlib2-1.12.4.ebuild
+++ b/media-libs/imlib2/imlib2-1.12.5.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
IUSE="+X apidoc avif bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
eps +filters +gif +jpeg jpeg2k jpegxl heif lzma mp3 packing +png
-raw +shm static-libs svg +text +tools +tiff +webp +zlib"
+raw +shm static-libs svg +text +tools +tiff +webp y4m +zlib"
REQUIRED_USE="shm? ( X )"
@@ -44,6 +44,7 @@ RDEPEND="
tools? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
tiff? ( >=media-libs/tiff-4.0.4:=[${MULTILIB_USEDEP}] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ y4m? ( media-libs/libyuv:= )
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
!<media-plugins/imlib2_loaders-1.10.0
"
@@ -88,9 +89,14 @@ multilib_src_configure() {
$(use_enable tools progs)
$(use_with tiff)
$(use_with webp)
+ $(multilib_native_use_with y4m)
$(use_with zlib)
- # BUG: https://git.enlightenment.org/old/legacy-imlib2/issues/31
- --without-y4m
+
+ # needed if a package is dlopen-ing imlib2 with RTLD_LOCAL,
+ # which dev-perl/Image-Imlib2 *might* be doing (haven't
+ # verified). if not, then should be fine to disable.
+ # See also:
https://git.enlightenment.org/old/legacy-imlib2/issues/30
+ --enable-rtld-local-support
)
# imlib2 has different configure options for x86/amd64 assembly
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index a97803a617d3..2885a144fa83 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -26,6 +26,7 @@
<flag name="shm">Use MIT shared memory support for X image
transfer</flag>
<flag name="tools">Build and install the demo tools</flag>
<flag name="text">Build text (TrueType font) functions</flag>
+ <flag name="y4m">Y4M image loader support</flag>
<flag name="zlib">Zlib loader support</flag>
</use>
<longdescription>
diff --git a/profiles/arch/alpha/package.use.mask
b/profiles/arch/alpha/package.use.mask
index 36d46e576254..cfe6c3a14046 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Cristian Othón Martínez Vera <[email protected]> (2025-04-09)
# dev-db/tinycdb is not keyworded here
mail-mta/sendmail tinycdb
diff --git a/profiles/arch/loong/package.use.mask
b/profiles/arch/loong/package.use.mask
index 9503e6ceaeb0..4dfdb4b3e5c8 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Sam James <[email protected]> (2025-03-19)
# media-libs/libebur128 not keyworded here
media-video/pipewire loudness
diff --git a/profiles/arch/mips/package.use.mask
b/profiles/arch/mips/package.use.mask
index 352fd1a1288c..955606dbb376 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Z. Liu <[email protected]> (2025-02-28)
# requires sys-libs/db:5.3
dev-lisp/clisp berkdb
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask
b/profiles/arch/powerpc/ppc64/package.use.mask
index d8808e536867..bbb1905fd262 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Cristian Othón Martínez Vera (2025-04-09)
# dev-db/tinycdb is not keyworded here
mail-mta/sendmail tinycdb
diff --git a/profiles/arch/ppc/package.use.mask
b/profiles/arch/ppc/package.use.mask
index 09825f47f418..7261f0635768 100644
--- a/profiles/arch/ppc/package.use.mask
+++ b/profiles/arch/ppc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# NRK <[email protected]> (2025-03-17)
# media-libs/libavif is not keyworded
media-libs/imlib2 avif
diff --git a/profiles/arch/s390/package.use.mask
b/profiles/arch/s390/package.use.mask
index 389d46a44b91..d90c82d39c41 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Cristian Othón Martínez Vera <[email protected]> (2025-04-09)
# dev-db/tinycdb is not keyworded here
mail-mta/sendmail tinycdb
diff --git a/profiles/arch/sparc/package.use.mask
b/profiles/arch/sparc/package.use.mask
index 0d70fa841970..c5c8294b90ec 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# NRK <[email protected]> (2025-04-07)
+# media-libs/libyuv is not keyworded
+media-libs/imlib2 y4m
+
# Sam James <[email protected]> (2025-04-13)
# Fails to build app-editors/emacs[jit] and has many test failures in the
# libgccjit testsuite: bug #953775 (https://gcc.gnu.org/PR119767).
