diff --git a/media-libs/sdl-image/ChangeLog b/media-libs/sdl-image/ChangeLog deleted file mode 100644 --- a/media-libs/sdl-image/ChangeLog +++ /dev/null @@ -1,168 +0,0 @@ -# ChangeLog for media-libs/sdl-image -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.42 2008/01/29 21:55:55 grobian Exp $ - - 29 Jan 2008; Fabian Groffen - sdl-image-1.2.6-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix - -*sdl-image-1.2.6-r1 (29 Jan 2008) - - 29 Jan 2008; Michael Sterrett - +files/sdl-image-1.2.6-DOS.patch, -sdl-image-1.2.3-r1.ebuild, - -sdl-image-1.2.4.ebuild, -sdl-image-1.2.5.ebuild, - -sdl-image-1.2.5-r1.ebuild, -sdl-image-1.2.6.ebuild, - +sdl-image-1.2.6-r1.ebuild: - add patches from upstream to address security bug #207933; force stabilize all - previously stable archs and remove older, vulnerable versions - -*sdl-image-1.2.6 (21 Jul 2007) - - 21 Jul 2007; Mike Frysinger +sdl-image-1.2.6.ebuild: - Version bump. - - 05 Jan 2007; Diego Pettenò - sdl-image-1.2.3-r1.ebuild: - Remove gnuconfig_update usage, leave it to econf. - - 31 Oct 2006; Tristan Heaven sdl-image-1.2.5.ebuild, - sdl-image-1.2.5-r1.ebuild: - inherit eutils for epatch - - 03 Oct 2006; Bryan Østergaard - sdl-image-1.2.5-r1.ebuild: - Stable on Alpha. - - 02 Oct 2006; Aron Griffis sdl-image-1.2.5-r1.ebuild: - Mark 1.2.5-r1 stable on ia64. #145470 - - 01 Oct 2006; Tobias Scherbaum - sdl-image-1.2.5-r1.ebuild: - hppa stable, bug #145470 - - 18 Sep 2006; Chris Gianelloni - sdl-image-1.2.5-r1.ebuild: - Stable on amd64 wrt bug #145470. - - 10 Sep 2006; sdl-image-1.2.5-r1.ebuild: - Stable on x86, bug #145470. - - 06 Sep 2006; Joseph Jezak sdl-image-1.2.5-r1.ebuild: - Marked ppc stable for bug #145470. - - 05 Sep 2006; Joshua Kinard sdl-image-1.2.5-r1.ebuild: - Marked stable on mips. - - 04 Sep 2006; Gustavo Zacarias - sdl-image-1.2.5-r1.ebuild: - Stable on sparc wrt #145470 - - 04 Sep 2006; Fabian Groffen - sdl-image-1.2.5-r1.ebuild: - Marked ppc-macos stable (bug #145470) - - 04 Sep 2006; Markus Rothe sdl-image-1.2.5-r1.ebuild: - Stable on ppc64; bug #145470 - -*sdl-image-1.2.5-r1 (15 Aug 2006) - - 15 Aug 2006; Michael Sterrett - +sdl-image-1.2.5-r1.ebuild: - rev bump to force out patch - - 15 Aug 2006; Michael Sterrett - sdl-image-1.2.5.ebuild: - add Debian patch the fixes up the image loading in 1.2.5. Fixes bug #143674 - and probably others. - -*sdl-image-1.2.5 (19 May 2006) - - 19 May 2006; Michael Sterrett - +sdl-image-1.2.5.ebuild: - version bump - - 11 Apr 2006; Diego Pettenò sdl-image-1.2.4.ebuild: - Add ~x86-fbsd keyword. - - 07 Mar 2006; Diego Pettenò +metadata.xml: - Add maintainer-needed metadata. - - 07 Mar 2006; Michael Sterrett - sdl-image-1.2.4.ebuild: - filter out k6 flags for bug #120554 - - 04 Mar 2006; Fabian Groffen sdl-image-1.2.4.ebuild: - Marked ~ppc-macos (bug #78781) - - 26 Aug 2005; Aron Griffis sdl-image-1.2.4.ebuild: - add ~ia64 - - 07 Jan 2005; Mike Frysinger sdl-image-1.2.3-r1.ebuild, - sdl-image-1.2.4.ebuild: - Remove DEPEND on gif since it is an internal feature #77011 by P.L.Hayes. - -*sdl-image-1.2.4 (16 Dec 2004) - - 16 Dec 2004; Michael Sterrett - +sdl-image-1.2.4.ebuild: - version bump - - 17 Oct 2004; Dylan Carlson sdl-image-1.2.3.ebuild: - stable on amd64. - - 11 Aug 2004; Michael Sterrett - sdl-image-1.2.3-r1.ebuild: - always gnuconfig_update; tidy - - 08 Aug 2004; Tom Gall sdl-image-1.2.3-r1.ebuild: - stable on ppc64, bug #57991 - -*sdl-image-1.2.3-r1 (02 Apr 2004) - - 02 Apr 2004; Seemant Kulleen sdl-image-1.2.3-r1.ebuild: - install the showimage binary, thanks to: Gerry in bug - #46655. Also, use USE flag to determine what support to build - - 19 Mar 2004; Gustavo Zacarias sdl-image-1.2.3.ebuild: - stable on sparc - - 14 Mar 2004; Stephen P. Becker sdl-image-1.2.3.ebuild: - Added ~mips keyword. - - 06 Oct 2003; Aron Griffis sdl-image-1.2.3.ebuild: - Stable on alpha - - 15 Sep 2003; Michael Sterrett sdl-image-1.2.3.ebuild: - mark stable for x86 - -*sdl-image-1.2.3 (09 Sep 2003) - - 09 Sep 2003; Michael Sterrett sdl-image-1.2.3.ebuild: - version bump - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*sdl-image-1.2.2 (6 May 2002) - - 06 Aug 2002; Mark Guertin : - Added ppc to keywords - - 6 May 2002; Seemant Kulleen sdl-image-1.2.2.ebuild - files/digest-sdl-image-1.2.2 : - - Version bump to keep up with the rest of the SDL applications. - -*sdl-image-1.2.1-r1 (12 Apr 2002) - 12 Apr 2002; Spider - updating with new libpng version - - -*sdl-image-1.2.1 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is target's to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest deleted file mode 100644 --- a/media-libs/sdl-image/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX sdl-image-1.2.6-DOS.patch 1405 RMD160 c79ebcd36e2a9e676e28e15c86729b96f68fef47 SHA1 517c0c2f6705bf86258fc6309fba4fa26d17b43d SHA256 bfea5f5b91d1f0c7560c8901ecd27f3c9ac3ab451e986c31ec0eb1e83c740dbd -AUX sdl-image-crosspkgconfig.patch 1908 RMD160 034632d24faaf73650a85d8814f04323140bcc6b SHA1 033d15ab1318149e1d949c80650fb28d3a7072a9 SHA256 2862ce0a6809f53958e388d32ff22534185c564673416440b5182131808e50e9 -AUX sdl-image-crosspkgconfig_makefile.patch 1057 RMD160 3ff4e9f6b111d79e3df215b5a8cde4ee4239ece7 SHA1 7edc38d8688e580cdc6d1b1660c0d280f9ca5bf7 SHA256 8c3b7787058f81319a7c9bdfa75947da753e65d252ae16eccae4624a2a676beb -AUX sdl-image.pc.in 552 RMD160 e8e1765fa7dcbb2ba774aa2c7ba17278127b332f SHA1 7c746afed08304157ba68484e2998503ed98d3e4 SHA256 8b8d34cc2ae789f997b6c13171825e418a037d4be14c4df42ee28c26e526de4a -DIST SDL_image-1.2.6.tar.gz 1308812 RMD160 8aea5f07216eb887f599c0908f8ea2c2f9eeac93 SHA1 5045df31e4db29d8890110fd18024c9d08efca30 SHA256 88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4 -EBUILD sdl-image-1.2.6-r1.ebuild 1579 RMD160 e762c28f2d538b408b1ceb6cacc56a7f94abb6da SHA1 8cf5dc4fa3af793e6d4fde1e0531d0c553dfc32d SHA256 e9e18115f9471d74059d4601efb0b4ef9ba66ac8f131b436bd8b9a4010416eb2 -MISC ChangeLog 5587 RMD160 c8248041328ce83ec04072e1820eeaff2f5404f1 SHA1 ff6bce26d73acba2490a78f2b0406467801e0c54 SHA256 74c47f39a2d319198df3be7cdb4a76bc7487b5f70dbb5d3b723dbcf2fd657662 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch b/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch deleted file mode 100644 --- a/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- trunk/SDL_image/IMG_gif.c 2007/02/13 10:09:17 2970 -+++ trunk/SDL_image/IMG_gif.c 2007/12/28 16:43:56 3462 -@@ -418,6 +418,10 @@ - static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp; - register int i; - -+ /* Fixed buffer overflow found by Michael Skladnikiewicz */ -+ if (input_code_size > MAX_LWZ_BITS) -+ return -1; -+ - if (flag) { - set_code_size = input_code_size; - code_size = set_code_size + 1; ---- trunk/SDL_image/IMG_lbm.c 2007/07/20 04:37:11 3341 -+++ trunk/SDL_image/IMG_lbm.c 2008/01/03 20:05:34 3521 -@@ -28,6 +28,7 @@ - EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain - (http://www.multimania.com/mavati) in December 2003. - Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004. -+ Buffer overflow fix in RLE decompression by David Raulo in January 2008. - */ - - #include -@@ -328,7 +329,7 @@ - count ^= 0xFF; - count += 2; /* now it */ - -- if ( !SDL_RWread( src, &color, 1, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) ) - { - error="error reading BODY chunk"; - goto done; -@@ -339,7 +340,7 @@ - { - ++count; - -- if ( !SDL_RWread( src, ptr, count, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) ) - { - error="error reading BODY chunk"; - goto done; diff --git a/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch b/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch deleted file mode 100644 --- a/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -c /mnt/satahd/portagetmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in -*** /configure.in 2007-07-21 01:26:26.000000000 -0400 ---- /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in 2008-09-17 21:28:36.000000000 -0400 -*************** -*** 25,30 **** ---- 25,33 ---- - AC_SUBST(BINARY_AGE) - AC_SUBST(VERSION) - -+ #initialize pkgconfig -+ PKG_PROG_PKG_CONFIG -+ - # libtool versioning - LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION - LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE` -*************** -*** 79,89 **** - AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) - - dnl Check for SDL -! SDL_VERSION=1.2.10 -! AM_PATH_SDL($SDL_VERSION, -! :, -! AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) -! ) - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - saved_LIBS="$LIBS" ---- 82,91 ---- - AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) - - dnl Check for SDL -! dnl Versions newer than 1.2.11 have pkgconfig support. AND, it works better for cross-compiling. Thus, support for 1.2.10 is not in Binki's 's interest -! SDL_VERSION=1.2.11 -! -! PKG_CHECK_MODULES([SDL],[sdl >= 1.2.11]) - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - saved_LIBS="$LIBS" -*************** -*** 283,296 **** - fi - fi - -! LIBS="$saved_LIBS" - - AC_SUBST([WINDRES]) - AC_SUBST([IMG_LIBS]) - - # Finally create all the generated files - AC_OUTPUT([ - Makefile - SDL_image.spec - SDL_image.qpg - ]) ---- 285,300 ---- - fi - fi - -! LIBS="$saved_LIBS $IMG_LIBS" - - AC_SUBST([WINDRES]) - AC_SUBST([IMG_LIBS]) -+ AC_SUBST([LIBS]) - - # Finally create all the generated files - AC_OUTPUT([ - Makefile - SDL_image.spec - SDL_image.qpg -+ sdl-image.pc - ]) - -Diff finished. Wed Sep 17 21:44:24 2008 diff --git a/media-libs/sdl-image/files/sdl-image-crosspkgconfig_makefile.patch b/media-libs/sdl-image/files/sdl-image-crosspkgconfig_makefile.patch deleted file mode 100644 --- a/media-libs/sdl-image/files/sdl-image-crosspkgconfig_makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -c /mnt/bacup/portagetmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/Makefile.am /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/Makefile.am ---- /Makefile.am 2007-07-21 01:26:34.000000000 -0400 -+++ /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/Makefile.am 2008-09-17 21:29:38.000000000 -0400 -@@ -39,14 +39,14 @@ - -no-undefined \ - -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o --libSDL_image_la_LIBADD = $(IMG_LIBS) -+libSDL_image_la_LIBADD = $(LIBS) - libSDL_image_la_DEPENDENCIES = version.o - else - libSDL_image_la_LDFLAGS = \ - -no-undefined \ - -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) --libSDL_image_la_LIBADD = $(IMG_LIBS) -+libSDL_image_la_LIBADD = $(LIBS) - endif - - %.o : %.rc -@@ -54,6 +54,6 @@ - - noinst_PROGRAMS = showimage - --showimage_LDADD = libSDL_image.la -+showimage_LDADD = libSDL_image.la $(LIBS) - - # Rule to build tar-gzipped distribution package - -Diff finished. Wed Sep 17 21:32:09 2008 diff --git a/media-libs/sdl-image/files/sdl-image.pc.in b/media-libs/sdl-image/files/sdl-image.pc.in deleted file mode 100644 --- a/media-libs/sdl-image/files/sdl-image.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -# sdl-image pkg-config source file, derived from sdl's pkg-config file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: sdl -Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. SDL-Image provides support for loading a number of image file formats. -Version: @VERSION@ -Requires: sdl-@SDL_VERSION@ -Conflicts: -Libs: -L${libdir} @IMG_LIBS@ -Cflags: -I${includedir}/SDL diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml deleted file mode 100644 --- a/media-libs/sdl-image/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -games - diff --git a/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild deleted file mode 100644 --- a/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild,v 1.2 2008/01/29 21:55:55 grobian Exp $ - -inherit eutils autotools libtool flag-o-matic pkgconfig - -MY_P="${P/sdl-/SDL_}" -DESCRIPTION="image file loading library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_image/index.html" -SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="gif jpeg tiff png" - -DEPEND="sys-libs/zlib - >=media-libs/libsdl-1.2.10 - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b ) - tiff? ( media-libs/tiff )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-DOS.patch" - epatch "${FILESDIR}/${PN}-crosspkgconfig.patch" - epatch "${FILESDIR}/${PN}-crosspkgconfig_makefile.patch" - cp "${FILESDIR}/${PN}.pc.in" ./ - elibtoolize - eautoreconf -} - -src_compile() { - myconf = "" - if [ "${CHOST}" != "${CBUILD}" ]; then - myconf="--with-sdl-prefix=/usr/${CHOST} \ -" - fi - econf \ - $(use_enable gif) \ - $(use_enable jpeg jpg) \ - $(use_enable tiff tif) \ - $(use_enable png) \ - $(use_enable png pnm) \ - --enable-bmp \ - --enable-lbm \ - --enable-pcx \ - --enable-tga \ - --enable-xcf \ - --enable-xpm \ - ${myconf} \ - || die - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dobin .libs/showimage || die "dobin failed" - dodoc CHANGES README -}