mesa: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/patches/118-undefined-symbols.patch |   75 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 35 deletions(-)

New commits:
commit 83d5e8698cfde68d64f160e0371766f9a2103f84
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date:   Wed Oct 3 17:52:29 2012 +0200

    Redo 118-undefined-symbols.patch

diff --git a/debian/patches/118-undefined-symbols.patch 
b/debian/patches/118-undefined-symbols.patch
index f2da556..b201b6e 100644
--- a/debian/patches/118-undefined-symbols.patch
+++ b/debian/patches/118-undefined-symbols.patch
@@ -1,47 +1,52 @@
-From: Anssi Hannula &lt;anssi.hann...@iki.fi&gt;
-Date: Sun, 5 Aug 2012 00:47:06 +0300
-Subject: [PATCH] Fix undefined symbols in libOSMesa and libglapi
-
+From: Matt Turner
+Subject: [PATCH 13/16] build: Link OSMesa with glapi, libdl, libstdc++
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813
+          https://bugs.freedesktop.org/show_bug.cgi?id=53179
 ---
- src/mapi/shared-glapi/Makefile.am   |    2 +-
- src/mesa/Makefile.am                |    2 +-
- src/mesa/drivers/osmesa/Makefile.am |    6 ++++++
- 3 files changed, 8 insertions(+), 2 deletions(-)
+ src/mesa/drivers/osmesa/Makefile.am |   17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
 
---- a/src/mapi/shared-glapi/Makefile.am
-+++ b/src/mapi/shared-glapi/Makefile.am
-@@ -6,7 +6,7 @@
+diff --git a/src/mesa/drivers/osmesa/Makefile.am 
b/src/mesa/drivers/osmesa/Makefile.am
+index 6d087f2..21b8dfb 100644
+--- a/src/mesa/drivers/osmesa/Makefile.am
++++ b/src/mesa/drivers/osmesa/Makefile.am
+@@ -21,25 +21,32 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ # IN THE SOFTWARE.
  
- lib_LTLIBRARIES = libglapi.la
- libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
--libglapi_la_LDFLAGS = -no-undefined
-+libglapi_la_LDFLAGS = -no-undefined -pthread
+-# Hack to make some of the non-automake variables work.
+-TOP=$(top_builddir)
+-
+-AM_CFLAGS = \
++AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa/ \
+       -I$(top_builddir)/src/mapi \
+       $(DEFINES) \
+       $(API_DEFINES)
++AM_CFLAGS = $(PTHREAD_CFLAGS)
++AM_CXXFLAGS = $(PTHREAD_CFLAGS)
  
- include $(GLAPI)/gen/glapi_gen.mk
- glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
---- a/src/mesa/Makefile.am
-+++ b/src/mesa/Makefile.am
-@@ -124,7 +124,7 @@
-       $(MESA_CXX_FILES) \
-         $(MESA_ASM_FILES_FOR_ARCH)
+ lib_LTLIBRARIES = lib@OSMESA_LIB@.la
  
--libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
-+libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la -ldl
- libmesa_la_LDFLAGS =
++nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
+ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
  
- libmesagallium_la_SOURCES = \
---- a/src/mesa/drivers/osmesa/Makefile.am
-+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -40,6 +40,12 @@
- lib@OSMESA_LIB@_la_LIBADD = \
-       $(top_builddir)/src/mesa/libmesa.la \
-       $(top_builddir)/src/mapi/glapi/libglapi.la
-+lib@OSMESA_LIB@_la_LIBTOOLFLAGS = --tag=CXX
+ lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
 +
 +if HAVE_SHARED_GLAPI
-+lib@OSMESA_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR)
-+lib@OSMESA_LIB@_la_LIBADD += -lglapi
++GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
++else
++GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
 +endif
+ lib@OSMESA_LIB@_la_LIBADD = \
+       $(top_builddir)/src/mesa/libmesa.la \
+-      $(top_builddir)/src/mapi/glapi/libglapi.la
++      $(GLAPI_LIB) \
++      $(OSMESA_LIB_DEPS)
  
  if BUILD_SHARED
  # Provide compatibility with scripts for the old Mesa build system for
+-- 
+1.7.8.6


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tjrfo-0007dm...@vasks.debian.org