mesa: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/120-hide-x86sse.patch | 29 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 37 insertions(+)
New commits:
commit 20aa7b21d71e231f0806662250db96c7b6aea1ab
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Apr 18 12:28:13 2013 +0200
Hide x86sse symbols on i386, preventing conflicts. (LP: #1170074)
120-hide-x86sse.patch
diff --git a/debian/changelog b/debian/changelog
index 8a71225..e2216ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (9.1.1-0ubuntu3) raring; urgency=low
+
+ * Hide x86sse symbols on i386, preventing conflicts. (LP: #1170074)
+ - 120-hide-x86sse.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 18 Apr 2013 12:27:32 +0200
+
mesa (9.1.1-0ubuntu2) raring; urgency=low
* control, rules: Add llvm-3.2-dev to build-depends for powerpc, enable
diff --git a/debian/patches/120-hide-x86sse.patch b/debian/patches/120-hide-x86sse.patch
new file mode 100644
index 0000000..0bf3c65
--- /dev/null
+++ b/debian/patches/120-hide-x86sse.patch
@@ -0,0 +1,29 @@
+See LP #1170074
+
+The refresh of linking libgallium against dricore patch caused a conflict.
+x86sse was taken from an earlier gallium implementation, but is no longer compatible.
+Fortunately these symbols are not needed outside libdricore, so the entire
+implementation can be hidden, forcing it to use the correct implementation in libgallium
+and in libdricore.
+
+diff --git a/src/mesa/x86/rtasm/x86sse.h b/src/mesa/x86/rtasm/x86sse.h
+index f6282f5..35d8906 100644
+--- a/src/mesa/x86/rtasm/x86sse.h
++++ b/src/mesa/x86/rtasm/x86sse.h
+@@ -4,6 +4,8 @@
+
+ #if defined(__i386__) || defined(__386__)
+
++#pragma GCC visibility push(internal)
++
+ /* It is up to the caller to ensure that instructions issued are
+ * suitable for the host cpu. There are no checks made in this module
+ * for mmx/sse/sse2 support on the cpu.
+@@ -252,5 +254,7 @@ void x87_fucom( struct x86_function *p, struct x86_reg arg );
+ */
+ struct x86_reg x86_fn_arg( struct x86_function *p, unsigned arg );
+
++#pragma GCC visibility pop
++
+ #endif
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index ede7283..6d221d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@
117-static-gallium.patch
118-dricore-gallium.patch
119-libllvmradeon-link.patch
+120-hide-x86sse.patch
0001-nv50-fix-3D-render-target-setup.patch
0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
Reply to: