variuos updates, cleanups, enhancements, fixes

packages/graphics/Mesa/20_libmesa-shared.diff

@@ -1,6 +1,6 @@
-diff -Naur mesa-7.1.orig/src/mesa/drivers/directfb/Makefile mesa-7.1/src/mesa/drivers/directfb/Makefile
+diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/directfb/Makefile mesa-7.5-rc2/src/mesa/drivers/directfb/Makefile
---- mesa-7.1.orig/src/mesa/drivers/directfb/Makefile	2008-08-30 17:04:52.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/drivers/directfb/Makefile	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/drivers/directfb/Makefile	2008-08-30 17:12:21.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
@@ -10,20 +10,20 @@ diff -Naur mesa-7.1.orig/src/mesa/drivers/directfb/Makefile mesa-7.1/src/mesa/dr
  
  
  .c.o:
-diff -Naur mesa-7.1.orig/src/mesa/drivers/dri/Makefile.template mesa-7.1/src/mesa/drivers/dri/Makefile.template
+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.1.orig/src/mesa/drivers/dri/Makefile.template	2008-08-30 17:04:52.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/drivers/dri/Makefile.template	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/drivers/dri/Makefile.template	2008-08-30 17:07:18.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_SOURCES = \
+ COMMON_GALLIUM_SOURCES = \
          ../common/utils.c \
-diff -Naur mesa-7.1.orig/src/mesa/drivers/fbdev/Makefile mesa-7.1/src/mesa/drivers/fbdev/Makefile
+diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/fbdev/Makefile mesa-7.5-rc2/src/mesa/drivers/fbdev/Makefile
---- mesa-7.1.orig/src/mesa/drivers/fbdev/Makefile	2008-08-30 17:04:52.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/drivers/fbdev/Makefile	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/drivers/fbdev/Makefile	2008-08-30 17:08:06.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
@@ -33,9 +33,9 @@ diff -Naur mesa-7.1.orig/src/mesa/drivers/fbdev/Makefile mesa-7.1/src/mesa/drive
  
  
  .c.o:
-diff -Naur mesa-7.1.orig/src/mesa/drivers/osmesa/Makefile mesa-7.1/src/mesa/drivers/osmesa/Makefile
+diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/osmesa/Makefile mesa-7.5-rc2/src/mesa/drivers/osmesa/Makefile
---- mesa-7.1.orig/src/mesa/drivers/osmesa/Makefile	2008-08-30 17:04:52.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/drivers/osmesa/Makefile	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-30 17:09:15.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
@@ -45,33 +45,33 @@ diff -Naur mesa-7.1.orig/src/mesa/drivers/osmesa/Makefile mesa-7.1/src/mesa/driv
  
  
  .PHONY: osmesa8
-diff -Naur mesa-7.1.orig/src/mesa/drivers/x11/Makefile mesa-7.1/src/mesa/drivers/x11/Makefile
+diff -Naur mesa-7.5-rc2.orig/src/mesa/drivers/x11/Makefile mesa-7.5-rc2/src/mesa/drivers/x11/Makefile
---- mesa-7.1.orig/src/mesa/drivers/x11/Makefile	2008-08-30 17:04:52.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/drivers/x11/Makefile	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/drivers/x11/Makefile	2008-08-30 17:10:53.000000000 +0200
++++ mesa-7.5-rc2/src/mesa/drivers/x11/Makefile	2009-05-16 21:16:36.000000000 +0200
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
- 	-I$(TOP)/src/mesa \
+ 	-I$(TOP)/src/mesa/main \
- 	-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.1.orig/src/mesa/Makefile mesa-7.1/src/mesa/Makefile
+diff -Naur mesa-7.5-rc2.orig/src/mesa/Makefile mesa-7.5-rc2/src/mesa/Makefile
---- mesa-7.1.orig/src/mesa/Makefile	2008-08-30 17:04:51.000000000 +0200
+--- mesa-7.5-rc2.orig/src/mesa/Makefile	2009-05-16 21:13:42.000000000 +0200
-+++ mesa-7.1/src/mesa/Makefile	2008-08-30 17:11:54.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 libglapi.a driver_subdirs
+-default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \
 +# libs (.so) and finally the device drivers:
-+default: depend asm_subdirs libmesa.so libglapi.so driver_subdirs
++default: depend asm_subdirs libmesa.so libmesagallium.so libglapi.so \
+ 	driver_subdirs
  
  
- 
+@@ -30,24 +30,24 @@
-@@ -29,17 +29,17 @@
  # Helper libraries used by many drivers:
  
  # Make archive of core mesa object files
