packages: warsow/warsow-gentoo_fixes.patch, warsow/warsow-libjpeg.patch - u...

[lisu]

Author: lisu                         Date: Wed Jan 19 10:29:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.6

---- Files affected:
packages/warsow:
   warsow-gentoo_fixes.patch (1.1 -> 1.2) , warsow-libjpeg.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/warsow/warsow-gentoo_fixes.patch
diff -u packages/warsow/warsow-gentoo_fixes.patch:1.1 packages/warsow/warsow-gentoo_fixes.patch:1.2
--- packages/warsow/warsow-gentoo_fixes.patch:1.1	Wed May  5 02:53:41 2010
+++ packages/warsow/warsow-gentoo_fixes.patch	Wed Jan 19 11:29:20 2011
@@ -1,19 +1,19 @@
---- source/Makefile
-+++ source/Makefile
-@@ -52,7 +52,7 @@
- #LD=gcc
+--- source/Makefile~	2010-09-24 20:15:21.000000000 +0200
++++ source/Makefile	2011-01-19 10:50:30.241352157 +0100
+@@ -48,7 +48,7 @@
  else
  CC?=gcc
+ CXX?=g++
 -LD=gcc
 +LD=$(CC)
+ AR=ar
+ RANLIB=ranlib
  
- # this nice line comes from the linux kernel makefile
- BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
-@@ -134,9 +134,9 @@
+@@ -166,9 +166,9 @@
  LOCALBASE?=/usr/local
  X11BASE?=/usr/X11R6
  
--CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall
+-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function
 -CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
 -CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
 +CFLAGS_COMMON=$(CFLAGS) -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -fno-strict-aliasing
@@ -22,25 +22,16 @@
  ifeq ($(DEBUG_BUILD),YES)
  CFLAGS_COMMON+=$(CFLAGS_DEBUG)
  else
-@@ -152,7 +152,7 @@
+@@ -184,7 +184,7 @@
  ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON=-L/usr/local/lib -lm -pthread
+ LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
  else
--LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm -Wl -O1 --as-needed
-+LDFLAGS_COMMON=$(LDFLAGS) -ldl -lm
+-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -Wl -O1 --as-needed
++LDFLAGS_COMMON+= -ldl -lm
  endif
- 
- ifeq ($(ARCH),x86_64)
-@@ -168,7 +168,7 @@
- 
- # openal
- ifeq ($(BUILD_SND_OPENAL),YES)
--OPENAL_CONFIG?=openal-config
-+OPENAL_CONFIG?=pkg-config openal
- 
- CFLAGS_OPENAL=$(shell $(OPENAL_CONFIG) --cflags)
- LDFLAGS_OPENAL=-lvorbisfile
-@@ -400,16 +400,16 @@
+ ifneq ($(DEBUG_BUILD),YES)
+ LDFLAGS_COMMON+= -s
+@@ -477,16 +477,16 @@
  
  all: client openal qf ded cgame game ui irc angelwrap tv_server
  

================================================================
Index: packages/warsow/warsow-libjpeg.patch
diff -u packages/warsow/warsow-libjpeg.patch:1.1 packages/warsow/warsow-libjpeg.patch:1.2
--- packages/warsow/warsow-libjpeg.patch:1.1	Wed May  5 02:53:41 2010
+++ packages/warsow/warsow-libjpeg.patch	Wed Jan 19 11:29:20 2011
@@ -1,5 +1,5 @@
---- warsow-0.5.orig/source/ref_gl/r_image.c	2009-06-03 21:52:13.000000000 +0200
-+++ warsow-0.5/source/ref_gl/r_image.c	2010-05-04 18:32:55.176936391 +0200
+--- warsow-0.6/source/ref_gl/r_image.c~	2010-09-19 19:50:45.000000000 +0200
++++ warsow-0.6/source/ref_gl/r_image.c	2011-01-19 11:02:59.239007187 +0100
 @@ -17,6 +17,9 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
@@ -14,8 +14,17 @@
  	cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
  }
  
--static void jpeg_mem_src( j_decompress_ptr cinfo, qbyte *mem, int len )
-+static void crjpeg_mem_src( j_decompress_ptr cinfo, qbyte *mem, int len )
+-void jpeg_mem_src( j_decompress_ptr cinfo, unsigned char *mem, unsigned long len )
++void crjpeg_mem_src( j_decompress_ptr cinfo, unsigned char *mem, unsigned long len )
  {
  	cinfo->src = (struct jpeg_source_mgr *)
  		( *cinfo->mem->alloc_small )( (j_common_ptr) cinfo,
+@@ -961,7 +964,7 @@
+ 
+ 	cinfo.err = jpeg_std_error( &jerr );
+ 	jpeg_create_decompress( &cinfo );
+-	jpeg_mem_src( &cinfo, buffer, length );
++	crjpeg_mem_src( &cinfo, buffer, length );
+ 	jpeg_read_header( &cinfo, TRUE );
+ 	jpeg_start_decompress( &cinfo );
+ 	samples = cinfo.output_components;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/warsow/warsow-gentoo_fixes.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/warsow/warsow-libjpeg.patch?r1=1.1&r2=1.2&f=u