x11r7: update to 7.4

menuconfig BR2_PACKAGE_XORG7

bool "X.org X Window System, X11R7, release 7.3"

bool "X.org X Window System, X11R7, release 7.4"

default y if BR2_PACKAGE_XSERVER_x11r7

select BR2_PACKAGE_ZLIB

select BR2_PACKAGE_LIBPNG

		source package/x11r7/xlib_libxkbfile/Config.in

		source package/x11r7/xlib_libxkbui/Config.in

		source package/x11r7/xlib_xtrans/Config.in

		source package/x11r7/xlib_libpciaccess/Config.in

	endmenu

	menu "X11R7 Applications"

		source package/x11r7/xapp_appres/Config.in

		source package/x11r7/xapp_viewres/Config.in

		source package/x11r7/xapp_x11perf/Config.in

		source package/x11r7/xapp_xauth/Config.in

		source package/x11r7/xapp_xbacklight/Config.in

		source package/x11r7/xapp_xbiff/Config.in

		source package/x11r7/xapp_xcalc/Config.in

		source package/x11r7/xapp_xclipboard/Config.in

		source package/x11r7/xapp_xgc/Config.in

		source package/x11r7/xapp_xhost/Config.in

		source package/x11r7/xapp_xinit/Config.in

		source package/x11r7/xapp_xinput/Config.in

		source package/x11r7/xapp_xkbcomp/Config.in

		source package/x11r7/xapp_xkbevd/Config.in

		source package/x11r7/xapp_xkbprint/Config.in

	endmenu

	if BR2_PACKAGE_XSERVER_xorg

	menu "X11R7 Drivers"

		source package/x11r7/openchrome/Config.in

		source package/x11r7/xdriver_xf86-input-acecad/Config.in

		source package/x11r7/xdriver_xf86-input-aiptek/Config.in

		source package/x11r7/xdriver_xf86-input-calcomp/Config.in

		source package/x11r7/xdriver_xf86-input-citron/Config.in

		source package/x11r7/xdriver_xf86-input-digitaledge/Config.in

		source package/x11r7/xdriver_xf86-input-dmc/Config.in

		source package/x11r7/xdriver_xf86-input-dynapro/Config.in

		source package/x11r7/xdriver_xf86-input-elo2300/Config.in

		source package/x11r7/xdriver_xf86-input-elographics/Config.in

		source package/x11r7/xdriver_xf86-input-evdev/Config.in

		source package/x11r7/xdriver_xf86-input-fpit/Config.in

		source package/x11r7/xdriver_xf86-input-hyperpen/Config.in

		source package/x11r7/xdriver_xf86-input-jamstudio/Config.in

		source package/x11r7/xdriver_xf86-input-joystick/Config.in

		source package/x11r7/xdriver_xf86-input-keyboard/Config.in

		source package/x11r7/xdriver_xf86-input-magellan/Config.in

		source package/x11r7/xdriver_xf86-input-magictouch/Config.in

		source package/x11r7/xdriver_xf86-input-microtouch/Config.in

		source package/x11r7/xdriver_xf86-input-mouse/Config.in

		source package/x11r7/xdriver_xf86-input-mutouch/Config.in

		source package/x11r7/xdriver_xf86-input-palmax/Config.in

		source package/x11r7/xdriver_xf86-input-penmount/Config.in

		source package/x11r7/xdriver_xf86-input-spaceorb/Config.in

		source package/x11r7/xdriver_xf86-input-summa/Config.in

		source package/x11r7/xdriver_xf86-input-synaptics/Config.in

		source package/x11r7/xdriver_xf86-input-tek4957/Config.in

		source package/x11r7/xdriver_xf86-input-ur98/Config.in

		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in

		source package/x11r7/xdriver_xf86-input-void/Config.in

		source package/x11r7/xdriver_xf86-video-apm/Config.in

		source package/x11r7/xdriver_xf86-video-ati/Config.in

		source package/x11r7/xdriver_xf86-video-chips/Config.in

		source package/x11r7/xdriver_xf86-video-cirrus/Config.in

		source package/x11r7/xdriver_xf86-video-cyrix/Config.in

		source package/x11r7/xdriver_xf86-video-dummy/Config.in

		source package/x11r7/xdriver_xf86-video-fbdev/Config.in

		source package/x11r7/xdriver_xf86-video-geode/Config.in

		source package/x11r7/xdriver_xf86-video-glide/Config.in

		source package/x11r7/xdriver_xf86-video-glint/Config.in

		source package/x11r7/xdriver_xf86-video-i128/Config.in

		source package/x11r7/xdriver_xf86-video-i740/Config.in

		source package/x11r7/xdriver_xf86-video-i810/Config.in

		source package/x11r7/xdriver_xf86-video-imstt/Config.in

		source package/x11r7/xdriver_xf86-video-impact/Config.in

		source package/x11r7/xdriver_xf86-video-intel/Config.in

		source package/x11r7/xdriver_xf86-video-mach64/Config.in

		source package/x11r7/xdriver_xf86-video-mga/Config.in

		source package/x11r7/xdriver_xf86-video-neomagic/Config.in

		source package/x11r7/xdriver_xf86-video-newport/Config.in

		source package/x11r7/xdriver_xf86-video-nsc/Config.in

		source package/x11r7/xdriver_xf86-video-nv/Config.in

		source package/x11r7/xdriver_xf86-video-openchrome/Config.in

		source package/x11r7/xdriver_xf86-video-r128/Config.in

		source package/x11r7/xdriver_xf86-video-rendition/Config.in

		source package/x11r7/xdriver_xf86-video-s3/Config.in

		source package/x11r7/xdriver_xf86-video-s3virge/Config.in

		source package/x11r7/xdriver_xf86-video-trident/Config.in

		source package/x11r7/xdriver_xf86-video-tseng/Config.in

		source package/x11r7/xdriver_xf86-video-v4l/Config.in

		source package/x11r7/xdriver_xf86-video-vermilion/Config.in

		source package/x11r7/xdriver_xf86-video-vesa/Config.in

		source package/x11r7/xdriver_xf86-video-vga/Config.in

		source package/x11r7/xdriver_xf86-video-via/Config.in

		source package/x11r7/xdriver_xf86-video-vmware/Config.in

		source package/x11r7/xdriver_xf86-video-voodoo/Config.in

		source package/x11r7/xdriver_xf86-video-wsfb/Config.in

		source package/x11r7/xdriver_xf86-video-xgi/Config.in

		source package/x11r7/xdriver_xf86-video-xgixp/Config.in

	endmenu

	endif

	menu "X11R7 Fonts"