@@ -80,21 +80,31 @@ diff -Naur mesa-7.1.orig/src/mesa/Makefile mesa-7.1/src/mesa/Makefile
 +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)
--	@ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
 +libglapi.so: $(GLAPI_OBJECTS)
-+	@ $(MKLIB) -o glapi -dlopen $(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))
+ 	@ (cd drivers && $(MAKE))
  
  
-@@ -127,7 +127,7 @@
+@@ -153,7 +153,7 @@
  clean:
  	-rm -f */*.o
  	-rm -f */*/*.o

packages/graphics/Mesa/23_mesa-no-mach64.diff

@@ -1,45 +0,0 @@
---- configure.ac.mach64	2008-09-05 13:53:24.000000000 +1000
-+++ configure.ac	2008-09-05 13:53:39.000000000 +1000
-@@ -656,7 +656,7 @@
-             # because there is no x86-64 system where they could *ever*
-             # be used.
-             if test "x$DRI_DIRS" = "xyes"; then
--                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
-+                DRI_DIRS="i915 i965 mga r128 r200 r300 radeon \
-                     savage tdfx unichrome swrast"
-             fi
-             ;;
-@@ -664,13 +664,13 @@
-             # Build only the drivers for cards that exist on PowerPC.
-             # At some point MGA will be added, but not yet.
-             if test "x$DRI_DIRS" = "xyes"; then
--                DRI_DIRS="mach64 r128 r200 r300 radeon tdfx swrast"
-+                DRI_DIRS="r128 r200 r300 radeon tdfx swrast"
-             fi
-             ;;
-         sparc*)
-             # Build only the drivers for cards that exist on sparc`
-             if test "x$DRI_DIRS" = "xyes"; then
--                DRI_DIRS="mach64 r128 r200 r300 radeon ffb swrast"
-+                DRI_DIRS="r128 r200 r300 radeon ffb swrast"
-             fi
-             ;;
-         esac
-@@ -689,7 +689,7 @@
-         # ffb and gamma are missing because they have not been converted
-         # to use the new interface.
-         if test "x$DRI_DIRS" = "xyes"; then
--            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
-+            DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon tdfx \
-                 unichrome savage sis swrast"
-         fi
-         ;;
-@@ -704,7 +704,7 @@
- 
-     # default drivers
-     if test "x$DRI_DIRS" = "xyes"; then
--        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-+        DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon s3v \
-             savage sis tdfx trident unichrome ffb swrast"
-     fi
- 

packages/graphics/Mesa/25_mesa-7.1-link-shared.diff

@@ -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:

packages/graphics/Mesa/build

@@ -5,13 +5,12 @@
 $SCRIPTS/build expat
 $SCRIPTS/build glproto
 $SCRIPTS/build dri2proto
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build libXext
 $SCRIPTS/build libXdamage
 $SCRIPTS/build libXfixes
 $SCRIPTS/build libXxf86vm
 $SCRIPTS/build libX11
-#$SCRIPTS/build libwsbm
 
 cd $PKG_BUILD
 HOST_CC=$HOST_CC \
@@ -27,7 +26,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
-            --disable-debug \
+            --enable-debug \
             --disable-selinux \
             --disable-xcb \
             --disable-glx-tls \
@@ -37,7 +36,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --disable-glu \
             --disable-glut \
             --disable-glw \
-            --enable-gallium \
+            --disable-gallium \
             --disable-motif \
             --with-driver=dri \
             --with-dri-drivers=$DRIDRIVERS \
@@ -50,10 +49,4 @@ make
 
 make -C progs/xdemos
 
-## copy GLX headers for xorg-server to build
+$MAKEINSTALL -C src/mesa
-#cp -PR include/* $LIB_PREFIX/include
-
-$MAKEINSTALL -C src/mesa
-#$MAKEINSTALL -C src/glu
-
-#DRI_DRIVER_INSTALL_DIR=$SYSROOT_PREFIX/$XORG_PATH_DRI

packages/graphics/Mesa/install

@@ -3,7 +3,7 @@
 . config/options
 
 $SCRIPTS/install libXdamage
-$SCRIPTS/install $LIBDRM
+$SCRIPTS/install libdrm
 $SCRIPTS/install expat
 $SCRIPTS/install libXext
 $SCRIPTS/install libXfixes
@@ -12,10 +12,11 @@ $SCRIPTS/install libX11
 
 mkdir -p $INSTALL/usr/lib
 cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib
+#cp -PR $PKG_BUILD/src/mesa/libmesa.so* $INSTALL/usr/lib
 #cp -PR $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri
-cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri
+cp -PR $PKG_BUILD/lib*/*_dri.so $INSTALL/usr/lib/dri
 
 mkdir -p $INSTALL/usr/bin
 cp -PR $PKG_BUILD/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin

