Author: fabbione
Date: 2004-10-25 08:56:11 -0500 (Mon, 25 Oct 2004)
New Revision: 115
Added:
xorg-lib-xpm/trunk/debian/patches/062_make_libGL_PIC_compliant.diff
xorg-lib-xpm/trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
Modified:
xorg-lib-xpm/trunk/debian/CHANGESETS
xorg-lib-xpm/trunk/debian/patches/104_sparc_fix_GL_library.diff
Log:
* Add 062_make_libGL_PIC_compliant.diff and
099h_mesa_tdfx_load_right_glide_library.diff for completeness.
Modified: xorg-lib-xpm/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-xpm/trunk/debian/CHANGESETS 2004-10-25 13:53:26 UTC (rev
114)
+++ xorg-lib-xpm/trunk/debian/CHANGESETS 2004-10-25 13:56:11 UTC (rev
115)
@@ -14,4 +14,8 @@
* Add 104_sparc_fix_GL_library.diff patch for completeness.
111
+* Add 062_make_libGL_PIC_compliant.diff and
+ 099h_mesa_tdfx_load_right_glide_library.diff for completeness.
+ 115
+
vim:set ai et sts=4 sw=4 tw=80:
Added: xorg-lib-xpm/trunk/debian/patches/062_make_libGL_PIC_compliant.diff
===================================================================
--- xorg-lib-xpm/trunk/debian/patches/062_make_libGL_PIC_compliant.diff
2004-10-25 13:53:26 UTC (rev 114)
+++ xorg-lib-xpm/trunk/debian/patches/062_make_libGL_PIC_compliant.diff
2004-10-25 13:56:11 UTC (rev 115)
@@ -0,0 +1,14 @@
+$Id$
+
+diff -ruN xc-old/extras/Mesa/src/mesa/x86/glapi_x86.S
xc/extras/Mesa/src/mesa/x86/glapi_x86.S
+--- xc-old/extras/Mesa/src/mesa/x86/glapi_x86.S 2004-08-28
04:28:19.000000000 +0000
++++ xc/extras/Mesa/src/mesa/x86/glapi_x86.S 2004-10-25 09:21:26.420017064
+0000
+@@ -100,6 +100,8 @@
+ EXTERN GLNAME(_glapi_get_dispatch)
+ #endif
+
++.section Gltext, "awx"
++
+ ALIGNTEXT16 ; GLOBL GLNAME(gl_dispatch_functions_start)
+ GLNAME(gl_dispatch_functions_start):
+
Property changes on:
xorg-lib-xpm/trunk/debian/patches/062_make_libGL_PIC_compliant.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added:
xorg-lib-xpm/trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
===================================================================
---
xorg-lib-xpm/trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
2004-10-25 13:53:26 UTC (rev 114)
+++
xorg-lib-xpm/trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
2004-10-25 13:56:11 UTC (rev 115)
@@ -0,0 +1,37 @@
+$Id$
+
+Open the actual libglide shared library we need, not the symbolic link used
+at compile time, which may not be installed on non-development systems.
+
+When opening chipset-specific glide libraries, use the filenames actually
+in use by the current version of the libglide3 package.
+
+This patch by Guillem Jover.
+
+Not submitted to XFree86.
+
+diff -ruN xc-old/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.c
xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.c
+--- xc-old/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.c
2004-08-12 23:06:08.000000000 +0000
++++ xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.c 2004-10-25
08:43:49.723087144 +0000
+@@ -768,7 +768,7 @@
+ */
+ GLboolean tdfxInitGlide(tdfxContextPtr tmesa)
+ {
+- static const char *defaultGlide = "libglide3.so";
++ static const char *defaultGlide = "libglide3.so.3";
+ const char *libName;
+ void *libHandle;
+
+@@ -780,10 +780,10 @@
+ switch (tmesa->fxScreen->deviceID) {
+ case PCI_CHIP_BANSHEE:
+ case PCI_CHIP_VOODOO3:
+- libName = "libglide3-v3.so";
++ libName = "libglide3_v3.so";
+ break;
+ case PCI_CHIP_VOODOO5: /* same as PCI_CHIP_VOODOO4 */
+- libName = "libglide3-v5.so";
++ libName = "libglide3_v5.so";
+ break;
+ default:
+ {
Property changes on:
xorg-lib-xpm/trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-lib-xpm/trunk/debian/patches/104_sparc_fix_GL_library.diff
===================================================================
--- xorg-lib-xpm/trunk/debian/patches/104_sparc_fix_GL_library.diff
2004-10-25 13:53:26 UTC (rev 114)
+++ xorg-lib-xpm/trunk/debian/patches/104_sparc_fix_GL_library.diff
2004-10-25 13:56:11 UTC (rev 115)
@@ -1,4 +1,4 @@
-$Id: 104_sparc_fix_GL_library.diff 66 2004-10-20 06:42:51Z fabbione $
+$Id$
As XFree86 put it on 2003-12-03:
Property changes on:
xorg-lib-xpm/trunk/debian/patches/104_sparc_fix_GL_library.diff
___________________________________________________________________
Name: svn:keywords
+ Id
