debian/changelog | 3 debian/patches/116_use_shared_galliumcore.diff | 165 ++++++++++++++----------- 2 files changed, 97 insertions(+), 71 deletions(-)
New commits: commit 18684ec4e72d01d8a4bf675b121a1d3f937c62e7 Author: Robert Hooker <[email protected]> Date: Mon Jan 30 15:52:45 2012 -0500 Fix up 116_use_shared_galliumcore.diff to work. diff --git a/debian/changelog b/debian/changelog index ae72071..d305fe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,9 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low [ Robert Hooker ] * Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental, no longer shipped upstream. + * Fix up 116_use_shared_galliumcore.diff so it works. - -- Robert Hooker <[email protected]> Tue, 24 Jan 2012 09:54:54 -0500 + -- Robert Hooker <[email protected]> Mon, 30 Jan 2012 15:52:13 -0500 mesa (8.0~rc1-1) UNRELEASED; urgency=low diff --git a/debian/patches/116_use_shared_galliumcore.diff b/debian/patches/116_use_shared_galliumcore.diff index e202208..450ac2c 100644 --- a/debian/patches/116_use_shared_galliumcore.diff +++ b/debian/patches/116_use_shared_galliumcore.diff @@ -1,8 +1,8 @@ -Index: mesa/bin/mklib -=================================================================== ---- mesa.orig/bin/mklib 2012-01-24 15:03:01.709901821 +0200 -+++ mesa/bin/mklib 2012-01-24 15:06:14.027663852 +0200 -@@ -147,6 +147,7 @@ +diff --git a/bin/mklib b/bin/mklib +index 2c7ed38..14bca63 100755 +--- a/bin/mklib ++++ b/bin/mklib +@@ -147,6 +147,7 @@ ARCHOPT="" NOPREFIX=0 EXPORTS="" ID="" @@ -10,7 +10,7 @@ Index: mesa/bin/mklib # # Parse arguments -@@ -191,6 +192,18 @@ +@@ -191,6 +192,18 @@ do -R*) DEPS="$DEPS $1" ;; @@ -29,7 +29,7 @@ Index: mesa/bin/mklib -Wl*) DEPS="$DEPS $1" ;; -@@ -271,6 +284,10 @@ +@@ -271,6 +284,10 @@ if [ $STATIC = 1 ]; then OBJECTS=$NEWOBJECTS fi @@ -40,7 +40,7 @@ Index: mesa/bin/mklib # # Error checking -@@ -284,7 +301,6 @@ +@@ -284,7 +301,6 @@ if [ "x${OBJECTS}" = "x" ] ; then exit 1 fi @@ -48,7 +48,7 @@ Index: mesa/bin/mklib # # Debugging info # -@@ -343,6 +359,7 @@ +@@ -343,6 +359,7 @@ case $ARCH in fi rm -f ${LIBNAME} @@ -56,33 +56,69 @@ Index: mesa/bin/mklib # make lib ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} # finish up -Index: mesa/configure.ac -=================================================================== ---- mesa.orig/configure.ac 2012-01-24 15:06:14.019663612 +0200 -+++ mesa/configure.ac 2012-01-24 15:06:14.027663852 +0200 -@@ -1092,7 +1092,8 @@ - DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so' - DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so' - DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl' -- DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl' +diff --git a/configs/autoconf.in b/configs/autoconf.in +index 37b7ea5..b479f2b 100644 +--- a/configs/autoconf.in ++++ b/configs/autoconf.in +@@ -121,6 +121,7 @@ DRI_DIRS = @DRI_DIRS@ + DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@ + DRICORE_LIBS = @DRICORE_LIBS@ + DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@ ++GALLIUM_LIB_DEPS = @GALLIUM_LIB_DEPS@ + EGL_PLATFORMS = @EGL_PLATFORMS@ + EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ + +diff --git a/configure.ac b/configure.ac +index 0ea264e..684f5b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1036,6 +1036,41 @@ AC_SUBST([GLESv2_PC_LIB_PRIV]) + GLAPI_LIB_DEPS="-lpthread" + AC_SUBST([GLAPI_LIB_DEPS]) + ++dnl Setup default DRI CFLAGS ++DRI_CFLAGS='$(CFLAGS)' ++DRI_CXXFLAGS='$(CXXFLAGS)' ++DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a' ++MESA_MODULES='$(TOP)/src/mesa/libmesa.a' ++ ++AC_ARG_ENABLE([shared-dricore], ++ [AS_HELP_STRING([--enable-shared-dricore], ++ [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])], ++ [enable_dricore="$enableval"], ++ [enable_dricore=no]) ++if test "$mesa_driver" = dri ; then ++ if test "$enable_dricore" = yes ; then ++ if test "$GCC$GXX" != yesyes ; then ++ AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling. Disabling shared dricore]) ++ enable_dricore=no ++ else ++ DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so' ++ DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so' ++ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl' + DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lgallium -ldricore -lglsl' + GALLIUM_LIB_DEPS='-lgallium' - DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE' - DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE' - MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)' -@@ -1102,6 +1103,7 @@ - AC_SUBST([DRICORE_LIBS]) - AC_SUBST([DRICORE_GLSL_LIBS]) - AC_SUBST([DRICORE_LIB_DEPS]) ++ DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE' ++ DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE' ++ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)' ++ fi ++ fi ++fi ++AC_SUBST([DRICORE_LIBS]) ++AC_SUBST([DRICORE_GLSL_LIBS]) ++AC_SUBST([DRICORE_LIB_DEPS]) +AC_SUBST([GALLIUM_LIB_DEPS]) - AC_SUBST([DRI_CXXFLAGS]) - AC_SUBST([DRI_CFLAGS]) - AC_SUBST([MESA_MODULES]) -Index: mesa/src/gallium/Makefile.template -=================================================================== ---- mesa.orig/src/gallium/Makefile.template 2012-01-24 15:03:01.745902899 +0200 -+++ mesa/src/gallium/Makefile.template 2012-01-24 15:06:14.027663852 +0200 -@@ -30,7 +30,7 @@ ++AC_SUBST([DRI_CXXFLAGS]) ++AC_SUBST([DRI_CFLAGS]) ++AC_SUBST([MESA_MODULES]) + + dnl Setup default DRI CFLAGS + DRI_CFLAGS='$(CFLAGS)' +diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template +index 036c119..3f01d08 100644 +--- a/src/gallium/Makefile.template ++++ b/src/gallium/Makefile.template +@@ -30,7 +30,7 @@ endif ##### TARGETS ##### @@ -91,7 +127,7 @@ Index: mesa/src/gallium/Makefile.template lib$(LIBNAME).a: $(OBJECTS) $(EXTRA_OBJECTS) Makefile $(TOP)/src/gallium/Makefile.template $(MKLIB) -o $(LIBNAME) -static $(OBJECTS) $(EXTRA_OBJECTS) -@@ -58,16 +58,16 @@ +@@ -58,16 +58,16 @@ install: ##### RULES ##### %.s: %.c @@ -112,11 +148,11 @@ Index: mesa/src/gallium/Makefile.template sinclude depend -Index: mesa/src/gallium/auxiliary/Makefile -=================================================================== ---- mesa.orig/src/gallium/auxiliary/Makefile 2012-01-24 15:03:01.733902540 +0200 -+++ mesa/src/gallium/auxiliary/Makefile 2012-01-24 15:06:14.027663852 +0200 -@@ -18,6 +18,14 @@ +diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile +index 7dae7bc..9a08acb 100644 +--- a/src/gallium/auxiliary/Makefile ++++ b/src/gallium/auxiliary/Makefile +@@ -213,6 +213,14 @@ endif include ../Makefile.template @@ -131,18 +167,18 @@ Index: mesa/src/gallium/auxiliary/Makefile indices/u_indices_gen.c: indices/u_indices_gen.py $(PYTHON2) $< > $@ -@@ -33,4 +41,6 @@ +@@ -228,4 +236,6 @@ util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_forma util/u_half.c: util/u_half.py $(PYTHON2) util/u_half.py > $@ + +default:: $(TOP)/$(LIB_DIR)/libgallium.so # DO NOT DELETE -Index: mesa/src/gallium/targets/Makefile.dri -=================================================================== ---- mesa.orig/src/gallium/targets/Makefile.dri 2012-01-24 15:03:01.741902780 +0200 -+++ mesa/src/gallium/targets/Makefile.dri 2012-01-24 15:06:14.027663852 +0200 -@@ -7,7 +7,6 @@ +diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri +index 857ebfe..bb08ba0 100644 +--- a/src/gallium/targets/Makefile.dri ++++ b/src/gallium/targets/Makefile.dri +@@ -9,7 +9,6 @@ LDFLAGS += -lstdc++ endif MESA_MODULES = \ @@ -150,7 +186,7 @@ Index: mesa/src/gallium/targets/Makefile.dri $(GALLIUM_AUXILIARIES) COMMON_GALLIUM_SOURCES = \ -@@ -73,8 +72,8 @@ +@@ -78,8 +77,8 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \ $(MKLIB) -o [email protected] -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ $(OBJECTS) $(PIPE_DRIVERS) \ -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \ @@ -161,30 +197,31 @@ Index: mesa/src/gallium/targets/Makefile.dri @rm -f [email protected] mv -f [email protected] $@ -Index: mesa/src/mesa/Makefile -=================================================================== ---- mesa.orig/src/mesa/Makefile 2012-01-24 15:03:01.729902420 +0200 -+++ mesa/src/mesa/Makefile 2012-01-24 15:07:20.349650974 +0200 -@@ -16,6 +16,8 @@ - MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS)) - MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) +diff --git a/src/mesa/Makefile b/src/mesa/Makefile +index a903a26..c4ab43c 100644 +--- a/src/mesa/Makefile ++++ b/src/mesa/Makefile +@@ -17,6 +17,9 @@ MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) + DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS)) + ++DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS)) +GALLIUMCORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(filter-out $(MESA_OBJECTS), $(MESA_GALLIUM_OBJECTS))) + # define preprocessor flags MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES) -@@ -65,7 +67,7 @@ +@@ -66,7 +69,7 @@ $(DRICORE_OBJ_DIR)/%.o: %.S # Default: build dependencies, then asm_subdirs, GLSL built-in lib, # then convenience libs (.a) and finally the device drivers: -default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs +default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) libgalliumcore.a driver_subdirs - # include glapi_gen.mk for generating glapi headers for GLES - GLAPI := $(TOP)/src/mapi/glapi/gen -@@ -146,6 +148,10 @@ - @$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \ + main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py + $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@ +@@ -125,6 +128,10 @@ depend: $(ALL_SOURCES) + @$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \ $(ALL_SOURCES) > /dev/null 2>/dev/null +# Make archive of subset of core mesa object files for gallium @@ -194,15 +231,3 @@ Index: mesa/src/mesa/Makefile ###################################################################### # Installation rules -Index: mesa/configs/autoconf.in -=================================================================== ---- mesa.orig/configs/autoconf.in 2012-01-24 15:03:01.725902300 +0200 -+++ mesa/configs/autoconf.in 2012-01-24 15:06:14.027663852 +0200 -@@ -124,6 +124,7 @@ - DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@ - DRICORE_LIBS = @DRICORE_LIBS@ - DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@ -+GALLIUM_LIB_DEPS = @GALLIUM_LIB_DEPS@ - EGL_PLATFORMS = @EGL_PLATFORMS@ - EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ - -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
