* [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/
@ 2015-12-24 20:18 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-12-24 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 3cc0db0c9bd107846e399865c55f5ae5c47031da
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 20:16:24 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 20:16:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc0db0c
media-libs/imlib2: add fix from upstream #563732
| 26 ++++++++++++++++++++++
media-libs/imlib2/imlib2-1.4.7.ebuild | 7 +++++-
2 files changed, 32 insertions(+), 1 deletion(-)
--git a/media-libs/imlib2/files/imlib2-1.4.7-headers.patch b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
new file mode 100644
index 0000000..d2fba06
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/563732
+
+From 521573be219f27c7bfebb57d5b0b994fdb316721 Mon Sep 17 00:00:00 2001
+From: Chloe Kudryavtsev <chloe.kudryavtsev@gmail.com>
+Date: Sat, 24 Oct 2015 23:38:53 -0400
+Subject: [PATCH] add time.h include to common.h for time_t
+
+---
+ src/lib/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/common.h b/src/lib/common.h
+index 798965f..9053826 100644
+--- a/src/lib/common.h
++++ b/src/lib/common.h
+@@ -9,6 +9,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <math.h>
++#include <time.h>
+ #ifdef WITH_DMALLOC
+ #include <dmalloc.h>
+ #endif
+--
+2.6.2
+
diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
index 4af1159..f2b3f29 100644
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != "9999" ]] ; then
EKEY_STATE="snap"
fi
-inherit enlightenment toolchain-funcs multilib-minimal
+inherit enlightenment toolchain-funcs multilib-minimal eutils
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="https://www.enlightenment.org/"
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
)"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-headers.patch #563732
+ enlightenment_src_prepare
+}
+
multilib_src_configure() {
# imlib2 has diff configure options for x86/amd64 mmx
if [[ $(tc-arch) == amd64 ]]; then
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/
@ 2016-08-11 13:28 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2016-08-11 13:28 UTC (permalink / raw
To: gentoo-commits
commit: f02e62466903e0444f73c7d796a8162c4bead564
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 11:32:03 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 12:58:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02e6246
media-libs/imlib2: drop old <1.4.9 versions
media-libs/imlib2/Manifest | 2 -
| 26 --------
media-libs/imlib2/files/imlib2-1.4.8-gif-oob.patch | 39 -----------
media-libs/imlib2/imlib2-1.4.7.ebuild | 75 ----------------------
media-libs/imlib2/imlib2-1.4.8-r1.ebuild | 75 ----------------------
5 files changed, 217 deletions(-)
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 65ba039..e67ce5f 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1 @@
-DIST imlib2-1.4.7.tar.gz 1027716 SHA256 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 SHA512 24728586bf0d2a289fdaa7d05385a059b10092f3f777691881f01d6c9e4aa8f893ebb7bc04933644a9f62163cc649272851f1189f72aee83035816caca3a73a2 WHIRLPOOL 662c671b723f4df8267d84607b74bc76b6790d2a694a2e7b3bef084403ae8f41761813455a404c4886dbf3b7b7782534c17677b1ac81bdccf24120a3d07714e1
-DIST imlib2-1.4.8.tar.gz 1028562 SHA256 b5b97be5446d9c5635c288bfe970896148d8bc027ab01f854112cae03b65a3a5 SHA512 befb41f1fdc18020f6a327953f85f67f26ee9430bfa0ba0e83aa836b8515d95d0b115c851d3378bcfc61eab012efbf629fe3c6f31b19a8dae846ed488db20b79 WHIRLPOOL 553a1b73e56e433862f58444bd57d86b16277b9574851fc552a98d95089e43be3ae2eff8b57416a0876725caee9c6822951274436ef0d6273183d8d3d77526ee
DIST imlib2-1.4.9.tar.gz 1028872 SHA256 2bbe4d6eb90559e8ccbb85b442962dd195fd713041a36761a8cf45ad4686cd7b SHA512 303436f447142153928e2d76226b6798c65cb834bf3bfb760e278d2558a3f072ff43fe46616baeea927254200c4535cc323f6a83c5d869def4f6a7213e30e2db WHIRLPOOL e6b6321fea9c0298b4ce521225947ea5e3c4fcdebfde2b9bb4e675252e03b028328f2d210d8199893d31d92c28abc0255d48ee17989607d50a3bf35a39468390
diff --git a/media-libs/imlib2/files/imlib2-1.4.7-headers.patch b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
deleted file mode 100644
index d2fba06..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/563732
-
-From 521573be219f27c7bfebb57d5b0b994fdb316721 Mon Sep 17 00:00:00 2001
-From: Chloe Kudryavtsev <chloe.kudryavtsev@gmail.com>
-Date: Sat, 24 Oct 2015 23:38:53 -0400
-Subject: [PATCH] add time.h include to common.h for time_t
-
----
- src/lib/common.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/common.h b/src/lib/common.h
-index 798965f..9053826 100644
---- a/src/lib/common.h
-+++ b/src/lib/common.h
-@@ -9,6 +9,7 @@
- #include <config.h>
- #include <string.h>
- #include <math.h>
-+#include <time.h>
- #ifdef WITH_DMALLOC
- #include <dmalloc.h>
- #endif
---
-2.6.2
-
diff --git a/media-libs/imlib2/files/imlib2-1.4.8-gif-oob.patch b/media-libs/imlib2/files/imlib2-1.4.8-gif-oob.patch
deleted file mode 100644
index ed29757..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.8-gif-oob.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 16de244bd03d2f75da6508feb1ad9cb4e668e9dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@vr-web.de>
-Date: Sat, 2 Apr 2016 13:05:21 -0400
-Subject: [PATCH] gif: fix oob reads w/bad colormaps
-
-Verify the color map is inbounds before indexing with it.
-
-https://bugs.debian.org/785369
----
- src/modules/loaders/loader_gif.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
-index 638df59..7bdf29c 100644
---- a/src/modules/loaders/loader_gif.c
-+++ b/src/modules/loaders/loader_gif.c
-@@ -170,9 +170,16 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- }
- else
- {
-- r = cmap->Colors[rows[i][j]].Red;
-- g = cmap->Colors[rows[i][j]].Green;
-- b = cmap->Colors[rows[i][j]].Blue;
-+ if (rows[i][j] < cmap->ColorCount)
-+ {
-+ r = cmap->Colors[rows[i][j]].Red;
-+ g = cmap->Colors[rows[i][j]].Green;
-+ b = cmap->Colors[rows[i][j]].Blue;
-+ }
-+ else
-+ {
-+ r = g = b = 0;
-+ }
- *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
- }
- per += per_inc;
---
-2.7.4
-
diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
deleted file mode 100644
index f7b94d6..0000000
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs multilib-minimal eutils
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
-
-RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- gif? ( >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- )
- mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- X? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-headers.patch #563732
- enlightenment_src_prepare
-}
-
-multilib_src_configure() {
- # imlib2 has diff configure options for x86/amd64 mmx
- if [[ $(tc-arch) == amd64 ]]; then
- E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
- else
- E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
- fi
-
- [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
- ECONF_SOURCE="${S}" \
- E_ECONF+=(
- $(use_enable static-libs static)
- $(use_with X x)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- $(use_with gif)
- $(use_with zlib)
- $(use_with bzip2)
- $(use_with mp3 id3)
- )
-
- enlightenment_src_configure
-}
-
-multilib_src_install() {
- enlightenment_src_install
-}
diff --git a/media-libs/imlib2/imlib2-1.4.8-r1.ebuild b/media-libs/imlib2/imlib2-1.4.8-r1.ebuild
deleted file mode 100644
index 76973db..0000000
--- a/media-libs/imlib2/imlib2-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs multilib-minimal eutils
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib"
-
-RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- gif? ( >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- )
- mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- X? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gif-oob.patch #578810
- enlightenment_src_prepare
-}
-
-multilib_src_configure() {
- # imlib2 has diff configure options for x86/amd64 assembly
- if [[ $(tc-arch) == amd64 ]]; then
- E_ECONF+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
- else
- E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
- fi
-
- [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
- ECONF_SOURCE="${S}" \
- E_ECONF+=(
- $(use_enable static-libs static)
- $(use_with X x)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- $(use_with gif)
- $(use_with zlib)
- $(use_with bzip2)
- $(use_with mp3 id3)
- )
-
- enlightenment_src_configure
-}
-
-multilib_src_install() {
- enlightenment_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/
@ 2022-12-01 1:52 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-01 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 40383904bf9e4b5c0ee8e55b9587112b7351e7cd
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Nov 30 22:20:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 01:52:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40383904
media-libs/imlib2: backport BE build fix to 1.7.5
No revbump since this is build-only.
Closes: https://bugs.gentoo.org/877777
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/28488
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/imlib2/files/7d60151ba9.patch | 37 ++++++++++++++++++++++++++++++++
media-libs/imlib2/imlib2-1.7.5.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/media-libs/imlib2/files/7d60151ba9.patch b/media-libs/imlib2/files/7d60151ba9.patch
new file mode 100644
index 000000000000..33709d83849f
--- /dev/null
+++ b/media-libs/imlib2/files/7d60151ba9.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/877777
+https://git.enlightenment.org/old/legacy-imlib2/commit/7d60151ba9696ef07be79af68d5c631a97c63906
+
+From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 10:56:03 +0100
+Subject: [PATCH] ICO loader: Fix compilation on big endian architectures
+
+Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the
+ico_read_idir function and removed the local nr variable. Unfortunately,
+this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on
+big endian architectures as a for loop index variable. As such, the code
+does presently not compile since the aforementioned commit. This patch
+fixes this issue by re-introducing the variable conditionally on big
+endian architectures.
+
+Note: It would likely be cleaner to declare the nr variable as part of
+the loop declaration, however, this C99 feature does not seem to be used
+anywhere in the code base, hence I refrained from using it here.
+---
+ src/modules/loaders/loader_ico.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c
+index e8cef41..66c3643 100644
+--- a/src/modules/loaders/loader_ico.c
++++ b/src/modules/loaders/loader_ico.c
+@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino)
+ {
+ ie_t *ie;
+ unsigned int size;
++#ifdef WORDS_BIGENDIAN
++ unsigned int nr;
++#endif
+
+ ie = &ico->ie[ino];
+
diff --git a/media-libs/imlib2/imlib2-1.7.5.ebuild b/media-libs/imlib2/imlib2-1.7.5.ebuild
index 8e11a1e78052..f7ae3856cd6a 100644
--- a/media-libs/imlib2/imlib2-1.7.5.ebuild
+++ b/media-libs/imlib2/imlib2-1.7.5.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/7d60151ba9.patch" )
multilib_src_configure() {
local myeconfargs=(
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/
@ 2023-03-17 19:52 Andrew Savchenko
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Savchenko @ 2023-03-17 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 7a35b5d4db412bc2b24a47839a2b6f057e054c68
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 19:49:29 2023 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 19:51:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a35b5d4
media-libs/imlib2: drop 1.7.1-r4, 1.7.5-r1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
media-libs/imlib2/Manifest | 2 -
media-libs/imlib2/files/7d60151ba9.patch | 37 ---------------
media-libs/imlib2/imlib2-1.7.1-r4.ebuild | 78 -------------------------------
media-libs/imlib2/imlib2-1.7.5-r1.ebuild | 80 --------------------------------
4 files changed, 197 deletions(-)
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 001f3a0a5cc7..c6907aef828b 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,4 +1,2 @@
DIST imlib2-1.11.0.tar.xz 820368 BLAKE2B 2e1dec04c44ce14429910c0dd6b7b5173bc70e8968912c9c25e8b47d38fdfd6753c29de2e5a2ae0b0e6498550e207989ae927682b09032b637baf759744dfbec SHA512 2727b217ae18e1015591f2587f885a5a8d59471d6051f1aefb761329fd0fc979163e228154b2bff8728a3a2acc28437f189989d24a4d6e37bfc6f69445bd47e7
-DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
-DIST imlib2-1.7.5.tar.xz 793124 BLAKE2B bc47f81aeb635ca2f3d4962e1be5c53111a25a88ccbfcd8f9a7c87717b256966ca6b8cd78fb897287dab656ef2ade41a0955f7d3770d6d670e675954f000cebb SHA512 6e0a79359d6cac297b7a074a75bf577c8c1e3932d9993616834ea9076a7df544fafcfa960fe8ed7468f1291533f3c828260ccb809a882dadb3f3650ba9dd3f28
DIST imlib2-1.9.1.tar.xz 813104 BLAKE2B ef7369d2285bd5b207f646ebb12492323203306c95786d8561a1191dbe489a8efe61975e4deed7bc9c8ed0ac24cf9bd826fa5a24095bc3d254e6f6d6379c8c8b SHA512 00eb8804a32e1403614e9f899f358dd9797f4bcfa7e9fdecd37992731019933e39834a60bd20be8fb69a35161ba1e784bd638b5ecb626d01a4f69c70c330e5f1
diff --git a/media-libs/imlib2/files/7d60151ba9.patch b/media-libs/imlib2/files/7d60151ba9.patch
deleted file mode 100644
index 33709d83849f..000000000000
--- a/media-libs/imlib2/files/7d60151ba9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/877777
-https://git.enlightenment.org/old/legacy-imlib2/commit/7d60151ba9696ef07be79af68d5c631a97c63906
-
-From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 3 Jan 2022 10:56:03 +0100
-Subject: [PATCH] ICO loader: Fix compilation on big endian architectures
-
-Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the
-ico_read_idir function and removed the local nr variable. Unfortunately,
-this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on
-big endian architectures as a for loop index variable. As such, the code
-does presently not compile since the aforementioned commit. This patch
-fixes this issue by re-introducing the variable conditionally on big
-endian architectures.
-
-Note: It would likely be cleaner to declare the nr variable as part of
-the loop declaration, however, this C99 feature does not seem to be used
-anywhere in the code base, hence I refrained from using it here.
----
- src/modules/loaders/loader_ico.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c
-index e8cef41..66c3643 100644
---- a/src/modules/loaders/loader_ico.c
-+++ b/src/modules/loaders/loader_ico.c
-@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino)
- {
- ie_t *ie;
- unsigned int size;
-+#ifdef WORDS_BIGENDIAN
-+ unsigned int nr;
-+#endif
-
- ie = &ico->ie[ino];
-
diff --git a/media-libs/imlib2/imlib2-1.7.1-r4.ebuild b/media-libs/imlib2/imlib2-1.7.1-r4.ebuild
deleted file mode 100644
index 7914bb93ddd5..000000000000
--- a/media-libs/imlib2/imlib2-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/
- https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
- static-libs +tiff +webp zlib"
-
-REQUIRED_USE="shm? ( X )"
-
-RDEPEND="
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.4:=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- !<media-plugins/imlib2_loaders-1.7.0
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_with X x)
- $(use_with bzip2)
- $(use_with gif)
- $(use_with jpeg)
- $(use_with mp3 id3)
- $(use_with png)
- $(use_with shm x-shm-fd)
- $(use_enable static-libs static)
- $(use_with tiff)
- $(use_with webp)
- $(use_with zlib)
- )
-
- # imlib2 has different configure options for x86/amd64 assembly
- if [[ $(tc-arch) == amd64 ]]; then
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
- else
- myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
- fi
-
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- V=1 emake install DESTDIR="${D}"
- find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
- if use doc; then
- local HTML_DOCS=( "${S}"/doc/. )
- rm "${S}"/doc/Makefile.{am,in} || die
- fi
- einstalldocs
-}
diff --git a/media-libs/imlib2/imlib2-1.7.5-r1.ebuild b/media-libs/imlib2/imlib2-1.7.5-r1.ebuild
deleted file mode 100644
index 51cc24ffa142..000000000000
--- a/media-libs/imlib2/imlib2-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/
- https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug doc +gif +jpeg mp3 +png +shm
- static-libs +tiff +webp zlib"
-
-REQUIRED_USE="shm? ( X )"
-
-RDEPEND="
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.4:=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- !<media-plugins/imlib2_loaders-1.7.0
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/7d60151ba9.patch" )
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_with X x)
- $(use_with bzip2)
- $(use_enable debug)
- $(use_with gif)
- $(use_with jpeg)
- $(use_with mp3 id3)
- $(use_with png)
- $(use_with shm x-shm-fd)
- $(use_enable static-libs static)
- $(use_with tiff)
- $(use_with webp)
- $(use_with zlib)
- )
-
- # imlib2 has different configure options for x86/amd64 assembly
- if [[ $(tc-arch) == amd64 ]]; then
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
- else
- myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
- fi
-
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- V=1 emake install DESTDIR="${D}"
- find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
- if use doc; then
- local HTML_DOCS=( "${S}"/doc/. )
- rm "${S}"/doc/Makefile.{am,in} || die
- fi
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-17 19:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-01 1:52 [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 19:52 Andrew Savchenko
2016-08-11 13:28 Mike Frysinger
2015-12-24 20:18 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox