Author: fabbione
Date: 2004-04-23 06:27:55 -0500 (Fri, 23 Apr 2004)
New Revision: 1307
Modified:
trunk/debian/changelog
trunk/debian/patches/104_sparc_fix_GL_library.diff
Log:
Fix 104_sparc_fix_GL_library.diff to compile lib/GL/glx/glxext.c on non-sparc
architectures and removed unrequired #else #endif block.
Problem detected building from source on i386.
Fix tested rebuilding from source on i386.
NOTE: sparc code has not been modified and it is expected to work as before.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-23 10:41:46 UTC (rev 1306)
+++ trunk/debian/changelog 2004-04-23 11:27:55 UTC (rev 1307)
@@ -167,7 +167,8 @@
* Fix SEGV when attempting to use GLX extension on SPARC due to failure of
extension to initialize a Mesa context; patch by Ferris McCormick,
- backported from XFree86 CVS 2003-12-08 by Christian Guggenberger.
+ backported from XFree86 CVS 2003-12-08 by Christian Guggenberger,
+ and updated to build on non-sparc architectures by Fabio M. Di Nitto.
(Closes: #241331)
* Disable RandR extension support in siliconmotion driver when the driver's
Modified: trunk/debian/patches/104_sparc_fix_GL_library.diff
===================================================================
--- trunk/debian/patches/104_sparc_fix_GL_library.diff 2004-04-23 10:41:46 UTC
(rev 1306)
+++ trunk/debian/patches/104_sparc_fix_GL_library.diff 2004-04-23 11:27:55 UTC
(rev 1307)
@@ -68,7 +68,7 @@
return gc->majorOpcode;
} else {
/*
-@@ -1029,3 +1062,64 @@
+@@ -1029,3 +1062,60 @@
}
}
#endif
@@ -126,10 +126,6 @@
+ __glapi_sparc_icache_flush(&insn_ptr[0]);
+ insn_ptr += 5;
+# endif
-+#else
-+ /*
-+ * Just no-op
-+ */
-+#endif /* sparc ASM in use */
+ }
++#endif /* sparc ASM in use */
+}
