Author: branden
Date: 2004-08-21 02:45:29 -0500 (Sat, 21 Aug 2004)
New Revision: 1741
Added:
trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
Fix up the Mesa DRI tdfx module so that it really does use only libglide3,
not libglide3-dev (#099h). 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. Thanks to Guillem Jover for this patch.
(Closes: #260099)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-21 06:09:33 UTC (rev 1740)
+++ trunk/debian/CHANGESETS 2004-08-21 07:45:29 UTC (rev 1741)
@@ -377,4 +377,13 @@
module when DRI is used. (Closes: #254601)
1737
+Fix up the Mesa DRI tdfx module so that it really does use only libglide3,
+not libglide3-dev (#099h). 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. Thanks to Guillem Jover for this patch.
+(Closes: #260099)
+ 1741
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-21 06:09:33 UTC (rev 1740)
+++ trunk/debian/changelog 2004-08-21 07:45:29 UTC (rev 1741)
@@ -287,6 +287,14 @@
+ Circumvent unresolved symbol complaints by explicitly loading the "glx"
module when DRI is used. (Closes: #254601)
+ * Fix up the Mesa DRI tdfx module so that it really does use only libglide3,
+ not libglide3-dev (#099h). 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. Thanks to Guillem Jover for this patch.
+ (Closes: #260099)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -328,7 +336,7 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 20 Aug 2004 15:59:21 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 21 Aug 2004 02:42:05 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Added: trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
===================================================================
--- trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
2004-08-21 06:09:33 UTC (rev 1740)
+++ trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
2004-08-21 07:45:29 UTC (rev 1741)
@@ -0,0 +1,36 @@
+$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.
+
+--- xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c~ 2004-08-21
01:33:44.000000000 -0500
++++ xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c 2004-08-21 01:34:47.000000000
-0500
+@@ -707,7 +707,7 @@
+ */
+ GLboolean tdfxInitGlide(tdfxContextPtr tmesa)
+ {
+- static const char *defaultGlide = "libglide3.so";
++ static const char *defaultGlide = "libglide3.so.3";
+ const char *libName;
+ void *libHandle;
+
+@@ -719,10 +719,10 @@
+ switch (tmesa->fxScreen->deviceID) {
+ case PCI_CHIP_BANSHEE:
+ case PCI_CHIP_VOODOO3:
+- libName = "libglide3-v3.so";
++ libName = "libglide3_h3.so.3";
+ break;
+ case PCI_CHIP_VOODOO5: /* same as PCI_CHIP_VOODOO4 */
+- libName = "libglide3-v5.so";
++ libName = "libglide3_h5.so.3";
+ break;
+ default:
+ {
Property changes on:
trunk/debian/patches/099h_mesa_tdfx_load_right_glide_library.diff
___________________________________________________________________
Name: svn:keywords
+ Id
