add Debian patch the fixes up the image loading in 1.2.5. Fixes bug #143674

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 30 insertions, 24 deletions

diff --git a/media-libs/sdl-image/ChangeLog b/media-libs/sdl-image/ChangeLog
index 24c308f7adb8..59d2dc008c52 100644
--- a/media-libs/sdl-image/ChangeLog
+++ b/media-libs/sdl-image/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/sdl-image
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.25 2006/05/19 18:39:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.26 2006/08/15 23:08:53 mr_bones_ Exp $
+
+  15 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  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)
 
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 1ef999aacd96..1ec3be00c578 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST SDL_image-1.2.3.tar.gz 636747 RMD160 ef488b0d731170336f6a3b5254e24c69726e0d92 SHA1 a6610edd6ea4afb0ff351c7911c46034e161076d SHA256 2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69
 DIST SDL_image-1.2.4.tar.gz 841885 RMD160 0c42fecde17e841a98ffc6d7b4f6473e30447df1 SHA1 64664c43a105ca6532f2b7d7f45d24f17388b5da SHA256 c295b5fdb8c51fd363a351b9ca66b1d3c50f99d5610a0629d719757a35139032
 DIST SDL_image-1.2.5.tar.gz 1308637 RMD160 3dabd3de4259519412e6fdc5c83d268dfa0b1ec0 SHA1 2cd7d825953de64bf903ad711be5613f79259422 SHA256 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308
+DIST sdl-image1.2_1.2.5-2.diff.gz 11430 RMD160 4b34099e5805841ff8ed068155e20b0c91ea21db SHA1 e395699cf1e8ae1354d3381792240575dce3c99b SHA256 ab4b63f5b459cf0d7505a4f6210c1c5e05175193095ae6d6cd3810ecf71d6176
 EBUILD sdl-image-1.2.3-r1.ebuild 1189 RMD160 6d16fb6a26769bfba8f2724be5592df0d138429b SHA1 a117e6ccb02fada8b9d3a77713646a3cdad8abea SHA256 449d46b9cb65f6519bddef884b7b03bb6f9ec988ed55be8c5f75a15da96df370
 MD5 c6b27b36362b8e690e1078c786695e48 sdl-image-1.2.3-r1.ebuild 1189
 RMD160 6d16fb6a26769bfba8f2724be5592df0d138429b sdl-image-1.2.3-r1.ebuild 1189
@@ -12,14 +10,14 @@ EBUILD sdl-image-1.2.4.ebuild 1229 RMD160 3e28eeca0826ec486d78769009d6d094e5ea3d
 MD5 55307bdf6235b14d8907231084647916 sdl-image-1.2.4.ebuild 1229
 RMD160 3e28eeca0826ec486d78769009d6d094e5ea3d6d sdl-image-1.2.4.ebuild 1229
 SHA256 636a89e8f5c9f6fbecffe4bd9657517b3b6b86ee3e8bb4622b2f9fda053323d5 sdl-image-1.2.4.ebuild 1229
-EBUILD sdl-image-1.2.5.ebuild 1195 RMD160 c75132e55817c876ae12869feb915c4aa3d743e5 SHA1 e00387582a60001068d7be9889fc256fd4429283 SHA256 d5474721c6c2f967024aa78de3b56057ec1991ebfc2e06bb475d918a0939dc5c
-MD5 91b0aaff02125517b4a4a9aa130344c6 sdl-image-1.2.5.ebuild 1195
-RMD160 c75132e55817c876ae12869feb915c4aa3d743e5 sdl-image-1.2.5.ebuild 1195
-SHA256 d5474721c6c2f967024aa78de3b56057ec1991ebfc2e06bb475d918a0939dc5c sdl-image-1.2.5.ebuild 1195
-MISC ChangeLog 3200 RMD160 1aa9a2eaf08bc64fc51a235927574228648ad512 SHA1 372bf6c4daeaf3efebd1723b59a24a6a333cb935 SHA256 be5db25f2235da3b054b95d15d24c6fc0db7eca9dc72dc864dc305113da56caa
-MD5 cf07dd98a845581e4b4417c020807f35 ChangeLog 3200
-RMD160 1aa9a2eaf08bc64fc51a235927574228648ad512 ChangeLog 3200
-SHA256 be5db25f2235da3b054b95d15d24c6fc0db7eca9dc72dc864dc305113da56caa ChangeLog 3200
+EBUILD sdl-image-1.2.5.ebuild 1358 RMD160 fe3848e8d911e7d5b0afa8d2360a2d45c684c1be SHA1 f3180cebfc96b2e51e67e09240139c3f699b7eb4 SHA256 c77951051db6ebe0a49ab23e1f719f5b8476d790f6589a56b391b556347a9db3
+MD5 d3030e153895a8318450d4fca6763d90 sdl-image-1.2.5.ebuild 1358
+RMD160 fe3848e8d911e7d5b0afa8d2360a2d45c684c1be sdl-image-1.2.5.ebuild 1358
+SHA256 c77951051db6ebe0a49ab23e1f719f5b8476d790f6589a56b391b556347a9db3 sdl-image-1.2.5.ebuild 1358
+MISC ChangeLog 3384 RMD160 4b30278d55cf293f40d4ba772d972f0056b09d74 SHA1 c39e6a6cbd23ae4b724e2e754e534e78ad70c654 SHA256 f24203f7f5334dff549c983433e8854c0416f7cea339120b36b46e82dea316d3
+MD5 d5e4d45e557a8dade13facd30c5315e6 ChangeLog 3384
+RMD160 4b30278d55cf293f40d4ba772d972f0056b09d74 ChangeLog 3384
+SHA256 f24203f7f5334dff549c983433e8854c0416f7cea339120b36b46e82dea316d3 ChangeLog 3384
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -30,13 +28,6 @@ SHA256 f71cb62299f4d7d738dc3922af3453aec11938a047afadd27f1406b44e85483f files/di
 MD5 6086a9ebe5b00b1d4326855da6b17046 files/digest-sdl-image-1.2.4 247
 RMD160 d46e33b74e93b26eeb8f206b66337984651af8e1 files/digest-sdl-image-1.2.4 247
 SHA256 d1279c4e65f3cc7158c969f69db2af24416b894d0fbb60c2d7c1191f63019486 files/digest-sdl-image-1.2.4 247
