mesa: Changes to 'debian-experimental'
debian/changelog | 2
debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff | 85 ++++++++++
debian/patches/series | 1
3 files changed, 88 insertions(+)
New commits:
commit 7156602402e7ed8e6a9488a42330efdb3302ed77
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Jun 16 14:52:05 2014 +0200
Add 01_targets-xa-limit-the-amount-of-exported-symbols.diff
Fixes FTBFS with gcc-4.9
diff --git a/debian/changelog b/debian/changelog
index 4b56a25..1f2e96e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (10.2.1-1) UNRELEASED; urgency=medium
* New upstream release.
- 01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
dropped, upstream
+ * Add 01_targets-xa-limit-the-amount-of-exported-symbols.diff, fixes
+ FTBFS with gcc-4.9.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 13 Jun 2014 17:39:17 +0200
diff --git a/debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff b/debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff
new file mode 100644
index 0000000..ea67e12
--- /dev/null
+++ b/debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff
@@ -0,0 +1,85 @@
+From 891e9aa59c74843f245e21d7c3eea5c0fa01cbcc Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Fri, 2 May 2014 22:02:15 +0100
+Subject: [PATCH mesa] targets/xa: limit the amount of exported symbols
+
+In the presence of LLVM the final library exports every symbol from
+the llvm namespace. Resolve this by using a version script (w/o the
+version/name tag).
+
+Considering that there are only ~35 symbols, explicitly list them
+to minimize the chances of rogue symbols sneaking in.
+
+v2: Conditionally include the version-script.
+
+Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> (v1)
+Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+(cherry picked from commit a75baba2f14a2bcdaf640aeef86d67b41bb2a76f)
+Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+---
+ src/gallium/targets/xa/Makefile.am | 3 +++
+ src/gallium/targets/xa/xa.sym | 38 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+ create mode 100644 src/gallium/targets/xa/xa.sym
+
+diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
+index 2619e57..b91c7f5 100644
+--- a/src/gallium/targets/xa/Makefile.am
++++ b/src/gallium/targets/xa/Makefile.am
+@@ -66,6 +66,9 @@ libxatracker_la_LDFLAGS = \
+ $(GC_SECTIONS) \
+ $(LD_NO_UNDEFINED)
+
++libxatracker_la_LDFLAGS += \
++ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xa/xa.sym
++
+ if HAVE_MESA_LLVM
+ libxatracker_la_LIBADD += $(LLVM_LIBS)
+ libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS)
+diff --git a/src/gallium/targets/xa/xa.sym b/src/gallium/targets/xa/xa.sym
+new file mode 100644
+index 0000000..9c7f422
+--- /dev/null
++++ b/src/gallium/targets/xa/xa.sym
+@@ -0,0 +1,38 @@
++{
++ global:
++ xa_composite_allocation;
++ xa_composite_check_accelerated;
++ xa_composite_done;
++ xa_composite_prepare;
++ xa_composite_rect;
++ xa_context_create;
++ xa_context_default;
++ xa_context_destroy;
++ xa_context_flush;
++ xa_copy;
++ xa_copy_done;
++ xa_copy_prepare;
++ xa_fence_get;
++ xa_fence_wait;
++ xa_fence_destroy;
++ xa_format_check_supported;
++ xa_solid;
++ xa_solid_done;
++ xa_solid_prepare;
++ xa_surface_create;
++ xa_surface_dma;
++ xa_surface_format;
++ xa_surface_from_handle;
++ xa_surface_handle;
++ xa_surface_map;
++ xa_surface_redefine;
++ xa_surface_ref;
++ xa_surface_unmap;
++ xa_surface_unref;
++ xa_tracker_create;
++ xa_tracker_destroy;
++ xa_tracker_version;
++ xa_yuv_planar_blit;
++ local:
++ *;
++};
+--
+2.0.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..06e5a17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_targets-xa-limit-the-amount-of-exported-symbols.diff
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: