Stefan Dirsch
7a0930bbe6
Heavily break the system? ok lets do it! (Just kidding) This is just to show some work towards mesa 8.1, but this snapshot actually works :) Three new development packages added! If you accept this there will be a new libdrm and a newer nouveau driver OBS-URL: https://build.opensuse.org/request/show/131614 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=240
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
Author: Stefan Dirsch <sndirsch@suse.de>
|
|
Subject: Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag
|
|
References: bnc#765294, fdo#26663
|
|
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86-64_asm.py mesa-8.0.3/src/mapi/glapi/gen/gl_x86-64_asm.py
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86-64_asm.py 2012-06-12 12:07:39.000000000 +0200
|
|
+++ mesa-8.0.3/src/mapi/glapi/gen/gl_x86-64_asm.py 2012-06-12 12:09:17.000000000 +0200
|
|
@@ -181,7 +181,7 @@ class PrintGenericStubs(gl_XML.gl_print_
|
|
|
|
def printRealFooter(self):
|
|
print ''
|
|
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
|
|
+ print '#if 0 && defined(__linux__)'
|
|
print ' .section ".note.ABI-tag", "a"'
|
|
print ' .p2align 2'
|
|
print ' .long 1f - 0f /* name length */'
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86_asm.py mesa-8.0.3/src/mapi/glapi/gen/gl_x86_asm.py
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86_asm.py 2012-06-12 12:07:39.000000000 +0200
|
|
+++ mesa-8.0.3/src/mapi/glapi/gen/gl_x86_asm.py 2012-06-12 12:09:29.000000000 +0200
|
|
@@ -189,7 +189,7 @@ class PrintGenericStubs(gl_XML.gl_print_
|
|
print '\t\tALIGNTEXT16'
|
|
print 'GLNAME(gl_dispatch_functions_end):'
|
|
print ''
|
|
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
|
|
+ print '#if 0 && defined(__linux__)'
|
|
print ' .section ".note.ABI-tag", "a"'
|
|
print ' .p2align 2'
|
|
print ' .long 1f - 0f /* name length */'
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h
|
|
--- mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:07:39.000000000 +0200
|
|
+++ mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:10:20.000000000 +0200
|
|
@@ -28,7 +28,7 @@
|
|
|
|
#include "u_macros.h"
|
|
|
|
-#ifdef __linux__
|
|
+#if 0
|
|
__asm__(".section .note.ABI-tag, \"a\"\n\t"
|
|
".p2align 2\n\t"
|
|
".long 1f - 0f\n\t" /* name length */
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/mapi/entry_x86_tls.h mesa-8.0.3/src/mapi/mapi/entry_x86_tls.h
|
|
--- mesa-8.0.3.orig//src/mapi/mapi/entry_x86_tls.h 2012-06-12 12:07:39.000000000 +0200
|
|
+++ mesa-8.0.3/src/mapi/mapi/entry_x86_tls.h 2012-06-12 12:10:32.000000000 +0200
|
|
@@ -29,7 +29,7 @@
|
|
#include <string.h>
|
|
#include "u_macros.h"
|
|
|
|
-#ifdef __linux__
|
|
+#if 0
|
|
__asm__(".section .note.ABI-tag, \"a\"\n\t"
|
|
".p2align 2\n\t"
|
|
".long 1f - 0f\n\t" /* name length */
|