[arch-commits] Commit in sdl_image/repos (4 files)

[Allan McRae]

    Date: Saturday, December 20, 2008 @ 08:18:21
  Author: allan
Revision: 22015

fix conflict

Modified:
  sdl_image/repos/extra-x86_64/	(properties)
  sdl_image/repos/extra-x86_64/PKGBUILD
Deleted:
  sdl_image/repos/extra-x86_64/SDL_image-IMG_lbm.patch
  sdl_image/repos/extra-x86_64/SDL_image-buffer-overflow.patch

---------------------------------+
 PKGBUILD                        |   23 +++++++++--------------
 SDL_image-IMG_lbm.patch         |   28 ----------------------------
 SDL_image-buffer-overflow.patch |   13 -------------
 3 files changed, 9 insertions(+), 55 deletions(-)


Property changes on: sdl_image/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sdl_image/trunk:1
   + /sdl_image/trunk:1-22014

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-20 13:15:45 UTC (rev 22014)
+++ extra-x86_64/PKGBUILD	2008-12-20 13:18:21 UTC (rev 22015)
@@ -1,27 +1,22 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=sdl_image
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.7
+pkgrel=1
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('sdl>=1.2.13' 'libpng' 'libjpeg' 'libtiff' 'zlib')
 options=('!libtool')
 url="http://www.libsdl.org/projects/SDL_image/"
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz
-	SDL_image-IMG_lbm.patch
-	SDL_image-buffer-overflow.patch)
-md5sums=('b866dc4f647517bdaf57f6ffdefd013e'
-         '81424f716513845f27e1b69459343327'
-         'e774a12d1a07b788233f6c15aca05780')
+source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
+md5sums=('a729ff61f74f0a45ec7fe36354cf938e')
 
 build() {
-  cd ${startdir}/src/SDL_image-${pkgver}
-  patch -Np2 -i ${startdir}/src/SDL_image-IMG_lbm.patch || return 1
-  patch -Np2 -i ${startdir}/src/SDL_image-buffer-overflow.patch || return 1
+  cd ${srcdir}/SDL_image-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }

Deleted: extra-x86_64/SDL_image-IMG_lbm.patch
===================================================================
--- extra-x86_64/SDL_image-IMG_lbm.patch	2008-12-20 13:15:45 UTC (rev 22014)
+++ extra-x86_64/SDL_image-IMG_lbm.patch	2008-12-20 13:18:21 UTC (rev 22015)
@@ -1,28 +0,0 @@
---- 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 <stdio.h>
-@@ -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;

Deleted: extra-x86_64/SDL_image-buffer-overflow.patch
===================================================================
--- extra-x86_64/SDL_image-buffer-overflow.patch	2008-12-20 13:15:45 UTC (rev 22014)
+++ extra-x86_64/SDL_image-buffer-overflow.patch	2008-12-20 13:18:21 UTC (rev 22015)
@@ -1,13 +0,0 @@
---- trunk/SDL_image/IMG_gif.c	2007/12/28 08:17:23	3461
-+++ 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;