add patch to fix bug 31235; disable nasm for bug 31345; more error checking

5 files changed, 290 insertions, 4 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 063662807c31..5ba84849f079 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.30 2003/09/17 08:22:59 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.31 2003/11/01 08:19:15 mr_bones_ Exp $
+
+*libsdl-1.2.6-r2 (01 Nov 2003)
+
+  01 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.6-r2.ebuild,
+  files/libsdl-1.2.6-fullscreen.patch:
+  add patch to fix bug 31235; disable nasm for 1.2.6 since
+  BlitRGBtoRGBPixelAlphaMMX3DNOW seems to be buggy (bunch of bugs about
+  this...bug 31345 is the "parent") add more error checking/messages
 
   17 Sep 2003; Michael Sterrett <msterret@gentoo.org> libsdl-1.2.6-r1.ebuild:
   >=sys-apps/sed-4 is close enough
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 72b1ca7a7c0d..4711bfe8a95f 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,12 +1,12 @@
-MD5 fefe3a3e95fd44d4f392707f90f6bfd5 ChangeLog 5145
+MD5 2fef9aea2d481410ca0b6420af54ca02 ChangeLog 5497
 MD5 ccd5a78b507c0444d9cef7fec354b717 libsdl-1.2.5-r1.ebuild 3153
 MD5 562d3f7139a98c1f9919dbe7243f5620 libsdl-1.2.5-r2.ebuild 3338
 MD5 5f6cbca299d1992fe97d295535a108e5 libsdl-1.2.6-r1.ebuild 2199
-MD5 3603ee5816ab08339d1233654c4f8cd0 libsdl-1.2.6-r2.ebuild 2265
-MD5 3cd83ade0b0c7aaa9268994438f33843 files/patch 633279
+MD5 dcc21f37fcb74f179a5bf3795232eba6 libsdl-1.2.6-r2.ebuild 2603
 MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
 MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
 MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r1 62
 MD5 139a7f80f999ec4caafeac89523308a5 files/libsdl-1.2.5-xfree-4.3.patch 5422
 MD5 2468dd594bc1f3ad3b47bcf69ba5ded2 files/libsdl_gcc33_fix.diff 395
 MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r2 62
