debian/changelog | 4 +++- src/mesa/drivers/osmesa/Makefile.am | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit b0a2e5f50bdd5d484b8f3e92657cd37b86342247 Author: Andreas Boll <[email protected]> Date: Sat Jul 20 20:14:50 2013 +0200 debian/changelog: Add changelog entry diff --git a/debian/changelog b/debian/changelog index c2c4742..66d4421 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mesa (9.1.5-1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release. + * Cherry-pick commit b20b2b6 (osmesa: link against static libglapi + library too to get the gl exports) from upstream (Closes: #717410). -- Andreas Boll <[email protected]> Thu, 18 Jul 2013 18:32:24 +0200 commit 7e011c4cf404718cf8b5e98a9e2a611eb4cd0d71 Author: Maarten Lankhorst <[email protected]> Date: Tue Jul 16 10:18:38 2013 +0200 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) 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) \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