diff -Nwrup Mesa-7.0.3/src/mesa/Makefile~ Mesa-7.0.3-fix/src/mesa/Makefile~

--- Mesa-7.0.3/src/mesa/Makefile~	2007-11-01 11:30:52.000000000 -0400

+++ Mesa-7.0.3-fix/src/mesa/Makefile~	1969-12-31 19:00:00.000000000 -0500

@@ -1,201 +0,0 @@

-# src/mesa/Makefile

-

-TOP = ../..

-include $(TOP)/configs/current

-

-include sources

-

-

-GL_MAJOR = 1

-GL_MINOR = 5

-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)

-

-

-.SUFFIXES : .cpp

-

-.c.o:

-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@

-

-.cpp.o:

-	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@

-

-.S.o:

-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@

-

-

-# Figure out what to make here

-default:

-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \

-		$(MAKE) linux-solo ; \

-	elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-		$(MAKE) osmesa-only ; \

-	elif [ "$(DRIVER_DIRS)" = "beos" ]; then \

-		$(MAKE) beos ; \

-	elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \

-		$(MAKE) directfb ; \

-	elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \

-		$(MAKE) fbdev ; $(MAKE) osmesa-only ; \

-	else \

-		$(MAKE) stand-alone ; \

-	fi

-

-

-######################################################################

-# BeOS driver target

-

-beos: depend subdirs libmesa.a

-	cd drivers/beos; $(MAKE)

-

-

-######################################################################

-# Linux DRI drivers

-

-# Make archive of core object files

-libmesa.a: $(SOLO_OBJECTS)

-	@ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);

-	@if [ "${CONFIG_NAME}" = "beos" ] ; then \

-		mimeset -f "$@" ; \

-	fi

-

-linux-solo: depend subdirs libmesa.a

-	cd drivers/dri ; $(MAKE)

-

-

-#####################################################################

-# Stand-alone Mesa libGL, no built-in drivers (DirectFB)

-

-libgl-core: $(CORE_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS) \

-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \

-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \

-		$(GL_LIB_DEPS)

-

-directfb: depend subdirs libgl-core

-	cd drivers/directfb ; $(MAKE)

-

-

-#####################################################################

-# fbdev Mesa driver (libGL.so)

-

-fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \

-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \

-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-		$(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \

-		$(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)

-

-

-######################################################################

-# Stand-alone Mesa libGL and libOSMesa

-STAND_ALONE_DRIVER_SOURCES = \

-	$(COMMON_DRIVER_SOURCES) \

-	$(X11_DRIVER_SOURCES)

-

-STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)

-

-STAND_ALONE_OBJECTS = \

-	$(CORE_OBJECTS) \

-	$(STAND_ALONE_DRIVER_OBJECTS)

-

-# For libOSMesa16 or libOSMesa32 we link _all_ the objects into the library,

