debian/changelog | 7 debian/libgl1-mesa-dri-experimental.install.in | 5 debian/patches/104_i915_fragment_shader_disable.patch | 26 debian/patches/105_use_shared_libdricore.patch | 469 ---------------- debian/patches/108_fix_leaks_dri2_screen_creation.patch | 107 --- debian/patches/112_fix_segfault_on_nvAF.diff | 47 - debian/patches/114_intel_dri_renderer_string.diff | 27 7 files changed, 6 insertions(+), 682 deletions(-)
New commits: commit 8c7136e754ad61988df564696c712da8644fb710 Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Jan 24 10:08:56 2012 -0500 debian/patches: Remove more upstream patches. diff --git a/debian/patches/104_i915_fragment_shader_disable.patch b/debian/patches/104_i915_fragment_shader_disable.patch deleted file mode 100644 index d2aee8e..0000000 --- a/debian/patches/104_i915_fragment_shader_disable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001 -From: Robert Hooker <sarv...@ubuntu.com> -Date: Wed, 8 Sep 2010 12:33:09 -0400 -Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default." - -This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d. ---- - src/mesa/drivers/dri/intel/intel_screen.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 0a542a7..8ae2cd2 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).") - DRI_CONF_OPT_END - -- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true) -+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false) - DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.") - DRI_CONF_OPT_END - --- -1.7.2 - diff --git a/debian/patches/105_use_shared_libdricore.patch b/debian/patches/105_use_shared_libdricore.patch deleted file mode 100644 index 6c6e4d0..0000000 --- a/debian/patches/105_use_shared_libdricore.patch +++ /dev/null @@ -1,469 +0,0 @@ -commit 2bf2b08a97a65327bfb9d511f3cc6792aa560cbc -Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> -Date: Wed Nov 17 14:28:34 2010 +1100 - - mesa: Optionally build a dricore support library. - - This an adds --enable-shared-dricore option to configure. When enabled, - DRI modules will link against a shared copy of the common mesa routines - rather than statically linking these. - - This saves about 30MB on disc with a full complement of classic DRI - drivers. - -Index: mesa/configs/autoconf.in -=================================================================== ---- mesa.orig/configs/autoconf.in 2011-04-11 11:17:43.692242067 +1000 -+++ mesa/configs/autoconf.in 2011-04-11 11:18:11.463257267 +1000 -@@ -33,6 +33,8 @@ - LLVM_LIBS = @LLVM_LIBS@ - GLW_CFLAGS = @GLW_CFLAGS@ - GLUT_CFLAGS = @GLUT_CFLAGS@ -+DRI_CFLAGS = @DRI_CFLAGS@ -+DRI_CXXFLAGS = @DRI_CXXFLAGS@ - - # dlopen - DLOPEN_LIBS = @DLOPEN_LIBS@ -@@ -100,7 +102,10 @@ - GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) - - # Driver specific build vars --DRI_DIRS = @DRI_DIRS@ -+DRI_DIRS = @DRI_DIRS@ -+DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@ -+DRICORE_LIBS = @DRICORE_LIBS@ -+DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@ - EGL_PLATFORMS = @EGL_PLATFORMS@ - EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ - -@@ -128,6 +133,7 @@ - VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ - - # DRI dependencies -+MESA_MODULES = @MESA_MODULES@ - DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ - LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ - LIBDRM_LIB = @LIBDRM_LIBS@ -Index: mesa/configs/default -=================================================================== ---- mesa.orig/configs/default 2011-04-11 11:17:43.722243160 +1000 -+++ mesa/configs/default 2011-04-11 11:18:11.463257267 +1000 -@@ -82,6 +82,9 @@ - GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* - VG_LIB_GLOB = $(VG_LIB_NAME)* - -+DRI_CFLAGS = $(CFLAGS) -+DRI_CXXFLAGS = $(CXXFLAGS) -+ - # Optional assembly language optimization files for libGL - MESA_ASM_SOURCES = - -Index: mesa/configs/freebsd-dri -=================================================================== ---- mesa.orig/configs/freebsd-dri 2011-04-11 11:17:43.702242435 +1000 -+++ mesa/configs/freebsd-dri 2011-04-11 11:18:11.463257267 +1000 -@@ -30,9 +30,11 @@ - MESA_ASM_SOURCES = - - # Library/program dependencies -+MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+ - LIBDRM_CFLAGS = `pkg-config --cflags libdrm` - LIBDRM_LIB = `pkg-config --libs libdrm` --DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) -+DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) - GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -pthread $(LIBDRM_LIB) - -Index: mesa/configs/linux-dri -=================================================================== ---- mesa.orig/configs/linux-dri 2011-04-11 11:17:43.662240971 +1000 -+++ mesa/configs/linux-dri 2011-04-11 11:18:11.473257629 +1000 -@@ -43,9 +43,11 @@ - # Library/program dependencies - EXTRA_LIB_PATH=-L/usr/X11R6/lib - -+MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+ - LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) - LIBDRM_LIB = $(shell pkg-config --libs libdrm) --DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -+DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -lpthread -ldl $(LIBDRM_LIB) - -Index: mesa/configs/linux-dri-xcb -=================================================================== ---- mesa.orig/configs/linux-dri-xcb 2011-04-11 11:17:43.682241704 +1000 -+++ mesa/configs/linux-dri-xcb 2011-04-11 11:18:11.473257629 +1000 -@@ -41,9 +41,11 @@ - # Library/program dependencies - EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) - -+MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+ - LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) - LIBDRM_LIB = $(shell pkg-config --libs libdrm) --DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -+DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) - -Index: mesa/configs/linux-egl -=================================================================== ---- mesa.orig/configs/linux-egl 2011-04-11 11:17:43.732243530 +1000 -+++ mesa/configs/linux-egl 2011-04-11 11:18:11.473257629 +1000 -@@ -38,9 +38,11 @@ - # Library/program dependencies - EXTRA_LIB_PATH=-L/usr/X11R6/lib - -+MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+ - LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) - LIBDRM_LIB = $(shell pkg-config --libs libdrm) --DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -+DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -lpthread -ldl \ - $(LIBDRM_LIB) -Index: mesa/configs/linux-indirect -=================================================================== ---- mesa.orig/configs/linux-indirect 2011-04-11 11:17:43.742243890 +1000 -+++ mesa/configs/linux-indirect 2011-04-11 11:18:11.473257629 +1000 -@@ -42,7 +42,8 @@ - # Library/program dependencies - EXTRA_LIB_PATH=-L/usr/X11R6/lib - --DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -+MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl - - -Index: mesa/configure.ac -=================================================================== ---- mesa.orig/configure.ac 2011-04-11 11:18:08.543150386 +1000 -+++ mesa/configure.ac 2011-04-11 11:20:12.507714770 +1000 -@@ -801,6 +801,34 @@ - AC_SUBST([GLESv2_PC_LIB_PRIV]) - - -+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 -+ 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,--rpath=$(DRI_DRIVER_SEARCH_DIR) -ldricore -lglsl' -+ DRI_CFLAGS='$(filter-out -fvisibility=hidden,$(CFLAGS)) -DUSE_DRICORE' -+ DRI_CXXFLAGS='$(filter-out -fvisibility=hidden,$(CXXFLAGS)) -DUSE_DRICORE' -+ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)' -+ else -+ DRI_CFLAGS='$(CFLAGS)' -+ DRI_CXXFLAGS='$(CXXFLAGS)' -+ DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a' -+ MESA_MODULES='$(TOP)/src/mesa/libmesa.a' -+ fi -+fi -+AC_SUBST([DRICORE_LIBS]) -+AC_SUBST([DRICORE_GLSL_LIBS]) -+AC_SUBST([DRICORE_LIB_DEPS]) -+AC_SUBST([DRI_CXXFLAGS]) -+AC_SUBST([DRI_CFLAGS]) -+AC_SUBST([MESA_MODULES]) -+ - AC_SUBST([HAVE_XF86VIDMODE]) - - PKG_CHECK_MODULES([LIBDRM_RADEON], -@@ -962,8 +990,8 @@ - [AC_MSG_ERROR([Expat required for DRI.])]) - fi - -- # put all the necessary libs together -- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" -+ # put all the necessary libs together, including possibly libdricore -+ DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" - fi - AC_SUBST([DRI_DIRS]) - AC_SUBST([EXPAT_INCLUDES]) -Index: mesa/src/glsl/Makefile -=================================================================== ---- mesa.orig/src/glsl/Makefile 2011-04-11 11:17:43.652240611 +1000 -+++ mesa/src/glsl/Makefile 2011-04-11 11:18:11.473257629 +1000 -@@ -112,6 +112,9 @@ - $(C_SOURCES:.c=.o) \ - $(CXX_SOURCES:.cpp=.o) - -+DRICORE_OBJ_DIR = obj-visible -+OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS)) -+ - INCLUDES = \ - -I. \ - -I../mesa \ -@@ -127,7 +130,14 @@ - - ##### TARGETS ##### - --default: depend lib$(LIBNAME).a $(APPS) -+default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS) -+ -+libglsl.so : $(OBJECTS_DRICORE) Makefile -+ $(MKLIB) -cplusplus -noprefix -o $@ $(OBJECTS_DRICORE) -+ -+$(TOP)/$(LIB_DIR)/libglsl.so: libglsl.so -+ $(INSTALL) -d $(TOP)/$(LIB_DIR) -+ $(INSTALL) -m 755 libglsl.so $(TOP)/$(LIB_DIR) - - lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template - $(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) -@@ -161,6 +171,14 @@ - .c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -+$(DRICORE_OBJ_DIR)/%.o : %.cpp -+ @mkdir -p $(dir $@) -+ $(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@ -+ -+$(DRICORE_OBJ_DIR)/%.o : %.c -+ @mkdir -p $(dir $@) -+ $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@ -+ - glsl_lexer.cpp: glsl_lexer.lpp - flex --nounistd -o$@ $< - -Index: mesa/src/mesa/Makefile -=================================================================== ---- mesa.orig/src/mesa/Makefile 2011-04-11 11:17:43.592238416 +1000 -+++ mesa/src/mesa/Makefile 2011-04-11 11:18:11.473257629 +1000 -@@ -15,6 +15,7 @@ - MESA_OBJ_DIR := . - ES1_OBJ_DIR := objs-es1 - ES2_OBJ_DIR := objs-es2 -+DRICORE_OBJ_DIR := objs-dricore - - - include sources.mak -@@ -23,6 +24,7 @@ - ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS)) - ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS)) - MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS)) -+DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS)) - - ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) - ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) -@@ -32,6 +34,7 @@ - MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES) - ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES) - ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES) -+DRICORE_CPPFLAGS = $(MESA_CPPFLAGS) - - # append include dirs - MESA_CPPFLAGS += $(INCLUDE_DIRS) -@@ -43,18 +46,24 @@ - CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS)) - - # LLVM is needed for the state tracker --MESA_CFLAGS := $(LLVM_CFLAGS) --ES1_CFLAGS := $(LLVM_CFLAGS) --ES2_CFLAGS := $(LLVM_CFLAGS) -+MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS) -+ES1_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS) -+ES2_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS) -+DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS) -+ -+MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS) -+ES1_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS) -+ES2_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS) -+DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS) - - define mesa-cc-c - @mkdir -p $(dir $@) -- $(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CFLAGS) -+ $(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) - endef - - define mesa-cxx-c - @mkdir -p $(dir $@) -- $(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CXXFLAGS) -+ $(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) - endef - - $(MESA_OBJ_DIR)/%.o: %.c -@@ -84,11 +93,20 @@ - $(ES2_OBJ_DIR)/%.o: %.S - $(call mesa-cc-c,ES2) - -+$(DRICORE_OBJ_DIR)/%.o: %.c -+ $(call mesa-cc-c,DRICORE) -+ -+$(DRICORE_OBJ_DIR)/%.o: %.cpp -+ $(call mesa-cxx-c,DRICORE) -+ -+$(DRICORE_OBJ_DIR)/%.o: %.S -+ $(call mesa-cc-c,DRICORE) -+ - - # 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) $(ES1_LIBS) $(ES2_LIBS) driver_subdirs -+ $(MESA_LIBS) $(ES1_LIBS) $(ES2_LIBS) $(DRICORE_LIBS) driver_subdirs - - 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 > $@ -@@ -109,6 +127,15 @@ - libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS) - @$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS) - -+# Shared dricore library for classic DRI drivers -+libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS) -+ @$(MKLIB) -o libdricore.so -noprefix -cplusplus \ -+ $(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS) -+ -+$(TOP)/$(LIB_DIR)/libdricore.so: libdricore.so -+ @$(INSTALL) -d $(TOP)/$(LIB_DIR) -+ @$(INSTALL) -m 755 libdricore.so $(TOP)/$(LIB_DIR) -+ - # Make archive of subset of core mesa object files for gallium - libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS) - @ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS) -@@ -121,7 +148,7 @@ - - ###################################################################### - # Device drivers --driver_subdirs: $(MESA_LIBS) -+driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS) - @ (cd drivers && $(MAKE)) - - -@@ -165,9 +192,12 @@ - new_install: - (cd drivers && $(MAKE) install) - -+ifneq (,$(DRICORE_LIBS)) -+DRICORE_INSTALL_TARGET = install-dricore -+endif - - # XXX replace this with new_install above someday --install: default -+install: default $(DRICORE_INSTALL_TARGET) - @for driver in $(DRIVER_DIRS) ; do \ - case "$$driver" in \ - osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \ -@@ -229,6 +259,12 @@ - cd drivers/dri && $(MAKE) install - - -+install-dricore: default -+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) -+ $(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) -+ $(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR$) -+ -+ - - # Emacs tags - tags: -@@ -244,7 +280,12 @@ - -rm -rf $(ES2_OBJ_DIR) - -rm -f depend.es2 depend.es2.bak - --clean: clean-es1 clean-es2 -+clean-dricore: -+ -rm -f libdricore.so -+ -rm -f $(DRICORE_LIBS) -+ -rm -rf $(DRICORE_OBJ_DIR) -+ -+clean: clean-es1 clean-es2 clean-dricore - -rm -f */*.o - -rm -f */*/*.o - -rm -f depend depend.bak libmesa.a libmesagallium.a -Index: mesa/src/mesa/drivers/dri/Makefile.template -=================================================================== ---- mesa.orig/src/mesa/drivers/dri/Makefile.template 2011-04-11 11:17:43.622239515 +1000 -+++ mesa/src/mesa/drivers/dri/Makefile.template 2011-04-11 11:18:11.473257629 +1000 -@@ -1,7 +1,5 @@ - # -*-makefile-*- - --MESA_MODULES = $(TOP)/src/mesa/libmesa.a -- - COMMON_GALLIUM_SOURCES = \ - ../common/utils.c \ - ../common/vblank.c \ -@@ -39,13 +37,13 @@ - ##### RULES ##### - - .c.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ -+ $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@ - - .cpp.o: -- $(CC) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@ -+ $(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@ - - .S.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ -+ $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@ - - - ##### TARGETS ##### -@@ -57,10 +55,10 @@ - lib: symlinks subdirs depend - @$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) - --$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \ -+$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \ - $(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o - $(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ -- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS) - $(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS) - @rm -f $@.test - mv -f $@.tmp $@ -Index: mesa/src/mesa/x86/read_rgba_span_x86.S -=================================================================== ---- mesa.orig/src/mesa/x86/read_rgba_span_x86.S 2011-04-11 11:17:43.602238784 +1000 -+++ mesa/src/mesa/x86/read_rgba_span_x86.S 2011-04-11 11:18:11.473257629 +1000 -@@ -77,7 +77,9 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_MMX -+#ifndef USE_DRICORE - .hidden _generic_read_RGBA_span_BGRA8888_REV_MMX -+#endif - .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function - _generic_read_RGBA_span_BGRA8888_REV_MMX: - pushl %ebx -@@ -172,7 +174,9 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE -+#ifndef USE_DRICORE - .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE -+#endif - .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE: - pushl %esi -@@ -335,7 +339,9 @@ - - .text - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 -+#ifndef USE_DRICORE - .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 -+#endif - .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE2: - pushl %esi -@@ -494,7 +500,9 @@ - - .text - .globl _generic_read_RGBA_span_RGB565_MMX -+#ifndef USE_DRICORE - .hidden _generic_read_RGBA_span_RGB565_MMX -+#endif - .type _generic_read_RGBA_span_RGB565_MMX, @function - - _generic_read_RGBA_span_RGB565_MMX: diff --git a/debian/patches/108_fix_leaks_dri2_screen_creation.patch b/debian/patches/108_fix_leaks_dri2_screen_creation.patch deleted file mode 100644 index 6f5b7a7..0000000 --- a/debian/patches/108_fix_leaks_dri2_screen_creation.patch +++ /dev/null @@ -1,107 +0,0 @@ -From bfc889517ad0d490cce1817eecac146d66bcd923 Mon Sep 17 00:00:00 2001 -From: Henri Verbeet <hverb...@gmail.com> -Date: Sat, 29 Jan 2011 23:00:48 +0000 -Subject: glx: Fix leaks in DRI2 screen creation error paths. - -Signed-off-by: Brian Paul <bri...@vmware.com> ---- -diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c -index 75b1a10..ab7915c 100644 ---- a/src/glx/dri2_glx.c -+++ b/src/glx/dri2_glx.c -@@ -804,11 +804,14 @@ dri2CreateScreen(int screen, struct glx_display * priv) - return NULL; - - memset(psc, 0, sizeof *psc); -- if (!glx_screen_init(&psc->base, screen, priv)) -- return NULL; -+ if (!glx_screen_init(&psc->base, screen, priv)) { -+ Xfree(psc); -+ return NULL; -+ } - - if (!DRI2Connect(priv->dpy, RootWindow(priv->dpy, screen), - &driverName, &deviceName)) { -+ glx_screen_cleanup(&psc->base); - XFree(psc); - return NULL; - } -@@ -918,12 +921,15 @@ dri2CreateScreen(int screen, struct glx_display * priv) - return &psc->base; - - handle_error: -+ if (psc->fd) -+ close(psc->fd); -+ if (psc->driver) -+ dlclose(psc->driver); - Xfree(driverName); - Xfree(deviceName); -+ glx_screen_cleanup(&psc->base); - XFree(psc); - -- /* FIXME: clean up here */ -- - return NULL; - } - -diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h -index 36a0808..fdcef80 100644 ---- a/src/glx/glxclient.h -+++ b/src/glx/glxclient.h -@@ -585,6 +585,8 @@ struct glx_display - extern int - glx_screen_init(struct glx_screen *psc, - int screen, struct glx_display * priv); -+extern void -+glx_screen_cleanup(struct glx_screen *psc); - - #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - extern __GLXDRIdrawable * -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index c75c9bf..25d266e 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -194,17 +194,7 @@ FreeScreenConfigs(struct glx_display * priv) - screens = ScreenCount(priv->dpy); - for (i = 0; i < screens; i++) { - psc = priv->screens[i]; -- if (psc->configs) { -- glx_config_destroy_list(psc->configs); -- if (psc->effectiveGLXexts) -- Xfree(psc->effectiveGLXexts); -- psc->configs = NULL; /* NOTE: just for paranoia */ -- } -- if (psc->visuals) { -- glx_config_destroy_list(psc->visuals); -- psc->visuals = NULL; /* NOTE: just for paranoia */ -- } -- Xfree((char *) psc->serverGLXexts); -+ glx_screen_cleanup(psc); - - #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - if (psc->driScreen) { -@@ -728,6 +718,22 @@ glx_screen_init(struct glx_screen *psc, - return GL_TRUE; - } - -+_X_HIDDEN void -+glx_screen_cleanup(struct glx_screen *psc) -+{ -+ if (psc->configs) { -+ glx_config_destroy_list(psc->configs); -+ if (psc->effectiveGLXexts) -+ Xfree(psc->effectiveGLXexts); -+ psc->configs = NULL; /* NOTE: just for paranoia */ -+ } -+ if (psc->visuals) { -+ glx_config_destroy_list(psc->visuals); -+ psc->visuals = NULL; /* NOTE: just for paranoia */ -+ } -+ Xfree((char *) psc->serverGLXexts); -+} -+ - /* - ** Allocate the memory for the per screen configs for each screen. - ** If that works then fetch the per screen configs data. --- -cgit v0.8.3-6-g21f6 diff --git a/debian/patches/112_fix_segfault_on_nvAF.diff b/debian/patches/112_fix_segfault_on_nvAF.diff deleted file mode 100644 index 0fc1619..0000000 --- a/debian/patches/112_fix_segfault_on_nvAF.diff +++ /dev/null @@ -1,47 +0,0 @@ -Subject: [Nouveau] [PATCH] gallium/nv50: use 0x8697 class on NVAF -Upstream: No (but fixed in mesa master, so drop after 7.10) -Addresses: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-nouveau/+bug/723012 - -Reported-and-tested-by: Alan Pope ---- - src/gallium/drivers/nv50/nv50_reg.h | 4 ++++ - src/gallium/drivers/nv50/nv50_screen.c | 3 +++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/src/gallium/drivers/nv50/nv50_reg.h b/src/gallium/drivers/nv50/nv50_reg.h -index 949838b..90d77e5 100644 ---- a/src/gallium/drivers/nv50/nv50_reg.h -+++ b/src/gallium/drivers/nv50/nv50_reg.h -@@ -1685,6 +1685,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - -+#define NVAFTCL 0x00008697 -+ -+ -+ - #define NV50_COMPUTE 0x000050c0 - - #define NV50_COMPUTE_NOP 0x00000100 -diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c -index edc3d54..8069509 100644 ---- a/src/gallium/drivers/nv50/nv50_screen.c -+++ b/src/gallium/drivers/nv50/nv50_screen.c -@@ -389,6 +389,9 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) - case 0xac: - tesla_class = NVA0TCL; - break; -+ case 0xaf: -+ tesla_class = NVAFTCL; -+ break; - default: - tesla_class = NVA8TCL; - break; --- -1.7.4.rc3 - -_______________________________________________ -Nouveau mailing list -nouv...@lists.freedesktop.org -http://lists.freedesktop.org/mailman/listinfo/nouveau - diff --git a/debian/patches/114_intel_dri_renderer_string.diff b/debian/patches/114_intel_dri_renderer_string.diff deleted file mode 100644 index 6b558c9..0000000 --- a/debian/patches/114_intel_dri_renderer_string.diff +++ /dev/null @@ -1,27 +0,0 @@ -Description: Re-add "GEM" to the dri renderer string of the intel driver. - Removing it breaks KDE's detection for the blur effect. - Should be dropped with mesa 7.11 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/753370 - ---- a/src/mesa/drivers/dri/intel/intel_context.c -+++ b/src/mesa/drivers/dri/intel/intel_context.c -@@ -62,6 +62,10 @@ - #endif - - -+#define DRIVER_DATE "20100330 DEVELOPMENT" -+#define DRIVER_DATE_GEM "GEM " DRIVER_DATE -+ -+ - static const GLubyte * - intelGetString(struct gl_context * ctx, GLenum name) - { -@@ -178,7 +182,7 @@ - break; - } - -- (void) driGetRendererString(buffer, chipset, "", 0); -+ (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0); - return (GLubyte *) buffer; - - default: commit 3469200a07da5a5d93dee039dca0b744e629d647 Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Jan 24 09:56:20 2012 -0500 Stop shipping r300c/r600c in libgl1-mesa-dri-experimental diff --git a/debian/changelog b/debian/changelog index 6c0b5ae..f1754ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * clean, rules: Move cleaning of xmlpool.pot to rules and remove 'clean'. * Removed patches. @@ -12,7 +13,11 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low * Update 115_llvm_dynamic_linking.diff, 116_use_shared_galliumcore.diff to apply. - -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 24 Jan 2012 12:47:07 +0200 + [ Robert Hooker ] + * Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental, + no longer shipped upstream. + + -- Robert Hooker <sarv...@ubuntu.com> Tue, 24 Jan 2012 09:54:54 -0500 mesa (8.0~rc1-1) UNRELEASED; urgency=low diff --git a/debian/libgl1-mesa-dri-experimental.install.in b/debian/libgl1-mesa-dri-experimental.install.in index 26be4f3..5d13ab2 100644 --- a/debian/libgl1-mesa-dri-experimental.install.in +++ b/debian/libgl1-mesa-dri-experimental.install.in @@ -1,6 +1 @@ # empty for now. - -# Install the classic radeon drivers for UMS fallback -# Most users will not need these, and we don't want to support them -build/dri/${DEB_HOST_MULTIARCH}/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates -build/dri/${DEB_HOST_MULTIARCH}/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates -- 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/e1rphzy-0003tp...@vasks.debian.org