debian/patches/118-dricore-gallium.patch | 220 ++++++++++++++++++-------------
1 file changed, 128 insertions(+), 92 deletions(-)
New commits:
commit f881c58411245ce76f0cf34ef6454548e3e7e2a5
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Feb 7 18:05:27 2013 +0100
refresh 118-dricore-gallium.patch
even better, build libmesagallium dynamically!
diff --git a/debian/patches/118-dricore-gallium.patch
b/debian/patches/118-dricore-gallium.patch
index dfaf33c..92d04d0 100644
--- a/debian/patches/118-dricore-gallium.patch
+++ b/debian/patches/118-dricore-gallium.patch
@@ -1,85 +1,137 @@
---- 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) $(GALLIUM_AUXILIARIES)
- 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/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/gallium/targets/Makefile.dri
-+++ b/src/gallium/targets/Makefile.dri
-@@ -11,7 +11,6 @@
+--- a/src/mesa/libdricore/Makefile.am
++++ b/src/mesa/libdricore/Makefile.am
+@@ -65,8 +65,10 @@
+ -I$(top_srcdir)/src/mesa/sparc
endif
- MESA_MODULES = \
-- $(TOP)/src/mesa/libmesagallium.a \
- $(GALLIUM_AUXILIARIES)
++lib_LTLIBRARIES =
++
+ if HAVE_DRI
+-lib_LTLIBRARIES = libdricore@VERSION@.la
++lib_LTLIBRARIES += libdricore@VERSION@.la
- 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@VERSION@.la
+ # 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.
+@@ -76,6 +78,18 @@
+ ln -sf libdricore@VERSION@.so.1
$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
+ endif
+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_CFLAGS = $(LLVM_CFLAGS)
++libmesagallium@VERSION@_la_CXXFLAGS = $(LLVM_CXXFLAGS)
+libmesagallium@VERSION@_la_LIBADD = libdricore@VERSION@.la
+libmesagallium@VERSION@_la_LDFLAGS =
+
+if HAVE_GALLIUM
-+noinst_LTLIBRARIES += libmesagallium@VERSION@.la
++lib_LTLIBRARIES += libmesagallium@VERSION@.la
+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@VERSION@.la
++
+ CLEANFILES = \
+ $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \
+ $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
+--- a/configure.ac
++++ b/configure.ac
+@@ -928,6 +928,7 @@
+ AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+ DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
++MESAGALLIUM_LIBS="\$(top_builddir)/src/mesa/libdricore/libmesagallium${VERSION}.la"
+
+ AC_SUBST([HAVE_XF86VIDMODE])
+
+--- a/src/gallium/targets/dri-i915/Makefile.am
++++ b/src/gallium/targets/dri-i915/Makefile.am
+@@ -49,7 +49,7 @@
+ i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ i915_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
+--- a/src/gallium/targets/dri-nouveau/Makefile.am
++++ b/src/gallium/targets/dri-nouveau/Makefile.am
+@@ -48,7 +48,7 @@
+ nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ nouveau_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
+--- a/src/gallium/targets/dri-r300/Makefile.am
++++ b/src/gallium/targets/dri-r300/Makefile.am
+@@ -49,7 +49,7 @@
+ r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ r300_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
+--- a/src/gallium/targets/dri-r600/Makefile.am
++++ b/src/gallium/targets/dri-r600/Makefile.am
+@@ -48,7 +48,7 @@
+ r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ r600_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/drivers/r600/libr600.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+--- a/src/gallium/targets/dri-radeonsi/Makefile.am
++++ b/src/gallium/targets/dri-radeonsi/Makefile.am
+@@ -49,7 +49,7 @@
+ radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ radeonsi_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+--- a/src/gallium/targets/dri-swrast/Makefile.am
++++ b/src/gallium/targets/dri-swrast/Makefile.am
+@@ -49,7 +49,7 @@
+ swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ swrast_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
+ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
+--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
++++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
+@@ -48,7 +48,7 @@
+ vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+ vmwgfx_dri_la_LIBADD = \
+- $(top_builddir)/src/mesa/libmesagallium.la \
++ $(MESAGALLIUM_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+--- a/src/gallium/targets/egl-static/Makefile.am
++++ b/src/gallium/targets/egl-static/Makefile.am
+@@ -104,7 +104,7 @@
+ $(API_DEFINES)
+
+ egl_gallium_la_LIBADD += \
+- $(top_builddir)/src/mesa/libmesagallium.la
++ $(MESAGALLIUM_LIBS)
+ # make st/mesa built-in when there is a single glapi provider
+ if HAVE_SHARED_GLAPI
+ egl_gallium_la_LIBADD += \
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
-@@ -89,9 +89,6 @@
+@@ -75,9 +75,6 @@
else
check_LTLIBRARIES = libmesa.la
endif
@@ -89,35 +141,19 @@
SRCDIR = $(top_srcdir)/src/mesa/
BUILDDIR = $(top_builddir)/src/mesa/
-@@ -131,21 +128,6 @@
- libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+@@ -119,15 +116,6 @@
+ $()
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 =
+-libmesagallium_la_LIBADD = \
+- $(top_builddir)/src/glsl/libglsl.la \
+- $(top_builddir)/src/mesa/program/libprogram.la \
+- $()
-
--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@VERSION@.la
- if HAVE_SHARED_GALLIUM
- AM_CFLAGS += -shared
- AM_CXXFLAGS += -shared
+ pkgconfig_DATA = gl.pc
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3uuw-000265...@vasks.debian.org