+MD5 c6eb5b0a0816fad7f915502a9122e0d6 files/libsdl-1.2.6-fullscreen.patch 5702
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.6-r2 b/media-libs/libsdl/files/digest-libsdl-1.2.6-r2
new file mode 100644
index 000000000000..60f049c77fe5
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.6-r2
@@ -0,0 +1 @@
+MD5 9011f147f23ec535515291d0c9c6904c SDL-1.2.6.tar.gz 2042700
diff --git a/media-libs/libsdl/files/libsdl-1.2.6-fullscreen.patch b/media-libs/libsdl/files/libsdl-1.2.6-fullscreen.patch
new file mode 100644
index 000000000000..cd3039b2d31c
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.6-fullscreen.patch
@@ -0,0 +1,188 @@
+From bogus@does.not.exist.com  Tue Sep  2 20:50:00 2003
+From: bogus@does.not.exist.com (Anonymous CVS Login)
+Date: Tue, 02 Sep 2003 12:50:00 -0700
+Subject: [SDL-CVS] Module SDL12: Change committed
+Message-ID: <E19uHA8-00057Q-00@twomix.devolution.com>
+
+This is a multipart message as defined by RFC2049 (MIME)
+
+------=MIME.e9947546717eb6f9bb3c705e84385ccc
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+Commiter   : cvs
+CVSROOT    : /home/sdlweb/libsdl.org/cvs
+Module     : SDL12
+Commit time: 2003-09-02 19:50:00 UTC
+
+Log message:
+
+Severe bugfix: format->BitsPerPixel not checked in ListModes function
+
+Modified files:
+     src/video/xbios/SDL_xbios.c
+
+------=MIME.e9947546717eb6f9bb3c705e84385ccc
+Content-Type: text/plain; name="SDL12.20030902.195000.cvs.diff"
+Content-Disposition: attachment; filename="SDL12.20030902.195000.cvs.diff"
+Content-Transfer-Encoding: 8bit
+
+Index: SDL12/src/video/xbios/SDL_xbios.c
+diff -u SDL12/src/video/xbios/SDL_xbios.c:1.9 SDL12/src/video/xbios/SDL_xbios.c:1.10
+--- SDL12/src/video/xbios/SDL_xbios.c:1.9	Wed Feb 12 07:24:39 2003
++++ SDL12/src/video/xbios/SDL_xbios.c	Tue Sep  2 12:49:50 2003
+@@ -22,7 +22,7 @@
+ 
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
++ "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
+ #endif
+ 
+ /*
+@@ -400,9 +400,19 @@
+ 
+ static SDL_Rect **XBIOS_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
+ {
++	unsigned int numlist;
++
+ 	/* 8 bits -> list 0 */
+ 	/* 16 bits -> list 1 */
+-	return(SDL_modelist[(format->BitsPerPixel)>>4]);
++	if (format->BitsPerPixel == 15) {
++		return NULL;
++	}
++
++	numlist = (format->BitsPerPixel)>>4;
++	if (numlist>1)
++		return NULL;
++
++	return(SDL_modelist[numlist]);
+ }
+ 
+ static void XBIOS_FreeBuffers(_THIS)
+------=MIME.e9947546717eb6f9bb3c705e84385ccc--
+
+
+
+From bogus@does.not.exist.com  Wed Sep  3 21:07:26 2003
+From: bogus@does.not.exist.com (Anonymous CVS Login)
+Date: Wed, 03 Sep 2003 13:07:26 -0700
+Subject: [SDL-CVS] Module SDL12: Change committed
+Message-ID: <E19uduY-0000xt-00@twomix.devolution.com>
+
+This is a multipart message as defined by RFC2049 (MIME)
+
+------=MIME.0d9b6d4fb0ac7f37b9ef385d1fcdeb0c
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+Commiter   : cvs
+CVSROOT    : /home/sdlweb/libsdl.org/cvs
+Module     : SDL12
+Commit time: 2003-09-03 20:07:26 UTC
+
+Log message:
+
+Finally bugfixed: the simpler the better
+
+Modified files:
+     src/video/xbios/SDL_xbios.c
+
+------=MIME.0d9b6d4fb0ac7f37b9ef385d1fcdeb0c
+Content-Type: text/plain; name="SDL12.20030903.200726.cvs.diff"
+Content-Disposition: attachment; filename="SDL12.20030903.200726.cvs.diff"
+Content-Transfer-Encoding: 8bit
+
+Index: SDL12/src/video/xbios/SDL_xbios.c
+diff -u SDL12/src/video/xbios/SDL_xbios.c:1.10 SDL12/src/video/xbios/SDL_xbios.c:1.11
+--- SDL12/src/video/xbios/SDL_xbios.c:1.10	Tue Sep  2 12:49:50 2003
++++ SDL12/src/video/xbios/SDL_xbios.c	Wed Sep  3 13:07:16 2003
+@@ -22,7 +22,7 @@
+ 
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
++ "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
+ #endif
+ 
+ /*
+@@ -400,19 +400,13 @@
+ 
+ static SDL_Rect **XBIOS_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
+ {
+-	unsigned int numlist;
+-
+ 	/* 8 bits -> list 0 */
+ 	/* 16 bits -> list 1 */
+-	if (format->BitsPerPixel == 15) {
++	if ((format->BitsPerPixel != 8) && (format->BitsPerPixel !=16)) {
+ 		return NULL;
+ 	}
+ 
+-	numlist = (format->BitsPerPixel)>>4;
+-	if (numlist>1)
+-		return NULL;
+-
+-	return(SDL_modelist[numlist]);
++	return(SDL_modelist[(format->BitsPerPixel)>>4]);
+ }
+ 
+ static void XBIOS_FreeBuffers(_THIS)
+------=MIME.0d9b6d4fb0ac7f37b9ef385d1fcdeb0c--
+
+
+
+From bogus@does.not.exist.com  Fri Sep  5 16:18:56 2003
+From: bogus@does.not.exist.com (Anonymous CVS Login)
+Date: Fri, 05 Sep 2003 08:18:56 -0700
+Subject: [SDL-CVS] Module SDL12: Change committed
+Message-ID: <E19vIMS-0006rb-00@twomix.devolution.com>
+
+This is a multipart message as defined by RFC2049 (MIME)
+
+------=MIME.25c0ddda396f4479024bea6f2b472503
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+Commiter   : cvs
+CVSROOT    : /home/sdlweb/libsdl.org/cvs
+Module     : SDL12
+Commit time: 2003-09-05 15:18:56 UTC
+
+Log message:
+
+Fixed X11 mode line crash with only one video mode (thanks Alan!)
+
+Modified files:
+     src/video/x11/SDL_x11modes.c
+
+------=MIME.25c0ddda396f4479024bea6f2b472503
+Content-Type: text/plain; name="SDL12.20030905.151856.cvs.diff"
+Content-Disposition: attachment; filename="SDL12.20030905.151856.cvs.diff"
+Content-Transfer-Encoding: 8bit
+
+Index: SDL12/src/video/x11/SDL_x11modes.c
+diff -u SDL12/src/video/x11/SDL_x11modes.c:1.19 SDL12/src/video/x11/SDL_x11modes.c:1.20
+--- SDL12/src/video/x11/SDL_x11modes.c:1.19	Sat Jun 28 14:52:26 2003
++++ SDL12/src/video/x11/SDL_x11modes.c	Fri Sep  5 08:18:46 2003
+@@ -22,7 +22,7 @@
+ 
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
++ "@(#) $Id: libsdl-1.2.6-fullscreen.patch,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $";
+ #endif
+ 
+ /* Utilities for getting and setting the X display mode */
+@@ -120,7 +120,7 @@
+                     goto match;
+             }
+             qsort(modes, nmodes, sizeof *modes, cmpmodes);
+-            for ( i = nmodes-1; i >= 0 ; i-- ) {
++            for ( i = nmodes-1; i > 0 ; i-- ) {
+ 		if ( ! best_width ) {
+                     if ( (modes[i]->hdisplay >= width) &&
+                          (modes[i]->vdisplay >= height) ) {
+------=MIME.25c0ddda396f4479024bea6f2b472503--
+
diff --git a/media-libs/libsdl/libsdl-1.2.6-r2.ebuild b/media-libs/libsdl/libsdl-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..bde9c65a7a55
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.6-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r2.ebuild,v 1.1 2003/11/01 08:19:15 mr_bones_ Exp $
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl noaudio novideo nojoystick"
+# if you disable audio/video/joystick and something breaks, you pick up the pieces
+
+RDEPEND=">=media-libs/audiofile-0.1.9
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.19 )
+	arts? ( kde-base/arts )
+	nas? ( media-libs/nas )
+	X? ( >=x11-base/xfree-4.3.0 )
+	directfb? ( >=dev-libs/DirectFB-0.9.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( media-libs/aalib )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+	# Removed temporarily
+	#x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/SDL-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# this should fix Bug 31235
+	patch -p1 < ${FILESDIR}/${P}-fullscreen.patch || die "patch failed"
+	sed -i \
+		-e 's:head -1:head -n 1:' configure || \
+			die "sed configure failed"
+}
+
+src_compile() {
+
+	local myconf=""
+	[ `use noaudio` ] && myconf="${myconf} --disable-audio"
+	[ `use novideo` ] \
+		&& myconf="${myconf} --disable-video" \
+		|| myconf="${myconf} --enable-video-dummy"
+	[ `use nojoystick` ] && myconf="${myconf} --disable-joystick"
+
+	# asm is b0rken in 1.2.6
+	# http://www.libsdl.org/pipermail/sdl/2003-October/057304.html
+	# `use_enable x86 nasm` \
+	econf \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		`use_enable oss` \
+		`use_enable alsa` \
+		`use_enable esd` \
+		`use_enable arts` \
+		`use_enable nas` \
+		--disable-nasm \
+		`use_enable X video-x11` \
+		`use_enable dga` \
+		`use_enable xv video-x11-xv` \
+		`use_enable xinerama video-x11-xinerama` \
+		`use_enable dga video-dga` \
+		`use_enable fbcon video-fbcon` \
+		`use_enable directfb video-directfb` \
+		`use_enable ggi video-ggi` \
+		`use_enable svga video-svga` \
+		`use_enable aalib video-aalib` \
+		`use_enable opengl video-opengl` \
+		${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	preplib
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew || \
+		die "dodoc failed"
+	dohtml -r ./ || die "dohtml failed"
+}