debian/changelog | 8 ++ debian/libgl1-mesa-dri.install.in | 2 debian/patches/118-dricore-gallium.patch | 123 +++++++++++++++++++++++++++++++ debian/patches/series | 3 debian/rules | 2 5 files changed, 135 insertions(+), 3 deletions(-)
New commits: commit 737364ff24da38c06089f45898d917330d6c16a5 Author: Maarten Lankhorst <[email protected]> Date: Wed Jan 23 13:38:05 2013 +0100 move changelog upwards diff --git a/debian/changelog b/debian/changelog index f789494..2bd0cf1 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 <[email protected]> Tue, 22 Jan 2013 11:54:09 +0100 + mesa (9.0.1-0ubuntu1) raring; urgency=low * Merge from unreleased debian git. @@ -63,14 +71,6 @@ mesa (9.0.1-1) UNRELEASED; urgency=low -- Julien Cristau <[email protected]> Fri, 03 Aug 2012 23:17:16 +0200 -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 <[email protected]> Tue, 22 Jan 2013 11:54:09 +0100 - mesa (9.0-0ubuntu2) raring; urgency=low * patches/118-wayland-0.99.diff: Upstream port to wayland 0.99 API commit 3c798096fd4ea90642bf8bea4c942b8c29831f2b Author: Maarten Lankhorst <[email protected]> Date: Tue Jan 22 17:09:52 2013 +0100 rework patch to fix linking failures diff --git a/debian/patches/118-dricore-gallium.patch b/debian/patches/118-dricore-gallium.patch index 088d459..dfaf33c 100644 --- a/debian/patches/118-dricore-gallium.patch +++ b/debian/patches/118-dricore-gallium.patch @@ -15,7 +15,7 @@ # 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_LIBS += $(GALLIUM_DRI_LIB_DEPS) $(GALLIUM_AUXILIARIES) egl_SYS += -lm -lpthread $(DLOPEN_LIBS) -l$(GLAPI_LIB) else egl_CPPFLAGS += -D_EGL_EXTERNAL_GL=1 @@ -28,18 +28,6 @@ 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 @@ @@ -50,26 +38,6 @@ $(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 @@ @@ -80,3 +48,76 @@ $(GALLIUM_AUXILIARIES) COMMON_GALLIUM_SOURCES = \ +--- a/src/mesa/libdricore/Makefile.am ++++ b/src/mesa/libdricore/Makefile.am +@@ -46,7 +46,7 @@ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(top_builddir)/src/glsl/builtin_function.cpp + libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 +-libdricore@VERSION@_la_LIBADD = libdricore-asm.la ++libdricore@VERSION@_la_LIBADD = libdricore-asm.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la + + # This is separated from libdricore to avoid conflics in object + # outputs between main/clip.c and sparc/clip.c. The documented way to +@@ -81,6 +81,17 @@ + noinst_LTLIBRARIES = libdricore-asm.la + lib_LTLIBRARIES = libdricore@[email protected] + ++libmesagallium@VERSION@_la_SOURCES = \ ++ $(STATETRACKER_FILES) $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp ++libmesagallium@VERSION@_la_CFLAGS = $(LLVM_CFLAGS) $(CFLAGS_NOVISIBILITY) ++libmesagallium@VERSION@_la_CXXFLAGS = $(LLVM_CXXFLAGS) $(CXXFLAGS_NOVISIBILITY) ++libmesagallium@VERSION@_la_LIBADD = libdricore@[email protected] ++libmesagallium@VERSION@_la_LDFLAGS = ++ ++if HAVE_GALLIUM ++noinst_LTLIBRARIES += libmesagallium@[email protected] ++endif ++ + # Provide compatibility with scripts for the old Mesa build system for + # a while by putting a link to the driver into /lib of the build tree. + all-local: libdricore@[email protected] +--- a/src/mesa/Makefile.am ++++ b/src/mesa/Makefile.am +@@ -89,9 +89,6 @@ + else + check_LTLIBRARIES = libmesa.la + endif +-if HAVE_GALLIUM +-noinst_LTLIBRARIES += libmesagallium.la +-endif + + SRCDIR = $(top_srcdir)/src/mesa/ + BUILDDIR = $(top_builddir)/src/mesa/ +@@ -131,21 +128,6 @@ + libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la + libmesa_la_LDFLAGS = + +-libmesagallium_la_SOURCES = \ +- $(MESA_GALLIUM_FILES) \ +- $(MESA_GALLIUM_CXX_FILES) \ +- $(MESA_ASM_FILES_FOR_ARCH) +- +-libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la +-libmesagallium_la_LDFLAGS = +- +-if HAVE_GALLIUM +-# 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 . +-endif +- + CLEANFILES += libmesagallium.a + + pkgconfigdir = $(libdir)/pkgconfig +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -25,6 +25,7 @@ + lib_LTLIBRARIES = libgallium.la + libgallium_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) + libgallium_la_LDFLAGS = -no-undefined @LLVM_LDFLAGS@ @LLVM_LIBS@ ++libgallium_la_LIBADD = $(top_builddir)/src/mesa/libdricore/libmesagallium@[email protected] + if HAVE_SHARED_GALLIUM + AM_CFLAGS += -shared + AM_CXXFLAGS += -shared commit 494c31b0a62f326ea27929c72e95e335b803eee0 Author: Maarten Lankhorst <[email protected]> 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 553fa1b..f789494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,14 @@ mesa (9.0.1-1) UNRELEASED; urgency=low -- Julien Cristau <[email protected]> Fri, 03 Aug 2012 23:17:16 +0200 +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 <[email protected]> Tue, 22 Jan 2013 11:54:09 +0100 + mesa (9.0-0ubuntu2) raring; urgency=low * patches/118-wayland-0.99.diff: Upstream port to wayland 0.99 API 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 '{}' ';' -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