-# not just the osmesa.o object (i.e. we don't have a libGL).

-OSMESA16_OBJECTS = \

-	$(CORE_OBJECTS) \

-	$(COMMON_DRIVER_OBJECTS) \

-	$(OSMESA_DRIVER_OBJECTS)

-

-

-stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)

-

-osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)

-

-# Make the GL library

-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \

-		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \

-		-install $(TOP)/$(LIB_DIR) \

-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)

-

-# Make the OSMesa library

-# Note: version is kept at 6.5.3 to simplify app/linking issues

-$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)

-	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-			-ldflags '$(LDFLAGS)' \

-			-major 6 -minor 5 -patch 3 \

-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \

-	else \

-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-			-ldflags '$(LDFLAGS)' \

-			-major 6 -minor 5 -patch 3 \

-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \

-	fi

-

-

-######################################################################

-# libGL pkg-config file

-pcedit = sed \

-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \

-	-e 's,@LIB_DIR@,$(LIB_DIR),' \

-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'

-gl.pc: gl.pc.in

-	$(pcedit) $< > $@

-

-######################################################################

-# Generic stuff

-

-depend: $(ALL_SOURCES)

-	@ echo "running $(MKDEP)"

-	@ touch depend

-	@$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \

-		> /dev/null 2>/dev/null

-

-

-subdirs:

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \

-		(cd x86 ; $(MAKE)) ; \

-	fi

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \

-		(cd x86 ; $(MAKE)) ; \

-		(cd x86-64 ; $(MAKE)) ; \

-	fi

-

-

-install: default gl.pc

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig

-	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL

-	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \

-		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \

-	fi

-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig

-	@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \

-		$(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \

-	fi

-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \

-		cd drivers/dri ; $(MAKE) install ; \

-	fi

-

-## NOT INSTALLED YET:

-## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES

-## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

-

-clean:

-	-rm -f */*.o

-	-rm -f */*/*.o

-	-rm -f depend depend.bak libmesa.a

-	-rm -f drivers/*/*.o

-	(cd drivers/dri ; $(MAKE) clean)

-	(cd x86 ; $(MAKE) clean)

-	(cd x86-64 ; $(MAKE) clean)

-

-

-include depend

diff -Nwrup Mesa-7.0.3/src/mesa/Makefile.orig Mesa-7.0.3-fix/src/mesa/Makefile.orig

--- Mesa-7.0.3/src/mesa/Makefile.orig	2007-09-12 12:03:23.000000000 -0400

+++ Mesa-7.0.3-fix/src/mesa/Makefile.orig	1969-12-31 19:00:00.000000000 -0500

@@ -1,194 +0,0 @@

-# src/mesa/Makefile

-

-TOP = ../..

-include $(TOP)/configs/current

-

-include sources

-

-

-GL_MAJOR = 1

-GL_MINOR = 5

-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)

-

-

-.SUFFIXES : .cpp

-

-.c.o:

-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@

-

-.cpp.o:

-	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@

-

-.S.o:

-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@

-

-

-# Figure out what to make here

-default:

-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \

-		$(MAKE) linux-solo ; \

-	elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-		$(MAKE) osmesa-only ; \

-	elif [ "$(DRIVER_DIRS)" = "beos" ]; then \

-		$(MAKE) beos ; \

-	elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \

-		$(MAKE) directfb ; \

-	elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \

-		$(MAKE) fbdev ; $(MAKE) osmesa-only ; \

-	else \

-		$(MAKE) stand-alone ; \

-	fi

-

-

-######################################################################

-# BeOS driver target

-

-beos: depend subdirs libmesa.a

-	cd drivers/beos; $(MAKE)

-

-

-######################################################################

-# Linux DRI drivers

-

-# Make archive of core object files

-libmesa.a: $(SOLO_OBJECTS)

-	@ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);

-	@if [ "${CONFIG_NAME}" = "beos" ] ; then \

-		mimeset -f "$@" ; \

-	fi

-

-linux-solo: depend subdirs libmesa.a

-	cd drivers/dri ; $(MAKE)

-

-

-#####################################################################

-# Stand-alone Mesa libGL, no built-in drivers (DirectFB)

-