packages/graphics/Mesa/patches/21_mesa-7.1-osmesa-version.diff

@@ -1,21 +0,0 @@
-diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
---- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx	2008-08-28 14:05:47.000000000 -0400
-+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-28 14:07:13.000000000 -0400
-@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
- 
- $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
- 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
- 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS)
-@@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
- # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
- osmesa16: $(OBJECTS) $(CORE_MESA)
- 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
- 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

packages/graphics/Mesa/patches/22_mesa-7.1-nukeglthread-debug.diff

@@ -1,15 +0,0 @@
-diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
---- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread	2008-08-25 10:49:40.000000000 -0400
-+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c	2008-08-28 14:26:17.000000000 -0400
-@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
-        return;
-    }
- 
--   DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
--       _glthread_GetID(),
--       att->Texture->Name, newImage->Width, newImage->Height,
--       irb->Base.RefCount);
--
-    /* point the renderbufer's region to the texture image region */
-    intel_image = intel_texture_image(newImage);
-    if (irb->region != intel_image->mt->region) {

packages/graphics/Mesa/patches/27_mesa-7.1-disable-intel-classic-warn.diff

@@ -1,15 +0,0 @@
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index cf09fad..572a28b 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -583,8 +583,8 @@ intel_init_bufmgr(intelScreenPrivate *intelScreen)
-       if (gem_disable) {
- 	 fprintf(stderr, "GEM disabled.  Using classic.\n");
-       } else {
--	 fprintf(stderr, "Failed to initialize GEM.  "
--		 "Falling back to classic.\n");
-+//	 fprintf(stderr, "Failed to initialize GEM.  "
-+//		 "Falling back to classic.\n");
-       }
- 
-       if (intelScreen->tex.size == 0) {

packages/graphics/libdrm/install

@@ -11,5 +11,5 @@ rm -rf $INSTALL/usr/lib/libdrm_intel*.so*T
 cp -PR $PKG_BUILD/libdrm/nouveau/.libs/libdrm_nouveau*.so* $INSTALL/usr/lib
 rm -rf $INSTALL/usr/lib/libdrm_nouveau*.so*T
 
-cp -PR $PKG_BUILD/libdrm/radeon/.libs/libdrm_radeon*.so* $INSTALL/usr/lib
+#cp -PR $PKG_BUILD/libdrm/radeon/.libs/libdrm_radeon*.so* $INSTALL/usr/lib
-rm -rf $INSTALL/usr/lib/libdrm_radeon*.so*T
+##rm -rf $INSTALL/usr/lib/libdrm_radeon*.so*T

packages/graphics/libdrm/nouveau-updates.diff

@@ -1,26 +0,0 @@
-diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
-index 023c6be..66466e3 100644
---- a/libdrm/nouveau/nouveau_bo.c
-+++ b/libdrm/nouveau/nouveau_bo.c
-@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
- 		nvbo->size = req.size;
- 		nvbo->handle = req.handle;
- 	}
-- 
-+
-+	nvbo->base.handle = nvbo->handle;
- 	return 0;
- } 
- 
-diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
-index 23da64b..b084f70 100644
---- a/libdrm/nouveau/nouveau_dma.c
-+++ b/libdrm/nouveau/nouveau_dma.c
-@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
- 	volatile int dum;
- 
- 	NOUVEAU_DMA_BARRIER;
-+	dum = nvchan->pushbuf[0];
- 	dum = READ_GET(nvchan);
- 
- 	*nvchan->put = put;

packages/graphics/libdrm/patches/libdrm-2.4.0-no-bc.diff

