From e9f0e663656ab5173a5fd4a9642039cd344f08aa3a4746944a76a495b04e47d9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 12 Jun 2012 12:09:17 +0000 Subject: [PATCH] - u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226 --- Mesa.changes | 7 ++++ Mesa.spec | 3 ++ u_remove-os-abi-tag.patch | 76 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 u_remove-os-abi-tag.patch diff --git a/Mesa.changes b/Mesa.changes index 4ed5046..945fc0f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 12 10:19:01 UTC 2012 - sndirsch@suse.com + +- u_remove-os-abi-tag.patch + * Remove OS ABI tag from libGL, so it is no longer preferred over + libGLs without OS ABI tag (bnc#765294, fdo#26663) + ------------------------------------------------------------------- Fri Jun 8 14:05:30 UTC 2012 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 36409d9..79ee833 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -92,6 +92,8 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch12: upstream-llvm-patch.diff # Patch from Fedora, fix 16bpp in llvmpipe Patch13: u_mesa-8.0.1-fix-16bpp.patch +# Patch to remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag +Patch14: u_remove-os-abi-tag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -402,6 +404,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build diff --git a/u_remove-os-abi-tag.patch b/u_remove-os-abi-tag.patch new file mode 100644 index 0000000..21ec462 --- /dev/null +++ b/u_remove-os-abi-tag.patch @@ -0,0 +1,76 @@ +Author: Stefan Dirsch +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/glapi/glapi_x86-64.S mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S +--- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:07:39.000000000 +0200 ++++ mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:09:43.000000000 +0200 +@@ -37448,7 +37448,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES): + .globl GL_PREFIX(TransformFeedbackVaryings) ; .set GL_PREFIX(TransformFeedbackVaryings), GL_PREFIX(TransformFeedbackVaryingsEXT) + .globl GL_PREFIX(ProvokingVertex) ; .set GL_PREFIX(ProvokingVertex), GL_PREFIX(ProvokingVertexEXT) + +-#if defined(GLX_USE_TLS) && defined(__linux__) ++#if 0 && defined(__linux__) + .section ".note.ABI-tag", "a" + .p2align 2 + .long 1f - 0f /* name length */ +diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S mesa-8.0.3/src/mapi/glapi/glapi_x86.S +--- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S 2012-06-12 12:07:39.000000000 +0200 ++++ mesa-8.0.3/src/mapi/glapi/glapi_x86.S 2012-06-12 12:09:01.000000000 +0200 +@@ -1504,7 +1504,7 @@ GLNAME(gl_dispatch_functions_start): + ALIGNTEXT16 + GLNAME(gl_dispatch_functions_end): + +-#if defined(GLX_USE_TLS) && defined(__linux__) ++#if 0 && defined(__linux__) + .section ".note.ABI-tag", "a" + .p2align 2 + .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 + #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 */