diff -u mesa-9.0~git20120917.7cfd42ce/debian/changelog mesa-9.0~git20120917.7cfd42ce/debian/changelog --- mesa-9.0~git20120917.7cfd42ce/debian/changelog +++ mesa-9.0~git20120917.7cfd42ce/debian/changelog @@ -1,3 +1,10 @@ +mesa (9.0~git20120917.7cfd42ce-0ubuntu3) quantal; urgency=low + + * Add 118-undefined-symbols.patch, fixing libglapi and libosmesa + missing symbols. (LP: #1053088) + + -- Timo Aaltonen Thu, 20 Sep 2012 13:25:46 +0300 + mesa (9.0~git20120917.7cfd42ce-0ubuntu2) quantal; urgency=low * Add Recommends on libtxc-dxtn-s2tc0, required by Bastion, Psychonauts, diff -u mesa-9.0~git20120917.7cfd42ce/debian/patches/series mesa-9.0~git20120917.7cfd42ce/debian/patches/series --- mesa-9.0~git20120917.7cfd42ce/debian/patches/series +++ mesa-9.0~git20120917.7cfd42ce/debian/patches/series @@ -15,0 +16 @@ +118-undefined-symbols.patch only in patch2: unchanged: --- mesa-9.0~git20120917.7cfd42ce.orig/debian/patches/118-undefined-symbols.patch +++ mesa-9.0~git20120917.7cfd42ce/debian/patches/118-undefined-symbols.patch @@ -0,0 +1,151 @@ + + + +mesa.git - mesa + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/mesa-undefined-symbols.patch
blob: 5acc91f586eb63d7b8d7be4316da7ee4ec56451f (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+
From 6a934ff6638352b2c28cf5a7452fed2f32853c17 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi.hannula@iki.fi>
+Date: Sun, 5 Aug 2012 00:47:06 +0300
+Subject: [PATCH] Fix undefined symbols in libOSMesa and libglapi
+
+---
+ 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(-)
+
+--- a/src/mapi/shared-glapi/Makefile.am
++++ b/src/mapi/shared-glapi/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ lib_LTLIBRARIES = libglapi.la
+ libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
+-libglapi_la_LDFLAGS = -no-undefined
++libglapi_la_LDFLAGS = -no-undefined -pthread
+ 
+ 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)
+ 
+-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
++libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la -ldl
+ libmesa_la_LDFLAGS =
+ 
+ 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
++
++if HAVE_SHARED_GLAPI
++lib@OSMESA_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR)
++lib@OSMESA_LIB@_la_LIBADD += -lglapi
++endif
+ 
+ if BUILD_SHARED
+ # Provide compatibility with scripts for the old Mesa build system for