-MD5 e267a6ab6a64d6486264431cea4b4259 files/digest-sdl-image-1.2.5 250
-RMD160 a7a4d2d394902921f557dc037742069ce758b452 files/digest-sdl-image-1.2.5 250
-SHA256 98e8068f4a3e5873773f267fd6a4496c51c77f7393922f7ce9795c0b58b248b5 files/digest-sdl-image-1.2.5 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEvuTQamhnQswr0vIRArw5AJ4rQ1RX4GXv5O8tQmaT0eums5x5QQCgiDDZ
-abAB1bdfcF5OjbP3K6ISHeQ=
-=t/EP
------END PGP SIGNATURE-----
+MD5 6d659c3c908cda8bc7098ca47a835a16 files/digest-sdl-image-1.2.5 512
+RMD160 9fd1824a85e1eef2e88ab4fa4ece94d68022e4b1 files/digest-sdl-image-1.2.5 512
+SHA256 03ff6e558e4d903d7e2ecf7e51fd7208b6b55f838ac63b76d23277a3f2aefa77 files/digest-sdl-image-1.2.5 512
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.5 b/media-libs/sdl-image/files/digest-sdl-image-1.2.5
index 932c24e33b11..a8686610e756 100644
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.5
+++ b/media-libs/sdl-image/files/digest-sdl-image-1.2.5
@@ -1,3 +1,6 @@
 MD5 cd006109a73bf7dcc93e1c3ed15ee782 SDL_image-1.2.5.tar.gz 1308637
 RMD160 3dabd3de4259519412e6fdc5c83d268dfa0b1ec0 SDL_image-1.2.5.tar.gz 1308637
 SHA256 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308 SDL_image-1.2.5.tar.gz 1308637
+MD5 6ba5a176c3f93a1d916e87005d049c28 sdl-image1.2_1.2.5-2.diff.gz 11430
+RMD160 4b34099e5805841ff8ed068155e20b0c91ea21db sdl-image1.2_1.2.5-2.diff.gz 11430
+SHA256 ab4b63f5b459cf0d7505a4f6210c1c5e05175193095ae6d6cd3810ecf71d6176 sdl-image1.2_1.2.5-2.diff.gz 11430
diff --git a/media-libs/sdl-image/sdl-image-1.2.5.ebuild b/media-libs/sdl-image/sdl-image-1.2.5.ebuild
index 905dbaab6e6f..37b72b949387 100644
--- a/media-libs/sdl-image/sdl-image-1.2.5.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.5.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2006 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.5.ebuild,v 1.2 2006/07/20 02:04:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.5.ebuild,v 1.3 2006/08/15 23:08:53 mr_bones_ Exp $
 
 inherit flag-o-matic
 
 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"
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz
+	mirror://debian/pool/main/s/sdl-image1.2/sdl-image1.2_${PV}-2.diff.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -22,6 +23,12 @@ DEPEND="sys-libs/zlib
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}/sdl-image1.2_${PV}-2.diff"
+}
+
 src_compile() {
 	econf \
 		$(use_enable gif) \