diff options
Diffstat (limited to 'mesa-7.1-link-shared.patch')
| -rw-r--r-- | mesa-7.1-link-shared.patch | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/mesa-7.1-link-shared.patch b/mesa-7.1-link-shared.patch index f042383..d397e28 100644 --- a/mesa-7.1-link-shared.patch +++ b/mesa-7.1-link-shared.patch @@ -1,6 +1,6 @@ -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile ---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000 +diff -up mesa-20091030/src/mesa/drivers/dri/Makefile.da mesa-20091030/src/mesa/drivers/dri/Makefile +--- mesa-20091030/src/mesa/drivers/dri/Makefile.da 2009-10-30 11:12:50.000000000 +1000 ++++ mesa-20091030/src/mesa/drivers/dri/Makefile 2009-10-30 14:54:13.000000000 +1000 @@ -6,12 +6,17 @@ include $(TOP)/configs/current @@ -20,7 +20,7 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m subdirs: @for dir in $(DRI_DIRS) ; do \ -@@ -31,12 +36,14 @@ dri.pc: dri.pc.in +@@ -32,12 +37,14 @@ dri.pc: dri.pc.in $(pcedit) $< > $@ @@ -36,38 +36,37 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \ $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal -@@ -52,5 +59,6 @@ clean: +@@ -51,5 +58,6 @@ clean: (cd $$dir && $(MAKE) clean) ; \ fi \ done + -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so -rm -f common/*.o -rm -f *.pc -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template ---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000 +diff -up mesa-20091030/src/mesa/drivers/dri/Makefile.template.da mesa-20091030/src/mesa/drivers/dri/Makefile.template +--- mesa-20091030/src/mesa/drivers/dri/Makefile.template.da 2009-10-30 11:12:50.000000000 +1000 ++++ mesa-20091030/src/mesa/drivers/dri/Makefile.template 2009-10-30 14:56:12.000000000 +1000 @@ -1,6 +1,6 @@ # -*-makefile-*- -MESA_MODULES = $(TOP)/src/mesa/libmesa.a +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so - COMMON_SOURCES = \ + COMMON_GALLIUM_SOURCES = \ ../common/utils.c \ -@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO - - $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template +@@ -66,7 +66,8 @@ default: symlinks subdirs depend $(LIBNA + $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \ + $(TOP)/src/mesa/drivers/dri/Makefile.template $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \ +- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \ ++ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \ + -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \ -+ $(DRI_LIB_DEPS) + $(DRI_LIB_DEPS) - $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) -diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S ---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000 +diff -up mesa-20091030/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091030/src/mesa/x86/read_rgba_span_x86.S +--- mesa-20091030/src/mesa/x86/read_rgba_span_x86.S.da 2009-10-30 11:12:50.000000000 +1000 ++++ mesa-20091030/src/mesa/x86/read_rgba_span_x86.S 2009-10-30 14:54:13.000000000 +1000 @@ -77,7 +77,6 @@ */ |