diff options
author | 2011-01-02 20:12:29 +0000 | |
---|---|---|
committer | 2011-01-02 20:12:29 +0000 | |
commit | 2962acc49001ba5f61fb1fd4227afac4499ced52 (patch) | |
tree | e56f6ec69d10f9eddceb2598cf0e4444a8b7131e /media-libs/imlib2 | |
parent | Mark ppc stable #344781. (diff) | |
download | gentoo-2-2962acc49001ba5f61fb1fd4227afac4499ced52.tar.gz gentoo-2-2962acc49001ba5f61fb1fd4227afac4499ced52.tar.bz2 gentoo-2-2962acc49001ba5f61fb1fd4227afac4499ced52.zip |
old
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/imlib2')
-rw-r--r-- | media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch | 16 | ||||
-rw-r--r-- | media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch | 13 | ||||
-rw-r--r-- | media-libs/imlib2/imlib2-1.4.2-r1.ebuild | 56 | ||||
-rw-r--r-- | media-libs/imlib2/imlib2-1.4.3.ebuild | 49 |
4 files changed, 0 insertions, 134 deletions
diff --git a/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch b/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch deleted file mode 100644 index 24bf7ad616a5..000000000000 --- a/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/248057 - -Index: src/modules/loaders/loader_xpm.c -=================================================================== ---- src/modules/loaders/loader_xpm.c (revision 37743) -+++ src/modules/loaders/loader_xpm.c (revision 37744) -@@ -253,8 +253,8 @@ load(ImlibImage * im, ImlibProgressFunct - return 0; - } - ptr = im->data; -- end = ptr + (sizeof(DATA32) * w * h); - pixels = w * h; -+ end = ptr + (pixels); - } - else - { diff --git a/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch b/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch deleted file mode 100644 index a338bc693dd6..000000000000 --- a/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/imlib2/trunk/libpng14.patch - ---- src/modules/loaders/loader_png.c -+++ src/modules/loaders/loader_png.c -@@ -38,7 +38,7 @@ - - /* if we haven't read the header before, set the header data */ - fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) - { - fclose(f); - return 0; diff --git a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild deleted file mode 100644 index fb3d6deed839..000000000000 --- a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.2-r1.ebuild,v 1.10 2010/03/08 15:00:32 ssuominen Exp $ - -EAPI=1 -inherit enlightenment toolchain-funcs eutils - -MY_P=${P/_/-} -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="http://www.enlightenment.org/" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib" - -DEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( media-libs/jpeg:0 ) - tiff? ( >=media-libs/tiff-3.5.5 ) - X? ( x11-libs/libXext x11-proto/xextproto ) - mp3? ( media-libs/libid3tag )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-libpng14.patch - epatch "${FILESDIR}"/${P}-CVE-2008-5187.patch #248057 - sed -i '/bumpmap_la_LIBADD/s:$: -lm:' src/modules/filters/Makefile.in #276285 -} - -src_compile() { - # imlib2 has diff configure options for x86/amd64 mmx - local myconf="" - if [[ $(tc-arch) == "amd64" ]] ; then - myconf="$(use_enable mmx amd64) --disable-mmx" - else - myconf="--disable-amd64 $(use_enable mmx)" - fi - - [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding" - - export MY_ECONF=" - $(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) \ - ${myconf} \ - " - enlightenment_src_compile -} diff --git a/media-libs/imlib2/imlib2-1.4.3.ebuild b/media-libs/imlib2/imlib2-1.4.3.ebuild deleted file mode 100644 index abb844a2ca0c..000000000000 --- a/media-libs/imlib2/imlib2-1.4.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.3.ebuild,v 1.1 2010/04/13 22:29:17 vapier Exp $ - -EAPI="1" - -inherit enlightenment toolchain-funcs - -MY_P=${P/_/-} -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="http://www.enlightenment.org/" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib" - -DEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( media-libs/jpeg:0 ) - tiff? ( >=media-libs/tiff-3.5.5 ) - X? ( x11-libs/libXext x11-proto/xextproto ) - mp3? ( media-libs/libid3tag )" - -src_compile() { - # imlib2 has diff configure options for x86/amd64 mmx - local myconf="" - if [[ $(tc-arch) == "amd64" ]] ; then - myconf="$(use_enable mmx amd64) --disable-mmx" - else - myconf="--disable-amd64 $(use_enable mmx)" - fi - - [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding" - - export MY_ECONF=" - $(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) \ - ${myconf} \ - " - enlightenment_src_compile -} |