-libgl-core: $(CORE_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \

-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \

-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \

-		$(GL_LIB_DEPS)

-

-directfb: depend subdirs libgl-core

-	cd drivers/directfb ; $(MAKE)

-

-

-#####################################################################

-# fbdev Mesa driver (libGL.so)

-

-fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \

-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \

-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-		$(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \

-		$(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)

-

-

-######################################################################

-# Stand-alone Mesa libGL and libOSMesa

-STAND_ALONE_DRIVER_SOURCES = \

-	$(COMMON_DRIVER_SOURCES) \

-	$(X11_DRIVER_SOURCES)

-

-STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)

-

-STAND_ALONE_OBJECTS = \

-	$(CORE_OBJECTS) \

-	$(STAND_ALONE_DRIVER_OBJECTS)

-

-# For libOSMesa16 or libOSMesa32 we link _all_ the objects into the library,

-# not just the osmesa.o object (i.e. we don't have a libGL).

-OSMESA16_OBJECTS = \

-	$(CORE_OBJECTS) \

-	$(COMMON_DRIVER_OBJECTS) \

-	$(OSMESA_DRIVER_OBJECTS)

-

-

-stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)

-

-osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)

-

-# Make the GL library

-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)

-	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \

-		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \

-		-install $(TOP)/$(LIB_DIR) \

-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)

-

-# Make the OSMesa library

-# Note: version is kept at 6.5.3 to simplify app/linking issues

-$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)

-	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-			-major 6 -minor 5 -patch 3 \

-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \

-	else \

-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-			-major 6 -minor 5 -patch 3 \

-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \

-	fi

-

-

-######################################################################

-# libGL pkg-config file

-pcedit = sed \

-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \

-	-e 's,@LIB_DIR@,$(LIB_DIR),' \

-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'

-gl.pc: gl.pc.in

-	$(pcedit) $< > $@

-

-######################################################################

-# Generic stuff

-

-depend: $(ALL_SOURCES)

-	@ echo "running $(MKDEP)"

-	@ touch depend

-	@$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \

-		> /dev/null 2>/dev/null

-

-

-subdirs:

-	@ (cd x86 ; $(MAKE))

-	@ (cd x86-64 ; $(MAKE))

-

-

-install: default gl.pc

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig

-	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL

-	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \

-		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \

-	fi

-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig

-	@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \

-		$(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \

-	fi

-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \

-		cd drivers/dri ; $(MAKE) install ; \

-	fi

-

-## NOT INSTALLED YET:

-## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES

-## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

-

-clean:

-	-rm -f */*.o

-	-rm -f */*/*.o

-	-rm -f depend depend.bak libmesa.a

-	-rm -f drivers/*/*.o

-	(cd drivers/dri ; $(MAKE) clean)

-	(cd x86 ; $(MAKE) clean)

-	(cd x86-64 ; $(MAKE) clean)

-

-

-include depend

diff -Nwrup Mesa-7.0.3/src/mesa/Makefile.rej Mesa-7.0.3-fix/src/mesa/Makefile.rej

--- Mesa-7.0.3/src/mesa/Makefile.rej	2007-09-28 20:43:28.000000000 -0400

+++ Mesa-7.0.3-fix/src/mesa/Makefile.rej	1969-12-31 19:00:00.000000000 -0500

@@ -1,29 +0,0 @@

-***************

-*** 120,132 ****

-  $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)

-  	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-  		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-- 			-major $(MESA_MAJOR) \

-  			-minor $(MESA_MINOR) -patch $(MESA_TINY) \

-  			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-  			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \

-  	else \

-  		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-- 			-major $(MESA_MAJOR) \

-  			-minor $(MESA_MINOR) -patch $(GL_TINY) \

-  			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-  			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \

---- 120,132 ----

-  $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)

-  	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \

-  		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-+ 			-ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \

-  			-minor $(MESA_MINOR) -patch $(MESA_TINY) \

-  			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-  			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \

-  	else \

-  		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \

-+ 			-ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \

-  			-minor $(MESA_MINOR) -patch $(GL_TINY) \

-  			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \

-  			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \

--- a/src/mesa/x86/Makefile	2007-06-09 06:23:46.000000000 +0200

+++ b/src/mesa/x86/Makefile	2007-06-09 06:24:53.000000000 +0200

@@ -21,7 +21,7 @@

 gen_matypes: gen_matypes.c

-	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes

+	$(CC_FOR_BUILD) $(INCLUDE_DIRS) $(CFLAGS_FOR_BUILD) gen_matypes.c -o gen_matypes

 # need some special rules here, unfortunately

 matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes

# mesa3d

#

#############################################################

MESA3D_VERSION:=7.0.3

MESA3D_VERSION:=7.2

MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz

MESA3D_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mesa3d

MESA3D_DIR:=$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)

	rm -Rf $(TARGET_DIR)/usr/include/GL

	touch $@

mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm

mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm xlib_libpciaccess

mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE)

mesa3d-configure: $(MESA3D_DIR)/.configured

mesa3d-build: $(MESA3D_DIR)/.built

#

################################################################################

XAPP_BITMAP_VERSION = 1.0.2

XAPP_BITMAP_VERSION = 1.0.3

XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2

XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app

XAPP_BITMAP_AUTORECONF = NO