debian/changelog | 6 ++++ debian/patches/fix-osmesa-exports.diff | 41 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 48 insertions(+)
New commits: commit a08ee29ecf8a292c01adcf5edeea82872464f67e Author: Maarten Lankhorst <[email protected]> Date: Tue Jul 16 11:31:34 2013 +0200 Add fix-os-mesa-exports.diff from upstream. (LP: #1066599) diff --git a/debian/changelog b/debian/changelog index b883cdd..9ff3ff3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (9.1.4-0ubuntu3) saucy; urgency=low + + * Add fix-os-mesa-exports.diff from upstream. (LP: #1066599) + + -- Maarten Lankhorst <[email protected]> Tue, 16 Jul 2013 11:29:32 +0200 + mesa (9.1.4-0ubuntu2) saucy; urgency=low * control, rules: Again, add llvm-3.2-dev to build-depends for diff --git a/debian/patches/fix-osmesa-exports.diff b/debian/patches/fix-osmesa-exports.diff new file mode 100644 index 0000000..f5be2ea --- /dev/null +++ b/debian/patches/fix-osmesa-exports.diff @@ -0,0 +1,41 @@ +From e790e2489535538ac0a7d1486ca6bb1f002c7700 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst <[email protected]> +Date: Tue, 16 Jul 2013 10:18:38 +0200 +Subject: [PATCH] osmesa: link against static libglapi library too to get the + gl exports + +This should fix missing symbols in a osmesa built against shared glapi +osmesa build. All opengl exports were missing that are defined in the +static glapi, so link against both to fix this. + +This is a candidate for the stable series. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824 +Signed-off-by: Maarten Lankhorst <[email protected]> +(cherry picked from commit b20b2b6dc8b72fc099afb9690f61596e1d0b0902) +--- + src/mesa/drivers/osmesa/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am +index 2503401..4bde617 100644 +--- a/src/mesa/drivers/osmesa/Makefile.am ++++ b/src/mesa/drivers/osmesa/Makefile.am +@@ -40,11 +40,11 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c + + lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -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 ++if HAVE_SHARED_GLAPI ++GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la + endif ++ + lib@OSMESA_LIB@_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesa.la \ + $(GLAPI_LIB) \ +-- +1.8.3.2 + diff --git a/debian/patches/series b/debian/patches/series index 47f332f..090799f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ #11-hurd-ftbfs-again.diff # Ubuntu patches. +fix-osmesa-exports.diff 101_ubuntu_hidden_glname.patch 117-static-gallium.patch 118-dricore-gallium.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
