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+...@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 -}