@@ -1,54 +0,0 @@
-diff -up libdrm-20080814/libdrm/xf86drm.c.no-bc libdrm-20080814/libdrm/xf86drm.c
---- libdrm-20080814/libdrm/xf86drm.c.no-bc	2008-08-14 15:43:09.000000000 +1000
-+++ libdrm-20080814/libdrm/xf86drm.c	2008-08-14 15:45:09.000000000 +1000
-@@ -396,11 +396,6 @@ int drmAvailable(void)
-     int           fd;
- 
-     if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
--#ifdef __linux__
--	/* Try proc for backward Linux compatibility */
--	if (!access("/proc/dri/0", R_OK))
--	    return 1;
--#endif
- 	return 0;
-     }
-     
-@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam
- 	}
-     }
- 
--#ifdef __linux__
--    /* Backward-compatibility /proc support */
--    for (i = 0; i < 8; i++) {
--	char proc_name[64], buf[512];
--	char *driver, *pt, *devstring;
--	int  retcode;
--	
--	sprintf(proc_name, "/proc/dri/%d/name", i);
--	if ((fd = open(proc_name, 0, 0)) >= 0) {
--	    retcode = read(fd, buf, sizeof(buf)-1);
--	    close(fd);
--	    if (retcode) {
--		buf[retcode-1] = '\0';
--		for (driver = pt = buf; *pt && *pt != ' '; ++pt)
--		    ;
--		if (*pt) { /* Device is next */
--		    *pt = '\0';
--		    if (!strcmp(driver, name)) { /* Match */
--			for (devstring = ++pt; *pt && *pt != ' '; ++pt)
--			    ;
--			if (*pt) { /* Found busid */
--			    return drmOpenByBusid(++pt);
--			} else { /* No busid */
--			    return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
--			}
--		    }
--		}
--	    }
--	}
--    }
--#endif
--
-     return -1;
- }
- 

packages/graphics/libdrm/patches/libdrm-make-dri-perms-okay.diff

