From 9046b31644465d3b956a873f4073dfcd2969e333 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jul 2009 00:36:50 +0200 Subject: [PATCH] update to Mesa-7.5-rc4 --- packages/graphics/Mesa/20_libmesa-shared.diff | 115 ------------------ packages/graphics/Mesa/build | 5 +- packages/graphics/Mesa/url | 4 +- 3 files changed, 6 insertions(+), 118 deletions(-) delete mode 100644 packages/graphics/Mesa/20_libmesa-shared.diff diff --git a/packages/graphics/Mesa/20_libmesa-shared.diff b/packages/graphics/Mesa/20_libmesa-shared.diff deleted file mode 100644 index 7617ce9515..0000000000 --- a/packages/graphics/Mesa/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 -@@ -14,7 +14,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-rc2.orig/src/mesa/drivers/osmesa/Makefile mesa-7.5-rc2/src/mesa/drivers/osmesa/Makefile ---- mesa-7.5-rc2.orig/src/mesa/drivers/osmesa/Makefile 2009-05-16 21:13:42.000000000 +0200 -+++ mesa-7.5-rc2/src/mesa/drivers/osmesa/Makefile 2009-05-16 21:16:19.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 - - - .PHONY: osmesa8 -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/build b/packages/graphics/Mesa/build index 329edd48dc..a9025fb689 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -43,7 +43,10 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ --with-dri-driverdir="$XORG_PATH_DRI" \ --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \ --with-x \ - --without-demos + --without-demos \ + --enable-gallium-radeon \ + --enable-gallium-intel \ + --enable-gallium-nouveau \ make diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index bc973edf50..e29bef9894 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1,2 +1,2 @@ -http://www.mesa3d.org/beta/MesaLib-7.5-rc3.tar.gz -http://mesa3d.org/beta/MesaDemos-7.5-rc3.tar.gz +http://www.mesa3d.org/beta/MesaLib-7.5-rc4.tar.gz +http://mesa3d.org/beta/MesaDemos-7.5-rc4.tar.gz