mesa: Changes to 'ubuntu-quantal'
debian/changelog | 8 +++
debian/libgl1-mesa-dri.install.in | 2
debian/patches/118-dricore-gallium.patch | 82 +++++++++++++++++++++++++++++++
debian/patches/series | 3 -
debian/rules | 2
5 files changed, 94 insertions(+), 3 deletions(-)
New commits:
commit 429bf666a8952f129f34cf0be01a4433432b9190
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jan 22 11:55:14 2013 +0100
Decrease size of mesa's libgl1-mesa-dri again
* Decrease size of mesa's libgl1-mesa-dri again
- re-enable 117-static-gallium.patch
- add 118-dricore-gallium.patch to link against libdricore again
diff --git a/debian/changelog b/debian/changelog
index 7f4cb0f..1d0544e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (9.0-0ubuntu1.1) UNRELEASED; urgency=low
+
+ * Decrease size of mesa's libgl1-mesa-dri again
+ - re-enable 117-static-gallium.patch
+ - add 118-dricore-gallium.patch to link against libdricore again
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 22 Jan 2013 11:54:09 +0100
+
mesa (9.0-0ubuntu1) quantal; urgency=low
* Merge from unreleased debian git.
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 9e98190..3de588a 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,3 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* usr/lib/${DEB_HOST_MULTIARCH}/
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/patches/118-dricore-gallium.patch b/debian/patches/118-dricore-gallium.patch
new file mode 100644
index 0000000..088d459
--- /dev/null
+++ b/debian/patches/118-dricore-gallium.patch
@@ -0,0 +1,82 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -929,6 +929,7 @@
+ AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+ DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
++GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so"
+
+ AC_SUBST([HAVE_XF86VIDMODE])
+
+--- a/src/gallium/targets/egl-static/Makefile
++++ b/src/gallium/targets/egl-static/Makefile
+@@ -72,7 +72,7 @@
+ egl_CPPFLAGS += -I$(TOP)/src/mesa $(API_DEFINES)
+ # make st/mesa built-in when there is a single glapi provider
+ ifeq ($(SHARED_GLAPI),1)
+-egl_LIBS += $(TOP)/src/mesa/libmesagallium.a
++egl_LIBS += $(GALLIUM_DRI_LIB_DEPS)
+ egl_SYS += -lm -lpthread $(DLOPEN_LIBS) -l$(GLAPI_LIB)
+ else
+ egl_CPPFLAGS += -D_EGL_EXTERNAL_GL=1
+@@ -169,7 +169,7 @@
+
+ # st_GL, built only when shared glapi is not enabled
+ st_GL_CPPFLAGS := -I $(TOP)/src/mesa -I$(TOP)/src/gallium/include
+-st_GL_LIBS := $(TOP)/src/mesa/libmesagallium.a $(GALLIUM_AUXILIARIES)
++st_GL_LIBS := $(GALLIUM_DRI_LIB_DEPS) $(GALLIUM_AUXILIARIES)
+ st_GL_SYS := -lm -lpthread $(DLOPEN_LIBS)
+
+ # LLVM
+--- a/src/mesa/libdricore/Makefile.am
++++ b/src/mesa/libdricore/Makefile.am
+@@ -45,6 +45,9 @@
+ $(LIBGLSL_CXX_FILES) \
+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+ $(top_builddir)/src/glsl/builtin_function.cpp
++if HAVE_GALLIUM
++libdricore@VERSION@_la_SOURCES += $(STATETRACKER_FILES) $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp
++endif
+ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+ libdricore@VERSION@_la_LIBADD = libdricore-asm.la
+
+--- a/src/gallium/targets/libgl-xlib/Makefile
++++ b/src/gallium/targets/libgl-xlib/Makefile
+@@ -46,7 +46,6 @@
+ $(TOP)/src/gallium/drivers/rbug/librbug.a \
+ $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
+ $(TOP)/src/mapi/glapi/libglapi.a \
+- $(TOP)/src/mesa/libmesagallium.a \
+ $(GALLIUM_AUXILIARIES) \
+
+
+--- a/src/mesa/Makefile.am
++++ b/src/mesa/Makefile.am
+@@ -90,7 +90,7 @@
+ check_LTLIBRARIES = libmesa.la
+ endif
+ if HAVE_GALLIUM
+-noinst_LTLIBRARIES += libmesagallium.la
++#noinst_LTLIBRARIES += libmesagallium.la
+ endif
+
+ SRCDIR = $(top_srcdir)/src/mesa/
+@@ -143,7 +143,7 @@
+ # Provide compatibility with scripts for the old Mesa build system for
+ # a while by putting a link to the library in the current directory.
+ all-local: $(noinst_LTLIBRARIES)
+- ln -f .libs/libmesagallium.a .
++# ln -f .libs/libmesagallium.a .
+ endif
+
+ CLEANFILES += libmesagallium.a
+--- a/src/gallium/targets/Makefile.dri
++++ b/src/gallium/targets/Makefile.dri
+@@ -11,7 +11,6 @@
+ endif
+
+ MESA_MODULES = \
+- $(TOP)/src/mesa/libmesagallium.a \
+ $(GALLIUM_AUXILIARIES)
+
+ COMMON_GALLIUM_SOURCES = \
diff --git a/debian/patches/series b/debian/patches/series
index 1d3510c..5ca34f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,5 @@
# Ubuntu patches.
100_no_abi_tag.patch
101_ubuntu_hidden_glname.patch
-#117-static-gallium.patch
+117-static-gallium.patch
+118-dricore-gallium.patch
diff --git a/debian/rules b/debian/rules
index e059404..70fdb14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -235,7 +235,7 @@ binary-arch: install
# No need for these .so, they're just convenience libraries:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
-# rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so
+ rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
Reply to: