mesa: Changes to 'ubuntu'
debian/changelog | 5 --
debian/patches/118-undefined-symbols.patch | 52 -----------------------------
debian/patches/series | 1
3 files changed, 1 insertion(+), 57 deletions(-)
New commits:
commit d292107396c905695723ee5c30789d040242c732
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Oct 4 13:09:33 2012 +0300
Drop patch 118, obsolete
diff --git a/debian/changelog b/debian/changelog
index 6ee8b3f..567394f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,7 @@
mesa (9.0~git20121004.b2048c5e-0ubuntu1) UNRELEASED; urgency=low
- [ Timo Aaltonen ]
* Merge from unreleased debian git.
-
- [ Maarten Lankhorst ]
- * Replace 118-undefined-symbols.patch with a patch from upstream.
+ * Drop patch 118, obsolete.
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 03 Oct 2012 18:23:24 +0300
diff --git a/debian/patches/118-undefined-symbols.patch b/debian/patches/118-undefined-symbols.patch
deleted file mode 100644
index b201b6e..0000000
--- a/debian/patches/118-undefined-symbols.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/mesa/drivers/osmesa/Makefile.am | 17 ++++++++++++-----
- 1 files changed, 12 insertions(+), 5 deletions(-)
-
-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.
-
--# 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)
-
- lib_LTLIBRARIES = lib@OSMESA_LIB@.la
-
-+nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
- lib@OSMESA_LIB@_la_SOURCES = osmesa.c
-
- lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
-+
-+if HAVE_SHARED_GLAPI
-+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
diff --git a/debian/patches/series b/debian/patches/series
index 084064c..1d3510c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@
100_no_abi_tag.patch
101_ubuntu_hidden_glname.patch
#117-static-gallium.patch
-118-undefined-symbols.patch
Reply to: