version bump #29219

7 files changed, 64 insertions, 38 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index 9cc7f3aa55ba..eed3525fdc10 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for games-fps/prboom
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.2 2003/09/10 16:06:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.3 2003/09/21 21:11:24 vapier Exp $
 
-  08 Sep 2003; Michael Sterrett <msterret@gentoo.org> prboom-2.2.3.ebuild:
-  massage the DEPEND lines around; add media-libs/smpeg which config checks for.
+*prboom-2.2.4 (21 Sep 2003)
+
+  21 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #29219.
 
 *prboom-2.2.3 (24 Oct 2002)
 
+  08 Sep 2003; Michael Sterrett <msterret@gentoo.org> prboom-2.2.3.ebuild:
+  massage the DEPEND lines around; add media-libs/smpeg which config checks for.
+
   27 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
   Added an nvidia test/patch so that it'll work on NVidia GL #19025.
 
diff --git a/games-fps/prboom/files/2.2.3-nvidia.patch b/games-fps/prboom/files/2.2.3-nvidia.patch
deleted file mode 100644
index 1fe78112b26a..000000000000
--- a/games-fps/prboom/files/2.2.3-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/gl_main.c.orig	2002-07-27 12:34:42.000000000 -0400
-+++ src/gl_main.c	2003-06-28 01:10:25.000000000 -0400
-@@ -273,6 +273,7 @@
- 
-     if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0)
-       gl_texture_filter_anisotropic = true;
-+/*
-     else if (strcasecmp(extension, "GL_EXT_paletted_texture") == 0) {
-       if (gl_use_paletted_texture) {
-         gl_paletted_texture = true;
-@@ -286,7 +287,7 @@
-         glColorTableEXT = SDL_GL_GetProcAddress("glColorTableEXT");
-         lprintf(LO_INFO,"using GL_EXT_shared_texture_palette\n",glGetString(GL_VENDOR));
-       }
--
-+*/
-     extension = p;
-   } while (*extension != '\0');
- 
---- src/gl_intern.h.orig	2003-06-28 01:13:38.000000000 -0400
-+++ src/gl_intern.h	2003-06-28 01:13:43.000000000 -0400
-@@ -114,5 +114,5 @@
- #define min(a,b) ((a)<(b)?(a):(b))
- #endif
- 
--PFNGLCOLORTABLEEXTPROC glColorTableEXT;
-+//PFNGLCOLORTABLEEXTPROC glColorTableEXT;
- #endif // _GL_INTERN_H
diff --git a/games-fps/prboom/files/2.2.3-nvidia-test.c b/games-fps/prboom/files/2.2.4-nvidia-test.c
index f9e4bd700f8a..f9e4bd700f8a 100644
--- a/games-fps/prboom/files/2.2.3-nvidia-test.c
+++ b/games-fps/prboom/files/2.2.4-nvidia-test.c
diff --git a/games-fps/prboom/files/2.2.4-nvidia.patch b/games-fps/prboom/files/2.2.4-nvidia.patch
new file mode 100644
index 000000000000..cbadbd82c1e4
--- /dev/null
+++ b/games-fps/prboom/files/2.2.4-nvidia.patch
@@ -0,0 +1,48 @@
+--- src/gl_intern.h.orig	2003-09-21 16:39:30.247451624 -0400
++++ src/gl_intern.h	2003-09-21 16:39:41.610724144 -0400
+@@ -84,6 +84,6 @@
+ #define min(a,b) ((a)<(b)?(a):(b))

+ #endif

+ 

+-PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;

++//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;

+ 

+ #endif // _GL_INTERN_H

+--- src/gl_main.c.orig	2003-09-21 16:39:55.436622288 -0400
++++ src/gl_main.c	2003-09-21 16:43:00.943420968 -0400
+@@ -285,6 +285,7 @@
+ 

+     if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0)

+       gl_texture_filter_anisotropic = true;

++/*
+     else if (strcasecmp(extension, "GL_EXT_paletted_texture") == 0) {

+       if (gl_use_paletted_texture) {

+         gl_paletted_texture = true;

+@@ -304,6 +305,7 @@
+ 	else

+           lprintf(LO_INFO,"using GL_EXT_shared_texture_palette\n",glGetString(GL_VENDOR));

+       }

++*/
+ 

+     extension = p;

+   } while (*extension != '\0');

+@@ -761,7 +763,7 @@
+     pal[transparent_pal_index*4+1]=0;

+     pal[transparent_pal_index*4+2]=0;

+     pal[transparent_pal_index*4+3]=0;

+-    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);

++//    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);

+     W_UnlockLumpName("PLAYPAL");

+   } else {

+     if (palette>0)

+--- src/gl_texture.c.orig	2003-09-21 16:43:18.450759448 -0400
++++ src/gl_texture.c	2003-09-21 16:43:39.549551944 -0400
+@@ -178,7 +178,7 @@
+   pal[transparent_pal_index*4+1]=0;
+   pal[transparent_pal_index*4+2]=0;
+   pal[transparent_pal_index*4+3]=0;
+-  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
++//  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
+   W_UnlockLumpName("PLAYPAL");
+ }
+ 
diff --git a/games-fps/prboom/files/digest-prboom-2.2.3 b/games-fps/prboom/files/digest-prboom-2.2.3
deleted file mode 100644
index 52a418cfb43a..000000000000
--- a/games-fps/prboom/files/digest-prboom-2.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 91873942bbb7f0ee476b27b6baa62159 prboom-2.2.3.tar.gz 994824
-MD5 66851d7cecbc7845d612e7073c1355ad doom1.wad.gz 1765820
diff --git a/games-fps/prboom/files/digest-prboom-2.2.4 b/games-fps/prboom/files/digest-prboom-2.2.4
new file mode 100644
index 000000000000..3940354db5c7
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.2.4
@@ -0,0 +1,2 @@
+MD5 a7cd473d5b6bb69f815bf156b93aeacc prboom-2.2.4.tar.gz 1001103
+MD5 66851d7cecbc7845d612e7073c1355ad doom1.wad.gz 1765820
diff --git a/games-fps/prboom/prboom-2.2.3.ebuild b/games-fps/prboom/prboom-2.2.4.ebuild
index 8ec52b5f92d1..fc724be467df 100644
--- a/games-fps/prboom/prboom-2.2.3.ebuild
+++ b/games-fps/prboom/prboom-2.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.3.ebuild,v 1.2 2003/09/15 15:48:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4.ebuild,v 1.1 2003/09/21 21:11:24 vapier Exp $
 
-inherit games eutils
+inherit games eutils gcc
 
 DESCRIPTION="Port of ID's doom to SDL and OpenGL"
 HOMEPAGE="http://prboom.sourceforge.net/"
@@ -25,9 +25,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	ebegin "Detecting NVidia GL/prboom bug"
-	gcc ${FILESDIR}/${PV}-nvidia-test.c 2> /dev/null
-	eend $? "NVidia GL/prboom bug found ;("
-	epatch ${FILESDIR}/${PV}-nvidia.patch
+	$(gcc-getCC) ${FILESDIR}/${PV}-nvidia-test.c 2> /dev/null
+	local ret=$?
+	eend ${ret} "NVidia GL/prboom bug found ;("
+	[ ${ret} -eq 0 ] || epatch ${FILESDIR}/${PV}-nvidia.patch
 }
 
 src_compile() {