r2272 - packages/trunk/ezquake/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-01-07 18:13:22 +0100 (Sun, 07 Jan 2007)
New Revision: 2272

Added:
   packages/trunk/ezquake/debian/patches/dont_use_X11R6_old_directory.diff
   packages/trunk/ezquake/debian/patches/dont_use_glXGetVideoSyncSGI.diff
   packages/trunk/ezquake/debian/patches/use_GLEW.diff
Modified:
   packages/trunk/ezquake/debian/patches/series
Log:
add a patch to fix the build with Mesa > 6.5.1


Added: packages/trunk/ezquake/debian/patches/dont_use_X11R6_old_directory.diff
===================================================================
--- packages/trunk/ezquake/debian/patches/dont_use_X11R6_old_directory.diff	2007-01-07 00:40:55 UTC (rev 2271)
+++ packages/trunk/ezquake/debian/patches/dont_use_X11R6_old_directory.diff	2007-01-07 17:13:22 UTC (rev 2272)
@@ -0,0 +1,22 @@
+Index: ezquake-1517/Makefile
+===================================================================
+--- ezquake-1517.orig/Makefile	2007-01-07 16:56:28.000000000 +0100
++++ ezquake-1517/Makefile	2007-01-07 16:56:45.000000000 +0100
+@@ -135,7 +135,7 @@
+ # linker flags
+ LDFLAGS				=-lm `glib-config --libs` -lpthread -lexpat `pcre-config --libs` -ltclstub8.4 $(CL_DLFLAGS)
+ SVGALDFLAGS			=-lvga
+-X11_LDFLAGS			=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
++X11_LDFLAGS			=-lX11 -lXext -lXxf86dga -lXxf86vm
+ ifeq ($(ARCH),mingw32)		# Win32/x86 in MingW environment
+ 	LDFLAGS			+= -lws2_32 -luser32 -lwinmm
+ endif
+@@ -147,7 +147,7 @@
+ endif
+ 
+ # opengl build
+-BASE_GL_LDFLAGS			=-L/usr/X11R6/lib -lGL -lm -lX11 -lXext
++BASE_GL_LDFLAGS			=-lGL -lm -lX11 -lXext
+ ARCH_GL_LDFLAGS			=
+ ifeq ($(ARCH),x86)		# Linux/x86
+ 	ARCH_GL_LDFLAGS		=-lXxf86dga -lXxf86vm

Added: packages/trunk/ezquake/debian/patches/dont_use_glXGetVideoSyncSGI.diff
===================================================================
--- packages/trunk/ezquake/debian/patches/dont_use_glXGetVideoSyncSGI.diff	2007-01-07 00:40:55 UTC (rev 2271)
+++ packages/trunk/ezquake/debian/patches/dont_use_glXGetVideoSyncSGI.diff	2007-01-07 17:13:22 UTC (rev 2272)
@@ -0,0 +1,28 @@
+Index: ezquake-1517/vid_glx.c
+===================================================================
+--- ezquake-1517.orig/vid_glx.c	2007-01-07 18:18:08.000000000 +0100
++++ ezquake-1517/vid_glx.c	2007-01-07 18:18:50.000000000 +0100
+@@ -544,14 +544,21 @@
+ /************************************* GL *************************************/
+ 
+ void WaitForVSync (void) { // thanks to str-
++	PFNGLXGETVIDEOSYNCSGIPROC m_glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC) glXGetProcAddress("glXGetVideoSyncSGI");
++	PFNGLXWAITVIDEOSYNCSGIPROC m_glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC) glXGetProcAddress("glXWaitVideoSyncSGI");
++
+ 	if(vid_vsync.value) {
+ 		double sanity_time = Sys_DoubleTime() + 0.05;
+ 		unsigned int count, latest;
+ 
+-		glXGetVideoSyncSGI(&count);
++		// Gonéri Le Bouder: Don't use glXGetVideoSyncSGiI since
++		// it's not exported anymore by Mesa >= 6.5.1
++		// http://svn.mythtv.org/trac/ticket/2383
++		// Debian#389809
++		count = (PFNGLXGETVIDEOSYNCSGIPROC) glXGetProcAddress("glXGetVideoSyncSGI");
+ 
+ 		while(Sys_DoubleTime() < sanity_time) {
+-			glXGetVideoSyncSGI(&latest);
++			latest = (PFNGLXGETVIDEOSYNCSGIPROC) glXGetProcAddress("glXGetVideoSyncSGI");
+ 
+ 			if(latest != count) {
+ 				break;

Modified: packages/trunk/ezquake/debian/patches/series
===================================================================
--- packages/trunk/ezquake/debian/patches/series	2007-01-07 00:40:55 UTC (rev 2271)
+++ packages/trunk/ezquake/debian/patches/series	2007-01-07 17:13:22 UTC (rev 2272)
@@ -1 +1,4 @@
 find_tcl_headers.diff
+dont_use_X11R6_old_directory.diff
+use_GLEW.diff
+dont_use_glXGetVideoSyncSGI.diff

Added: packages/trunk/ezquake/debian/patches/use_GLEW.diff
===================================================================
--- packages/trunk/ezquake/debian/patches/use_GLEW.diff	2007-01-07 00:40:55 UTC (rev 2271)
+++ packages/trunk/ezquake/debian/patches/use_GLEW.diff	2007-01-07 17:13:22 UTC (rev 2272)
@@ -0,0 +1,13 @@
+Index: ezquake-1517/Makefile
+===================================================================
+--- ezquake-1517.orig/Makefile	2007-01-07 16:58:29.000000000 +0100
++++ ezquake-1517/Makefile	2007-01-07 17:01:41.000000000 +0100
+@@ -147,7 +147,7 @@
+ endif
+ 
+ # opengl build
+-BASE_GL_LDFLAGS			=-lGL -lm -lX11 -lXext
++BASE_GL_LDFLAGS			=-lGL -lGLU -lm -lX11 -lXext
+ ARCH_GL_LDFLAGS			=
+ ifeq ($(ARCH),x86)		# Linux/x86
+ 	ARCH_GL_LDFLAGS		=-lXxf86dga -lXxf86vm