diff --git a/Mesa-nodate.diff b/Mesa-nodate.diff deleted file mode 100644 index ea1a1da..0000000 --- a/Mesa-nodate.diff +++ /dev/null @@ -1,28 +0,0 @@ -From da91936f74e4195fbb3ed4da0eaecb9f1ec66972 Mon Sep 17 00:00:00 2001 -From: Tobias Johannes Klausmann -Date: Fri, 20 Apr 2012 14:09:50 +0200 -Subject: [PATCH] PATCH-FIX-OPENSUSE do not put dates in sources to fix - build-compare - ---- - src/mesa/main/es_generator.py | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py -index cad3dea..0dde6f7 100644 ---- a/src/mesa/main/es_generator.py -+++ b/src/mesa/main/es_generator.py -@@ -182,9 +182,8 @@ print """/* DO NOT EDIT ************************************************* - * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT - * API specification file: %s - * GLES version: %s -- * date: %s - */ --""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S")) -+""" % (program, functionList, version) - - # The headers we choose are version-specific. - print """ --- -1.7.7 - diff --git a/Mesa.changes b/Mesa.changes index 5a351a7..1684821 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sat Mar 2 02:51:10 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to Mesa 9.1: + Mesa 9.1 implements the OpenGL 3.1 API, but the version reported by + glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / + glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver + being used. Some drivers don't support all the features required + in OpenGL 3.1. OpenGL 3.1 is only available if requested at context + creation because GL_ARB_compatibility is not supported. +- New features: + + GL_ARB_map_buffer_alignment + + GL_ARB_texture_cube_map_array +- Changes: + + Removed VAAPI state tracker (unmaintained and broken) + + Removed i965's broken hardware implementation of GL_NV_vertex_program + + Removed swrast support for GL_NV_vertex_program + + Removed swrast support for GL_NV_fragment_program + + Removed OpenVMS support (unmaintained and broken) +- Changes to package(s): + + Rename libwayland-egl1-devel -> libwayland-egl-devel + + Add a GLES3 Development package + + Removed patches: + Mesa-nodate.diff (patch1) + No dates are put into the build anymore + U_glx-fix-glGetTexLevelParameteriv-for-indirect-render.patch (patch18) + Included in this release + + Remove BuildRequires we dont need: + http://cgit.freedesktop.org/mesa/mesa/commit/?id= + af6aeae4e1286a8858e040602db338de6a1367dc + + Update Required package versions + ------------------------------------------------------------------- Thu Feb 28 18:07:05 UTC 2013 - dmueller@suse.com diff --git a/Mesa.spec b/Mesa.spec index 69ba35b..68e0199 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -17,11 +17,11 @@ %define glamor 1 -%define _version 9.0.3 +%define _version 9.1 %define _name_archive MesaLib Name: Mesa -Version: 9.0.3 +Version: 9.1 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -36,14 +36,12 @@ BuildRequires: libxml2-python BuildRequires: pkgconfig BuildRequires: python-base BuildRequires: xorg-x11-util-devel -BuildRequires: pkgconfig(dri2proto) >= 2.6 -BuildRequires: pkgconfig(glproto) >= 1.4.14 BuildRequires: pkgconfig(libdrm) >= 2.4.24 %ifarch x86_64 %ix86 BuildRequires: pkgconfig(libdrm_intel) >= 2.4.34 %endif -BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.3 -BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.31 +BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.33 +BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.40 BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libudev) > 150 %if 0%{?suse_version} >= 1230 @@ -63,6 +61,7 @@ BuildRequires: llvm-devel %endif BuildRequires: libXvMC-devel BuildRequires: libvdpau-devel + Url: http://www.mesa3d.org Provides: Mesa7 = %{version} Obsoletes: Mesa7 < %{version} @@ -88,8 +87,6 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source5: drirc Source6: %name-rpmlintrc -# PATCH-FIX-OPENSUSE do not put dates in sources to fix build-compare -Patch1: Mesa-nodate.diff # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # Patch from Fedora, fix 16bpp in llvmpipe @@ -98,8 +95,7 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch Patch14: u_remove-os-abi-tag.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch16: u_mesa-8.0-llvmpipe-shmget.patch -# bnc#802718, bfo#59876: GLX replies are parsed incorrectly when using libxcb and AIGLX -Patch18: U_glx-fix-glGetTexLevelParameteriv-for-indirect-render.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,6 +125,9 @@ Requires: Mesa-libIndirectGL-devel = %version Requires: Mesa-libglapi-devel = %version Requires: libOSMesa-devel = %version Requires: libgbm-devel +%if 0%{?suse_version} >= 1230 +Requires: libwayland-egl-devel +%endif # bug437293 %ifarch ppc64 Obsoletes: Mesa-devel-64bit < %{version} @@ -247,7 +246,7 @@ This package provides a development environment for building programs using the OpenGL|ES 1.x APIs. %package -n Mesa-libGLESv2-2 -Summary: Free implementation of the OpenGL|ES 2.x, 3.x API +Summary: Free implementation of the OpenGL|ES 2.x API Group: System/Libraries %description -n Mesa-libGLESv2-2 @@ -260,7 +259,7 @@ OpenGL|ES 2.x provides an API for programmable hardware including vertex and fragment shaders. %package -n Mesa-libGLESv2-devel -Summary: Development files for the OpenGL ES 2.x, 3.x API +Summary: Development files for the OpenGL ES 2.x API Group: Development/Libraries/C and C++ Requires: Mesa-libGLESv2-2 = %version Requires: pkgconfig(egl) @@ -275,7 +274,22 @@ OpenGL|ES 2.x provides an API for programmable hardware including vertex and fragment shaders. This package provides a development environment for building -applications using the OpenGL|ES 2.x and 3.x APIs. +applications using the OpenGL|ES 2.x APIs. + +%package -n Mesa-libGLESv3-devel +Summary: Development files for the OpenGL ES 3.x API +Group: Development/Libraries/C and C++ +#Requires: Mesa-libGLESv3-3 = %version +Requires: pkgconfig(egl) + +%description -n Mesa-libGLESv3-devel +OpenGL|ES is a cross-platform API for full-function 2D and 3D +graphics on embedded systems - including consoles, phones, appliances +and vehicles. It contains a subset of OpenGL plus a number of +extensions for the special needs of embedded systems. + +This package provides a development environment for building +applications using the OpenGL|ES 3.x APIs. %package -n Mesa-libIndirectGL1 # This is the equivalent to Debian's libgl1-mesa-swx11 @@ -381,14 +395,14 @@ This package provides additional functions for egl-using programs that run within the wayland framework. This allows for applications that need not run full-screen and cooperate with a compositor. -%package -n libwayland-egl1-devel +%package -n libwayland-egl-devel Summary: Development files for libwayland-egl1 Group: Development/Libraries/C and C++ Version: 1.0.0 Release: 0 Requires: libwayland-egl1 = %version -%description -n libwayland-egl1-devel +%description -n libwayland-egl-devel This package is required to link wayland client applications to the EGL implementation of Mesa. %endif @@ -504,14 +518,12 @@ poor video quality, choppy videos and artefacts all over. %prep %setup -n %{name}-%{_version} -b4 -q -%patch1 -p1 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 %patch16 -p1 %patch13 -p1 %patch14 -p1 -%patch18 -p1 %build @@ -527,6 +539,7 @@ egl_platforms=x11,drm autoreconf -fi ### --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \ ### --with-gallium-drivers=r300,r600,nouveau,swrast,svga \ +### --with-gallium-drivers=r300,nouveau,swrast,svga \ %configure --enable-gles1 \ --enable-gles2 \ --enable-dri \ @@ -559,10 +572,11 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; # build and install Indirect Rendering only libGL -make clean-local +#### +make distclean-generic %configure --enable-xlib-glx \ + --disable-dri \ --enable-osmesa \ - --disable-dri \ --with-egl-platforms=x11 \ --with-gallium-drivers="" \ --with-gl-lib-name=IndirectGL \ @@ -720,6 +734,12 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_libdir/libGLESv2.so %_libdir/pkgconfig/glesv2.pc +%files -n Mesa-libGLESv3-devel +%defattr(-,root,root) +%_includedir/GLES3 +#%_libdir/libGLESv3.so +#%_libdir/pkgconfig/glesv3.pc + %files -n Mesa-libIndirectGL1 %defattr(-,root,root) %_libdir/libIndirectGL.so.1* @@ -744,10 +764,11 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_libdir/libwayland-egl.so.1* -%files -n libwayland-egl1-devel +%files -n libwayland-egl-devel %defattr(-,root,root) %_libdir/libwayland-egl.so %_libdir/pkgconfig/wayland-egl.pc + %endif %files -n libgbm1 @@ -776,43 +797,43 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_libdir/libXvMCnouveau.so %_libdir/libXvMCnouveau.so.1 -%_libdir/libXvMCnouveau.so.1.0 +%_libdir/libXvMCnouveau.so.1.0.0 %files -n libXvMC_r300 %defattr(-,root,root) %_libdir/libXvMCr300.so %_libdir/libXvMCr300.so.1 -%_libdir/libXvMCr300.so.1.0 +%_libdir/libXvMCr300.so.1.0.0 %files -n libXvMC_r600 %defattr(-,root,root) %_libdir/libXvMCr600.so %_libdir/libXvMCr600.so.1 -%_libdir/libXvMCr600.so.1.0 +%_libdir/libXvMCr600.so.1.0.0 %files -n libXvMC_softpipe %defattr(-,root,root) %_libdir/libXvMCsoftpipe.so %_libdir/libXvMCsoftpipe.so.1 -%_libdir/libXvMCsoftpipe.so.1.0 +%_libdir/libXvMCsoftpipe.so.1.0.0 %files -n libvdpau_nouveau %defattr(-,root,root) %_libdir/vdpau/libvdpau_nouveau.so %_libdir/vdpau/libvdpau_nouveau.so.1 -%_libdir/vdpau/libvdpau_nouveau.so.1.0 +%_libdir/vdpau/libvdpau_nouveau.so.1.0.0 %files -n libvdpau_r300 %defattr(-,root,root) %_libdir/vdpau/libvdpau_r300.so %_libdir/vdpau/libvdpau_r300.so.1 -%_libdir/vdpau/libvdpau_r300.so.1.0 +%_libdir/vdpau/libvdpau_r300.so.1.0.0 %files -n libvdpau_r600 %defattr(-,root,root) %_libdir/vdpau/libvdpau_r600.so %_libdir/vdpau/libvdpau_r600.so.1 -%_libdir/vdpau/libvdpau_r600.so.1.0 +%_libdir/vdpau/libvdpau_r600.so.1.0.0 #%files -n libvdpau_radeonsi #%defattr(-,root,root) @@ -824,7 +845,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_libdir/vdpau/libvdpau_softpipe.so %_libdir/vdpau/libvdpau_softpipe.so.1 -%_libdir/vdpau/libvdpau_softpipe.so.1.0 +%_libdir/vdpau/libvdpau_softpipe.so.1.0.0 %endif %files -n Mesa-libglapi0 diff --git a/MesaLib-9.0.3.tar.bz2 b/MesaLib-9.0.3.tar.bz2 deleted file mode 100644 index bf4b8b7..0000000 --- a/MesaLib-9.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 -size 6137208 diff --git a/MesaLib-9.1.tar.bz2 b/MesaLib-9.1.tar.bz2 new file mode 100644 index 0000000..5792c46 --- /dev/null +++ b/MesaLib-9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b +size 6125400 diff --git a/U_glx-fix-glGetTexLevelParameteriv-for-indirect-render.patch b/U_glx-fix-glGetTexLevelParameteriv-for-indirect-render.patch deleted file mode 100644 index 80795b6..0000000 --- a/U_glx-fix-glGetTexLevelParameteriv-for-indirect-render.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c41ba5bda9bf7b9c818b5a5ca503afedabad57bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Tue, 5 Feb 2013 17:29:20 +0100 -Subject: [PATCH] glx: fix glGetTexLevelParameteriv for indirect rendering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A single element in a GLX reply is contained in the header itself. -The number of elements is denoted in the "n" field of the reply. -If "n" is 1, the length of additional data is 0. -The XXX_data_length() function of xcb does not return the length of -the (optional, n>1) data but the number of elements. - -Fixes http://bugs.freedesktop.org/show_bug.cgi?id=59876 - -Note: This is a candidate for the stable branches. - -Signed-off-by: Stefan Brüns -Signed-off-by: Brian Paul -Reviewed-by: Ian Romanick -(cherry picked from commit 5876a5dbc0a6ec9ae7f44b5e483d38ae0d24a259) ---- - src/mapi/glapi/gen/glX_proto_send.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py -index fbc0dd3..f4d519f 100644 ---- a/src/mapi/glapi/gen/glX_proto_send.py -+++ b/src/mapi/glapi/gen/glX_proto_send.py -@@ -700,7 +700,9 @@ generic_%u_byte( GLint rop, const void * ptr ) - if f.reply_always_array: - print ' (void)memcpy(%s, %s_data(reply), %s_data_length(reply) * sizeof(%s));' % (output.name, xcb_name, xcb_name, output.get_base_type_string()) - else: -- print ' if (%s_data_length(reply) == 0)' % (xcb_name) -+ print ' /* the XXX_data_length() xcb function name is misleading, it returns the number */' -+ print ' /* of elements, not the length of the data part. A single element is embedded. */' -+ print ' if (%s_data_length(reply) == 1)' % (xcb_name) - print ' (void)memcpy(%s, &reply->datum, sizeof(reply->datum));' % (output.name) - print ' else' - print ' (void)memcpy(%s, %s_data(reply), %s_data_length(reply) * sizeof(%s));' % (output.name, xcb_name, xcb_name, output.get_base_type_string()) --- -1.7.10.4 - diff --git a/baselibs.conf b/baselibs.conf index c6930c6..2e9bb55 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,11 +8,13 @@ Mesa-devel requires "Mesa-libGL-devel- = " requires "Mesa-libGLESv1_CM-devel- = " requires "Mesa-libGLESv2-devel- = " + requires "Mesa-libGLESv3-devel- = " requires "Mesa-libIndirectGL1- = " requires "Mesa-libIndirectGL-devel- = " requires "libOSMesa9- = " requires "libOSMesa-devel- = " requires "libgbm-devel-" +# requires "libwayland-egl-devel- = " requires "Mesa-libglapi0- = " requires "Mesa-libglapi-devel- = " obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" @@ -34,6 +36,9 @@ Mesa-libGLESv2-2 Mesa-libGLESv2-devel requires -Mesa-libGLESv2- requires "Mesa-libGLESv2-2- = " +Mesa-libGLESv3-devel +# requires -Mesa-libGLESv3- +# requires "Mesa-libGLESv3-3- = " Mesa-libIndirectGL1 Mesa-libIndirectGL-devel requires -Mesa-libIndirectGL- @@ -46,6 +51,10 @@ libgbm1 libgbm-devel requires -libgbm- requires "libgbm1- = " +libwayland-egl1 +libwayland-egl-devel + requires -libwayland-egl- + requires "libwayland-egl- = " Mesa-libglapi0 Mesa-libglapi-devel requires -Mesa-libglapi- diff --git a/u_mesa-8.0-llvmpipe-shmget.patch b/u_mesa-8.0-llvmpipe-shmget.patch index 3615342..1565c7a 100644 --- a/u_mesa-8.0-llvmpipe-shmget.patch +++ b/u_mesa-8.0-llvmpipe-shmget.patch @@ -1,7 +1,8 @@ -diff -up mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c ---- mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx 2012-04-24 07:37:03.000000000 -0400 -+++ mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c 2012-05-16 13:30:36.596312047 -0400 -@@ -252,8 +252,6 @@ drisw_update_tex_buffer(struct dri_drawa +diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c +index 5247126..3cdb6eb 100644 +--- a/src/gallium/state_trackers/dri/sw/drisw.c ++++ b/src/gallium/state_trackers/dri/sw/drisw.c +@@ -252,8 +252,6 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, struct pipe_transfer *transfer; char *map; int x, y, w, h; @@ -10,7 +11,7 @@ diff -up mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx mesa-2012042 get_drawable_info(dPriv, &x, &y, &w, &h); -@@ -266,14 +264,6 @@ drisw_update_tex_buffer(struct dri_drawa +@@ -265,14 +263,6 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, /* Copy the Drawable content to the mapped texture buffer */ get_image(dPriv, x, y, w, h, map); @@ -23,8 +24,8 @@ diff -up mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx mesa-2012042 - } - pipe_transfer_unmap(pipe, transfer); - pipe_transfer_destroy(pipe, transfer); } + diff -up mesa-20120424/src/glx/drisw_glx.c.jx mesa-20120424/src/glx/drisw_glx.c --- mesa-20120424/src/glx/drisw_glx.c.jx 2012-04-24 07:37:03.000000000 -0400 +++ mesa-20120424/src/glx/drisw_glx.c 2012-05-16 13:29:25.087965268 -0400 diff --git a/u_remove-os-abi-tag.patch b/u_remove-os-abi-tag.patch index 95fd5ef..991db5e 100644 --- a/u_remove-os-abi-tag.patch +++ b/u_remove-os-abi-tag.patch @@ -1,52 +1,72 @@ -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 +From 113326370fcc975af6d6fb5825728995fc8a6c70 Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +Date: Fri, 19 Oct 2012 22:46:21 +0200 +Subject: [PATCH] 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_ +Original Author: Stefan Dirsch + +changed for Mesa 9.1 +--- + src/mapi/glapi/gen/gl_x86-64_asm.py | 2 +- + src/mapi/glapi/gen/gl_x86_asm.py | 2 +- + src/mapi/mapi/entry_x86-64_tls.h | 2 +- + src/mapi/mapi/entry_x86_tls.h | 2 +- + 4 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) + +diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py +index a3548c2..edfc548 100644 +--- a/src/mapi/glapi/gen/gl_x86-64_asm.py ++++ b/src/mapi/glapi/gen/gl_x86-64_asm.py +@@ -181,7 +181,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): - 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 + 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 --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py +index 8b0f6ee..7e8105c 100644 +--- a/src/mapi/glapi/gen/gl_x86_asm.py ++++ b/src/mapi/glapi/gen/gl_x86_asm.py +@@ -189,7 +189,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): + 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 --git a/src/mapi/mapi/entry_x86-64_tls.h b/src/mapi/mapi/entry_x86-64_tls.h +index 72d4125..06d4b3d 100644 +--- a/src/mapi/mapi/entry_x86-64_tls.h ++++ b/src/mapi/mapi/entry_x86-64_tls.h @@ -28,7 +28,7 @@ #include "u_macros.h" -#ifdef __linux__ -+#if 0 ++#ifdef opensuse_dontbuild __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 +diff --git a/src/mapi/mapi/entry_x86_tls.h b/src/mapi/mapi/entry_x86_tls.h +index de91812..a38d9a0 100644 +--- a/src/mapi/mapi/entry_x86_tls.h ++++ b/src/mapi/mapi/entry_x86_tls.h @@ -29,7 +29,7 @@ #include #include "u_macros.h" -#ifdef __linux__ -+#if 0 ++#ifdef opensuse_dontbuild __asm__(".section .note.ABI-tag, \"a\"\n\t" ".p2align 2\n\t" ".long 1f - 0f\n\t" /* name length */ +-- +1.7.10.4 +