@@ -1,12 +0,0 @@
-diff -up libdrm-20080303/libdrm/xf86drm.h.da libdrm-20080303/libdrm/xf86drm.h
---- libdrm-20080303/libdrm/xf86drm.h.da	2008-03-19 15:26:31.000000000 +1000
-+++ libdrm-20080303/libdrm/xf86drm.h	2008-03-19 15:26:46.000000000 +1000
-@@ -45,7 +45,7 @@
- /* Default /dev/dri directory permissions 0755 */
- #define DRM_DEV_DIRMODE	 	\
- 	(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
--#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
-+#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
- 
- #define DRM_DIR_NAME  "/dev/dri"
- #define DRM_DEV_NAME  "%s/card%d"

packages/sysutils/hal/build

@@ -66,8 +66,6 @@ cd $PKG_BUILD
             --without-usb-csr \
             --without-dell-backlight \
 
-#            --with-pid-file=/var/run/hald/hald.pid \
-
 make
 
 make -C libhal DESTDIR=$SYSROOT_PREFIX install

packages/sysutils/hal/install

@@ -10,81 +10,55 @@ $SCRIPTS/install dbus-glib
 $SCRIPTS/install gettext-dummy
 
 mkdir -p $INSTALL/usr/sbin
-cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/
+  cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/
 
 mkdir -p $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/lshal $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/lshal $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-device $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-device $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-disable-polling $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-disable-polling $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-find-by-capability $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-find-by-capability $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-find-by-property $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-find-by-property $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-get-property $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-get-property $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-lock $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-lock $INSTALL/usr/bin
-cp $PKG_BUILD/tools/.libs/hal-set-property $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/.libs/hal-set-property $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/libexec
-#cp $PKG_BUILD/tools/linux/.libs/hal-ipw-killswitch-linux $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec
-cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec
-#cp $PKG_BUILD/tools/.libs/hal-storage-umount $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec
-cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec
-cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec
-cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec
+  cp $PKG_BUILD/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec
-cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec
+  cp $PKG_BUILD/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec
-#cp $PKG_BUILD/tools/hal-system-setserial $INSTALL/usr/libexec
+  cp $PKG_BUILD/hald/hald-generate-fdi-cache $INSTALL/usr/libexec
-#cp $PKG_BUILD/tools/.libs/hal-system-power-pm-is-supported $INSTALL/usr/libexec
+  cp $PKG_BUILD/hald-runner/hald-runner $INSTALL/usr/libexec
-cp $PKG_BUILD/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec
-cp $PKG_BUILD/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec
-cp $PKG_BUILD/hald/hald-generate-fdi-cache $INSTALL/usr/libexec
-cp $PKG_BUILD/hald-runner/hald-runner $INSTALL/usr/libexec
 
 mkdir -p $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-luks-* $INSTALL/usr/lib/hal/scripts
+  cp $PKG_BUILD/tools/hal-functions $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-suspend $INSTALL/usr/lib/hal/scripts
+  cp $PKG_BUILD/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-suspend-hybrid $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-hibernate $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-shutdown $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-reboot $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-lcd-get-brightness $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-lcd-set-brightness $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-power-set-power-save $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-killswitch-get-power $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-killswitch-set-power $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-wol-supported $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-wol-enabled $INSTALL/usr/lib/hal/scripts
-#cp $PKG_BUILD/tools/hal-system-wol-enable $INSTALL/usr/lib/hal/scripts
-cp $PKG_BUILD/tools/hal-functions $INSTALL/usr/lib/hal/scripts
-cp $PKG_BUILD/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts
-
-#cp $PKG_BUILD/tools/.libs/hal-setup-keymap $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
-cp -PR $PKG_BUILD/libhal/.libs/libhal.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/libhal/.libs/libhal.so* $INSTALL/usr/lib
-cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/etc/udev/rules.d
+  cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/etc/udev/rules.d
+
+mkdir -p $INSTALL/etc/dbus-1/system.d
+  cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d
 
 mkdir -p $INSTALL/etc/hal/fdi/preprobe
 mkdir -p $INSTALL/etc/hal/fdi/information
 mkdir -p $INSTALL/etc/hal/fdi/policy
-
-mkdir -p $INSTALL/etc/udev/rules.d
-cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/etc/udev/rules.d
-
-mkdir -p $INSTALL/etc/dbus-1/system.d
-cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d
-
 mkdir -p $INSTALL/usr/share/hal/fdi/preprobe
 mkdir -p $INSTALL/usr/share/hal/fdi/information/10freedesktop
+
 mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor
-
-#cp $PKG_BUILD/fdi/information/10freedesktop/*.fdi \
-#   $INSTALL/usr/share/hal/fdi/information/10freedesktop
-#cp $PKG_BUILD/fdi/policy/10osvendor/*.fdi \
-#   $INSTALL/usr/share/hal/fdi/policy/10osvendor
-
 cp \
-$PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \
-$PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \
-$PKG_BUILD/fdi/policy/10osvendor/10-usbcsr-mice.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/10-usbcsr-mice.fdi \
-$PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \
-$PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \
-   $INSTALL/usr/share/hal/fdi/policy/10osvendor
+  $INSTALL/usr/share/hal/fdi/policy/10osvendor

packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff

@@ -0,0 +1,26 @@
+From a81c0756c48621fadd18597bb337e08c4c3529d0 Mon Sep 17 00:00:00 2001
+From: Yan Li <yan.i.li@intel.com>
+Date: Mon, 5 Jan 2009 17:16:03 +0800
+Subject: [PATCH] Linux should use evdev xkb rule
+
+
+Signed-off-by: Yan Li <yan.i.li@intel.com>
+---
+ fdi/policy/10osvendor/10-keymap.fdi |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/fdi/policy/10osvendor/10-keymap.fdi b/fdi/policy/10osvendor/10-keymap.fdi
+index c9ad87c..1971e8b 100644
+--- a/fdi/policy/10osvendor/10-keymap.fdi
++++ b/fdi/policy/10osvendor/10-keymap.fdi
+@@ -13,6 +13,7 @@
+       <merge key="input.xkb.model" type="string">keyboard</merge>
+       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+              string="Linux">
++        <merge key="input.xkb.rules" type="string">evdev</merge>
+         <merge key="input.xkb.model" type="string">evdev</merge>
+       </match>
+ 
+-- 
+1.5.6.5
+

packages/x11/app/xwd/build

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+
+make
+
+$STRIP $1

packages/x11/app/xwd/install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/usr/bin
+cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin

packages/x11/app/xwd/scripts/screenshot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Screenshot script
+#
+# Author Tómas Edwardsson <tommi@tommi.org>
+
+[ -f $HOME/noscreenshot ] && exit
+
+
+WHERE="$HOME/screenshots/`date +%Y/%m/%d`"
+FILE="$WHERE`date +/screenshot-%H%M`"
+
+mkdir -p $WHERE
+/usr/bin/xwd -display :0.0 -root -out $FILE.xwd
+
+#/usr/bin/convert  $FILE.xwd $FILE.png
+#/bin/rm -f $FILE.xwd

packages/x11/app/xwd/url

@@ -0,0 +1 @@
+http://xorg.freedesktop.org/archive/individual/app/xwd-1.0.2.tar.bz2

packages/x11/driver/xf86-input-synaptics/url

@@ -1 +1 @@
-http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.1.0.tar.bz2
+http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.1.1.tar.bz2

packages/x11/other/openbox/config/rc.xml

@@ -34,6 +34,11 @@
       <execute>reboot</execute>
     </action>
   </keybind>
+  <keybind key="C-A-s">
+    <action name="Execute">
+      <execute>screenshot</execute>
+    </action>
+  </keybind>
 </keyboard> 
 
 </openbox_config>

packages/x11/other/openbox/install

@@ -7,6 +7,8 @@ $SCRIPTS/install pango
 $SCRIPTS/install libXft
 $SCRIPTS/install libxml2
 
+$SCRIPTS/install xwd
+
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/bin