summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-08-11 19:32:03 +0800
committerMike Frysinger <vapier@gentoo.org>2016-08-11 20:58:42 +0800
commitf02e62466903e0444f73c7d796a8162c4bead564 (patch)
tree6b2010d462e10b68386effe0320487e6b21c99a4 /media-libs
parentmedia-libs/imlib2: mark 1.4.9 sh stable (diff)
downloadgentoo-f02e62466903e0444f73c7d796a8162c4bead564.tar.gz
gentoo-f02e62466903e0444f73c7d796a8162c4bead564.tar.bz2
gentoo-f02e62466903e0444f73c7d796a8162c4bead564.zip
media-libs/imlib2: drop old <1.4.9 versions
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/imlib2/Manifest2
-rw-r--r--media-libs/imlib2/files/imlib2-1.4.7-headers.patch26
-rw-r--r--media-libs/imlib2/files/imlib2-1.4.8-gif-oob.patch39
-rw-r--r--media-libs/imlib2/imlib2-1.4.7.ebuild75
-rw-r--r--media-libs/imlib2/imlib2-1.4.8-r1.ebuild75
5 files changed, 0 insertions, 217 deletions
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 65ba039d629e..e67ce5f0afa1 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 d2fba06c3ba2..000000000000
--- 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 ed297579e226..000000000000
--- 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 f7b94d6b9c34..000000000000
--- 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 76973db08cf1..000000000000
--- 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
-}