From 7747896db08eecf79e063df8ce5f8cd4b7bba52c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Sep 2009 14:12:29 +0200 Subject: [PATCH] Mesa-master: - remove not needed patches --- .../Mesa-master/20_libmesa-shared.diff | 115 ------------------ .../Mesa-master/mesa-7.1-link-shared.diff | 102 ---------------- 2 files changed, 217 deletions(-) delete mode 100644 packages/graphics/Mesa-master/20_libmesa-shared.diff delete mode 100644 packages/graphics/Mesa-master/mesa-7.1-link-shared.diff diff --git a/packages/graphics/Mesa-master/20_libmesa-shared.diff b/packages/graphics/Mesa-master/20_libmesa-shared.diff deleted file mode 100644 index b9effced6a..0000000000 --- a/packages/graphics/Mesa-master/20_libmesa-shared.diff +++ /dev/null @@ -1,115 +0,0 @@ -diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/directfb/Makefile mesa-7.5-rc2/src/mesa/drivers/directfb/Makefile ---- mesa-7.5-rc2.orig/src/mesa/drivers/directfb/Makefile 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/drivers/directfb/Makefile 2009-05-16 21:14:33.000000000 +0200 -@@ -25,7 +25,7 @@ - - DIRECTFBGL_MESA = libidirectfbgl_mesa.so - --LIBS = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a -+LIBS = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so - - - .c.o: -diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/dri/Makefile.template mesa-7.5-rc2/src/mesa/drivers/dri/Makefile.template ---- mesa-7.5-rc2.orig/src/mesa/drivers/dri/Makefile.template 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/drivers/dri/Makefile.template 2009-05-16 21:15:21.000000000 +0200 -@@ -1,6 +1,6 @@ - # -*-makefile-*- - --MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+MESA_MODULES = $(TOP)/src/mesa/libmesa.so - - COMMON_GALLIUM_SOURCES = \ - ../common/utils.c \ -diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/fbdev/Makefile mesa-7.5-rc2/src/mesa/drivers/fbdev/Makefile ---- mesa-7.5-rc2.orig/src/mesa/drivers/fbdev/Makefile 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/drivers/fbdev/Makefile 2009-05-16 21:15:36.000000000 +0200 -@@ -19,7 +19,7 @@ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main - --CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a -+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so - - - .c.o: -diff -Naur mesa-7.5-rc3.orig/src/mesa/drivers/osmesa/Makefile mesa-7.5-rc3/src/mesa/drivers/osmesa/Makefile ---- mesa-7.5-rc3.orig/src/mesa/drivers/osmesa/Makefile.old 2009-06-06 09:40:32.000000000 +0200 -+++ mesa-7.5-rc3/src/mesa/drivers/osmesa/Makefile 2009-06-06 09:40:58.000000000 +0200 -@@ -21,7 +21,7 @@ - - # Standalone osmesa needs to be linked with core Mesa APIs - ifeq ($(DRIVER_DIRS), osmesa) --CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a -+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so - else - CORE_MESA = - endif -diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/x11/Makefile mesa-7.5-rc2/src/mesa/drivers/x11/Makefile ---- mesa-7.5-rc2.orig/src/mesa/drivers/x11/Makefile 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/drivers/x11/Makefile 2009-05-16 21:16:36.000000000 +0200 -@@ -44,7 +44,7 @@ - -I$(TOP)/src/mesa/main \ - $(X11_INCLUDES) - --CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a -+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so - - - -diff -Naur mesa-7.5-rc2.orig/src/mesa/Makefile mesa-7.5-rc2/src/mesa/Makefile ---- mesa-7.5-rc2.orig/src/mesa/Makefile 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/Makefile 2009-05-16 21:18:38.000000000 +0200 -@@ -20,8 +20,8 @@ - - - # Default: build dependencies, then asm_subdirs, then convenience --# libs (.a) and finally the device drivers: --default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \ -+# libs (.so) and finally the device drivers: -+default: depend asm_subdirs libmesa.so libmesagallium.so libglapi.so \ - driver_subdirs - - -@@ -30,24 +30,24 @@ - # Helper libraries used by many drivers: - - # Make archive of core mesa object files --libmesa.a: $(MESA_OBJECTS) -- @ $(MKLIB) -o mesa -static $(MESA_OBJECTS) -+libmesa.so: $(MESA_OBJECTS) -+ @ $(MKLIB) -o mesa -dlopen $(MESA_OBJECTS) - - # Make archive of subset of core mesa object files for gallium --libmesagallium.a: $(MESA_GALLIUM_OBJECTS) -- @ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) -+libmesagallium.so: $(MESA_GALLIUM_OBJECTS) -+ @ $(MKLIB) -o mesagallium -dlopen $(MESA_GALLIUM_OBJECTS) - - # Make archive of gl* API dispatcher functions only --libglapi.a: $(GLAPI_OBJECTS) -+libglapi.so: $(GLAPI_OBJECTS) - @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \ -- touch libglapi.a ; \ -+ touch libglapi.so ; \ - else \ -- $(MKLIB) -o glapi -static $(GLAPI_OBJECTS) ; \ -+ $(MKLIB) -o glapi -dlopen $(GLAPI_OBJECTS) ; \ - fi - - ###################################################################### - # Device drivers --driver_subdirs: libmesa.a libglapi.a -+driver_subdirs: libmesa.so libglapi.so - @ (cd drivers && $(MAKE)) - - -@@ -153,7 +153,7 @@ - clean: - -rm -f */*.o - -rm -f */*/*.o -- -rm -f depend depend.bak libmesa.a libglapi.a -+ -rm -f depend depend.bak libmesa.so libglapi.so - -rm -f drivers/*/*.o - -rm -f *.pc - -@cd drivers/dri && $(MAKE) clean diff --git a/packages/graphics/Mesa-master/mesa-7.1-link-shared.diff b/packages/graphics/Mesa-master/mesa-7.1-link-shared.diff deleted file mode 100644 index 4898adaf2d..0000000000 --- a/packages/graphics/Mesa-master/mesa-7.1-link-shared.diff +++ /dev/null @@ -1,102 +0,0 @@ -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 -@@ -6,12 +6,17 @@ include $(TOP)/configs/current - - - --default: $(TOP)/$(LIB_DIR) subdirs dri.pc -+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc - - - $(TOP)/$(LIB_DIR): - -mkdir $(TOP)/$(LIB_DIR) - -+libdricore.so: -+ $(CC) -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc -+ -+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so -+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) - - subdirs: - @for dir in $(DRI_DIRS) ; do \ -@@ -31,12 +36,14 @@ dri.pc: dri.pc.in - $(pcedit) $< > $@ - - --install: dri.pc -+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so - @for dir in $(DRI_DIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) install) || exit 1 ; \ - fi \ - done -+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) -+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) - $(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: - (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 -@@ -1,6 +1,6 @@ - # -*-makefile-*- - --MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so - - COMMON_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 - $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \ -+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \ -+ $(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 -@@ -77,7 +77,6 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_MMX --.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX - .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function - _generic_read_RGBA_span_BGRA8888_REV_MMX: - pushl %ebx -@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE - .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE: - pushl %esi -@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 - .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE2: - pushl %esi -@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_RGB565_MMX -- .hidden _generic_read_RGBA_span_RGB565_MMX - .type _generic_read_RGBA_span_RGB565_MMX, @function - - _generic_read_RGBA_span_RGB565_MMX: