Patch by Dan Lykowski <lykowdk@gmail.com>, closes #181.
Minor fixups for kdrive by me.
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"
+++ /dev/null
-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) ; \
+++ /dev/null
---- 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
+++ /dev/null
-config BR2_PACKAGE_OPENCHROME
- bool "openchrome"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXVMC
- select BR2_PACKAGE_XPROTO_GLPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- Openchrome, A free and Open Source video driver for the VIA/S3G
- UniChrome and UniChrome Pro graphics chipsets.
+++ /dev/null
---- a/configure.ac 2008-04-09 15:42:55.000000000 -0400
-+++ b/configure.ac 2008-06-23 09:39:06.000000000 -0400
-@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t
- fi
-
- if test "$DRI" != no; then
-+ if test "$cross_compiling" = "no" ; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
-@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC])
-
- AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
-
--AC_CHECK_FILE([${sdkdir}/xf86Module.h],
-- [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
-+if test "$cross_compiling" = "no" ; then
-+ AC_CHECK_FILE([${sdkdir}/xf86Module.h],
-+ [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
-+else
-+ have_xf86Module_h="yes"
-+fi
-
- # Check the ABI_VIDEODRV_VERSION
- SAVE_CFLAGS="$CFLAGS"
+++ /dev/null
-#############################################################
-#
-# openchrome
-#
-#############################################################
-OPENCHROME_VERSION = 0.2.902
-OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2
-OPENCHROME_SITE = http://www.openchrome.org/releases
-
-OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-
-OPENCHROME_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-OPENCHROME_AUTORECONF = YES
-OPENCHROME_CONF_OPT = --enable-shared --disable-static
-
-$(eval $(call AUTOTARGETS,package/x11r7,openchrome))
#
################################################################################
-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
#
################################################################################
-XAPP_LUIT_VERSION = 1.0.2
+XAPP_LUIT_VERSION = 1.0.3
XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LUIT_AUTORECONF = NO
#
################################################################################
-XAPP_MKFONTDIR_VERSION = 1.0.3
+XAPP_MKFONTDIR_VERSION = 1.0.4
XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTDIR_AUTORECONF = NO
#
################################################################################
-XAPP_MKFONTSCALE_VERSION = 1.0.3
+XAPP_MKFONTSCALE_VERSION = 1.0.5
XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTSCALE_AUTORECONF = NO
#
################################################################################
-XAPP_SESSREG_VERSION = 1.0.3
+XAPP_SESSREG_VERSION = 1.0.4
XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SESSREG_AUTORECONF = NO
#
################################################################################
-XAPP_X11PERF_VERSION = 1.4.1
+XAPP_X11PERF_VERSION = 1.5
XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_X11PERF_AUTORECONF = NO
+++ /dev/null
---- xauth-1.0.2/configure.ac.orig 2007-06-06 22:33:44.000000000 +0200
-+++ xauth-1.0.2/configure.ac 2007-06-06 22:33:57.000000000 +0200
-@@ -40,7 +40,7 @@
- AC_CHECK_HEADERS([net/errno.h])
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-+PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu xcb)
- AC_SUBST(XAUTH_CFLAGS)
- AC_SUBST(XAUTH_LIBS)
-
--- /dev/null
+--- xauth-1.0.3/configure.ac.orig 2007-06-06 22:33:44.000000000 +0200
++++ xauth-1.0.3/configure.ac 2007-06-06 22:33:57.000000000 +0200
+@@ -40,7 +40,7 @@
+ AC_CHECK_HEADERS([net/errno.h])
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
++PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu xcb)
+ AC_SUBST(XAUTH_CFLAGS)
+ AC_SUBST(XAUTH_LIBS)
+
#
################################################################################
-XAPP_XAUTH_VERSION = 1.0.2
+XAPP_XAUTH_VERSION = 1.0.3
XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XAUTH_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XAPP_XBACKLIGHT
+ bool "xbacklight"
+ select BR2_PACKAGE_XLIB_LIBX11
+ help
+ xbacklight 1.1
+ xbacklight
--- /dev/null
+################################################################################
+#
+# xapp_backlight -- xbacklight
+#
+################################################################################
+
+XAPP_XBACKLIGHT_VERSION = 1.1
+XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
+XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XBACKLIGHT_AUTORECONF = NO
+XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbacklight))
#
################################################################################
-XAPP_XDPYINFO_VERSION = 1.0.1
+XAPP_XDPYINFO_VERSION = 1.0.3
XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDPYINFO_AUTORECONF = NO
#
################################################################################
-XAPP_XEV_VERSION = 1.0.1
+XAPP_XEV_VERSION = 1.0.3
XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEV_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XAPP_XINPUT
+ bool "xinput"
+ select BR2_PACKAGE_XLIB_LIBX11
+ help
+ xinput 1.3.0
+ xinput
--- /dev/null
+################################################################################
+#
+# xapp_xinput -- xinput
+#
+################################################################################
+
+XAPP_XINPUT_VERSION = 1.3.0
+XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
+XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XINPUT_AUTORECONF = NO
+XAPP_XINPUT_DEPENDENCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
#
################################################################################
-XAPP_XKBCOMP_VERSION = 1.0.3
+XAPP_XKBCOMP_VERSION = 1.0.5
XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBCOMP_AUTORECONF = NO
#
################################################################################
-XAPP_XPR_VERSION = 1.0.1
+XAPP_XPR_VERSION = 1.0.2
XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPR_AUTORECONF = NO
#
################################################################################
-XAPP_XPROP_VERSION = 1.0.3
+XAPP_XPROP_VERSION = 1.0.4
XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPROP_AUTORECONF = NO
+++ /dev/null
---- a/xrandr.c.orig 2008-02-02 17:09:45.000000000 -0500
-+++ b/xrandr.c 2008-02-02 17:04:51.000000000 -0500
-@@ -189,7 +189,7 @@ reflection_name (Rotation rotation)
-
- #if HAS_RANDR_1_2
- typedef enum _policy {
-- clone, extend
-+ clone1, extend
- } policy_t;
-
- typedef enum _relation {
-@@ -1602,7 +1602,7 @@ main (int argc, char **argv)
- int ret = 0;
- #if HAS_RANDR_1_2
- output_t *output = NULL;
-- policy_t policy = clone;
-+ policy_t policy = clone1;
- Bool setit_1_2 = False;
- Bool query_1_2 = False;
- Bool modeit = False;
-@@ -1863,7 +1863,7 @@ main (int argc, char **argv)
- continue;
- }
- if (!strcmp ("--clone", argv[i])) {
-- policy = clone;
-+ policy = clone1;
- setit_1_2 = True;
- continue;
- }
--- /dev/null
+--- a/xrandr.c.orig 2008-02-02 17:09:45.000000000 -0500
++++ b/xrandr.c 2008-02-02 17:04:51.000000000 -0500
+@@ -189,7 +189,7 @@ reflection_name (Rotation rotation)
+
+ #if HAS_RANDR_1_2
+ typedef enum _policy {
+- clone, extend
++ clone1, extend
+ } policy_t;
+
+ typedef enum _relation {
+@@ -1602,7 +1602,7 @@ main (int argc, char **argv)
+ int ret = 0;
+ #if HAS_RANDR_1_2
+ output_t *output = NULL;
+- policy_t policy = clone;
++ policy_t policy = clone1;
+ Bool setit_1_2 = False;
+ Bool query_1_2 = False;
+ Bool modeit = False;
+@@ -1863,7 +1863,7 @@ main (int argc, char **argv)
+ continue;
+ }
+ if (!strcmp ("--clone", argv[i])) {
+- policy = clone;
++ policy = clone1;
+ setit_1_2 = True;
+ continue;
+ }
#
################################################################################
-XAPP_XRANDR_VERSION = 1.2.2
+XAPP_XRANDR_VERSION = 1.2.3
XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRANDR_AUTORECONF = NO
#
################################################################################
-XAPP_XRDB_VERSION = 1.0.4
+XAPP_XRDB_VERSION = 1.0.5
XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRDB_AUTORECONF = NO
#
################################################################################
-XAPP_XSET_VERSION = 1.0.3
+XAPP_XSET_VERSION = 1.0.4
XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSET_AUTORECONF = NO
#
################################################################################
-XAPP_XWD_VERSION = 1.0.1
+XAPP_XWD_VERSION = 1.0.2
XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWD_AUTORECONF = NO
#
################################################################################
-XAPP_XWININFO_VERSION = 1.0.3
+XAPP_XWININFO_VERSION = 1.0.4
XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWININFO_AUTORECONF = NO
XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
+XCB_UTIL_DEPENDENCIES += gperf
+
$(eval $(call AUTOTARGETS,package/x11r7,xcb-util))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_CALCOMP
- bool "xf86-input-calcomp"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-calcomp 1.1.0
- Calcomp input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-calcomp -- Calcomp input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.2
-XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = NO
-XDRIVER_XF86_INPUT_CALCOMP_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_CALCOMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-calcomp))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_CITRON
- bool "xf86-input-citron"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-citron 2.2.0
- X.Org driver for citron input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-citron -- X.Org driver for citron input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.1
-XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_CITRON_AUTORECONF = NO
-XDRIVER_XF86_INPUT_CITRON_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_CITRON_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-citron))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_DIGITALEDGE
- bool "xf86-input-digitaledge"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-digitaledge 1.1.0
- X.Org driver for digitaledge input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-digitaledge -- X.Org driver for digitaledge input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION = 1.1.0
-XDRIVER_XF86_INPUT_DIGITALEDGE_SOURCE = xf86-input-digitaledge-$(XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_DIGITALEDGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_DIGITALEDGE_AUTORECONF = NO
-XDRIVER_XF86_INPUT_DIGITALEDGE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_DIGITALEDGE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-digitaledge))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_DMC
- bool "xf86-input-dmc"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-dmc 1.1.0
- DMC input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-dmc -- DMC input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.2
-XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_DMC_AUTORECONF = NO
-XDRIVER_XF86_INPUT_DMC_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_DMC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-dmc))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_DYNAPRO
- bool "xf86-input-dynapro"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-dynapro 1.1.0
- Dynapro input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-dynapro -- Dynapro input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.2
-XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = NO
-XDRIVER_XF86_INPUT_DYNAPRO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_DYNAPRO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-dynapro))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELO2300
- bool "xf86-input-elo2300"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-elo2300 1.1.0
- X.Org driver for elo2300 input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-elo2300 -- X.Org driver for elo2300 input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.2
-XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = NO
-XDRIVER_XF86_INPUT_ELO2300_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_ELO2300_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-elo2300))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELOGRAPHICS
- bool "xf86-input-elographics"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-elographics 1.0.0.5
- Elographics input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-elographics -- Elographics input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.2.1
-XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = NO
-XDRIVER_XF86_INPUT_ELOGRAPHICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_ELOGRAPHICS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-elographics))
+++ /dev/null
-From: Zephaniah E. Hull <warp@aehallh.com>
-Date: Sun, 14 May 2006 11:55:50 +0000 (+0000)
-Subject: Tweak credits and references.
-X-Git-Tag: xf86-video-impact-0_2_0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591
-
-Tweak credits and references.
-Change the longs to unsigned longs in the bitfields.
-Cleanup our includes.
-Stop pulling in asm/types.h and asm/bitops.h.
-Conditionally define the stuff that used to come from the above, including
- our own test_bit, set_bit and clear_bit.
-Change the longs to unsigned longs in the bitfields.
-Change the longs to unsigned longs in the bitfields.
-Use the bitop defines in evdev.h properly.
-Change the longs to unsigned longs in the bitfields.
-Change the longs to unsigned longs in the bitfields.
-Use the bitop defines in evdev.h properly.
-Change the longs to unsigned longs in the bitfields.
-Use the bitop defines in evdev.h properly.
-Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
- <fabbione@ubuntu.com>)
----
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,37 @@
-+2006-05-14 Zephaniah E. Hull <warp@aehallh.com>
-+
-+ * man/evdev.man:
-+ Tweak credits and references.
-+ * src/evdev.c: (EvdevParseBits), (EvdevParseBitOption),
-+ (EvdevCorePreInit):
-+ Change the longs to unsigned longs in the bitfields.
-+
-+ Cleanup our includes.
-+ * src/evdev.h:
-+ Stop pulling in asm/types.h and asm/bitops.h.
-+
-+ Conditionally define the stuff that used to come from
-+ the above, including our own test_bit, set_bit and clear_bit.
-+
-+ Change the longs to unsigned longs in the bitfields.
-+ * src/evdev_axes.c: (EvdevAxisAbsNew), (EvdevAxisRelNew):
-+ Change the longs to unsigned longs in the bitfields.
-+
-+ Use the bitop defines in evdev.h properly.
-+ * src/evdev_brain.c: (MatchAll), (MatchNot), (MatchAny):
-+ Change the longs to unsigned longs in the bitfields.
-+ * src/evdev_btn.c: (EvdevBtnNew):
-+ Change the longs to unsigned longs in the bitfields.
-+
-+ Use the bitop defines in evdev.h properly.
-+ * src/evdev_key.c: (EvdevKeyNew):
-+ Change the longs to unsigned longs in the bitfields.
-+
-+ Use the bitop defines in evdev.h properly.
-+ * src/inotify-syscalls.h:
-+ Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
-+ <fabbione@ubuntu.com>)
-+
- 2006-04-30 Zephaniah E. Hull <warp@aehallh.com>
-
- * configure.ac:
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -61,8 +61,6 @@
- #include <X11/XF86keysym.h>
- #include <X11/extensions/XIproto.h>
-
--#include <string.h>
--
- #include "evdev.h"
-
- #include <xf86.h>
-@@ -328,7 +326,7 @@ EvdevNew(evdevDriverPtr driver, evdevDev
- }
-
- static void
--EvdevParseBits (char *in, long *out, int len)
-+EvdevParseBits (char *in, unsigned long *out, int len)
- {
- unsigned long v[2];
- int n, i, max_bits = len * BITS_PER_LONG;
-@@ -351,7 +349,7 @@ EvdevParseBits (char *in, long *out, int
- }
-
- static void
--EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len)
-+EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len)
- {
- char *cur, *next;
-
-@@ -395,7 +393,7 @@ EvdevCorePreInit(InputDriverPtr drv, IDe
- EvdevParseBitOption (tmp, pEvdev->all_bits.field, \
- pEvdev->not_bits.field, \
- pEvdev->any_bits.field, \
-- sizeof(pEvdev->not_bits.field) / sizeof (long)); \
-+ sizeof(pEvdev->not_bits.field) / sizeof (unsigned long)); \
- free (tmp); \
- }
- bitoption(ev);
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -72,20 +72,29 @@
- #include <stdarg.h>
- #include <xf86Xinput.h>
-
-+#ifndef BITS_PER_LONG
- #define BITS_PER_LONG (sizeof(long) * 8)
-+#endif
-+
- #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
--#define OFF(x) ((x)%BITS_PER_LONG)
--#define LONG(x) ((x)/BITS_PER_LONG)
--#define BIT(x) (1UL<<((x)%BITS_PER_LONG))
--#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
-+#define LONG(x) ((x) >> (sizeof(unsigned long) + 1))
-+#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1)))
-+
-+#ifndef test_bit
-+#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit))
-+#endif
-+#ifndef set_bit
-+#define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit))
-+#endif
-+#ifndef clear_bit
-+#define clear_bit(bit, array) (array[LONG(bit)] &= ~MASK(bit))
-+#endif
-
- /* 2.4 compatibility */
- #ifndef EVIOCGSW
-
- #include <sys/time.h>
- #include <sys/ioctl.h>
--#include <asm/types.h>
--#include <asm/bitops.h>
-
- #define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len) /* get all switch states */
-
-@@ -128,14 +137,14 @@
- #define EVDEV_MAXBUTTONS 96
-
- typedef struct {
-- long ev[NBITS(EV_MAX)];
-- long key[NBITS(KEY_MAX)];
-- long rel[NBITS(REL_MAX)];
-- long abs[NBITS(ABS_MAX)];
-- long msc[NBITS(MSC_MAX)];
-- long led[NBITS(LED_MAX)];
-- long snd[NBITS(SND_MAX)];
-- long ff[NBITS(FF_MAX)];
-+ unsigned long ev[NBITS(EV_MAX)];
-+ unsigned long key[NBITS(KEY_MAX)];
-+ unsigned long rel[NBITS(REL_MAX)];
-+ unsigned long abs[NBITS(ABS_MAX)];
-+ unsigned long msc[NBITS(MSC_MAX)];
-+ unsigned long led[NBITS(LED_MAX)];
-+ unsigned long snd[NBITS(SND_MAX)];
-+ unsigned long ff[NBITS(FF_MAX)];
- } evdevBitsRec, *evdevBitsPtr;
-
- typedef struct {
---- a/src/evdev_axes.c
-+++ b/src/evdev_axes.c
-@@ -49,14 +49,6 @@
-
- #include <xf86_OSproc.h>
-
--#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
--
--#define BITS_PER_LONG (sizeof(long) * 8)
--#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
--#define OFF(x) ((x)%BITS_PER_LONG)
--#define LONG(x) ((x)/BITS_PER_LONG)
--#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
--
- static char *rel_axis_names[] = {
- "X",
- "Y",
-@@ -328,7 +320,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
-
- real_axes = 0;
- for (i = 0; i < ABS_MAX; i++)
-- if (TestBit (i, pEvdev->bits.abs))
-+ if (test_bit (i, pEvdev->bits.abs))
- real_axes++;
-
- if (!real_axes)
-@@ -344,7 +336,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
- pInfo->conversion_proc = EvdevConvert;
-
- for (i = 0, j = 0; i < ABS_MAX; i++) {
-- if (!TestBit (i, pEvdev->bits.abs))
-+ if (!test_bit (i, pEvdev->bits.abs))
- continue;
-
- snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]);
-@@ -389,7 +381,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
- xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s);
- }
-
-- if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs))
-+ if (test_bit (ABS_X, pEvdev->bits.abs) && test_bit (ABS_Y, pEvdev->bits.abs))
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
- else
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
-@@ -417,7 +409,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo)
-
- real_axes = 0;
- for (i = 0; i < REL_MAX; i++)
-- if (TestBit (i, pEvdev->bits.rel))
-+ if (test_bit (i, pEvdev->bits.rel))
- real_axes++;
-
- if (!real_axes && (!state->abs || state->abs->axes < 2))
-@@ -434,7 +426,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo)
- pInfo->conversion_proc = EvdevConvert;
-
- for (i = 0, j = 0; i < REL_MAX; i++) {
-- if (!TestBit (i, pEvdev->bits.rel))
-+ if (!test_bit (i, pEvdev->bits.rel))
- continue;
-
- snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]);
---- a/src/evdev_brain.c
-+++ b/src/evdev_brain.c
-@@ -86,7 +86,7 @@ typedef struct {
- } evdevDevInfoRec, *evdevDevInfoPtr;
-
- static Bool
--MatchAll (long *dev, long *match, int len)
-+MatchAll (unsigned long *dev, unsigned long *match, int len)
- {
- int i;
-
-@@ -98,7 +98,7 @@ MatchAll (long *dev, long *match, int le
- }
-
- static Bool
--MatchNot (long *dev, long *match, int len)
-+MatchNot (unsigned long *dev, unsigned long *match, int len)
- {
- int i;
-
-@@ -110,7 +110,7 @@ MatchNot (long *dev, long *match, int le
- }
-
- static Bool
--MatchAny (long *dev, long *match, int len)
-+MatchAny (unsigned long *dev, unsigned long *match, int len)
- {
- int i, found = 0;
-
---- a/src/evdev_btn.c
-+++ b/src/evdev_btn.c
-@@ -51,15 +51,6 @@
-
- #include <xf86Module.h>
-
--
--#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
--
--#define BITS_PER_LONG (sizeof(long) * 8)
--#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
--#define OFF(x) ((x)%BITS_PER_LONG)
--#define LONG(x) ((x)/BITS_PER_LONG)
--#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
--
- void
- EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count)
- {
-@@ -186,7 +177,7 @@ EvdevBtnNew(InputInfoPtr pInfo)
- state->btn = Xcalloc (sizeof (evdevBtnRec));
-
- for (i = BTN_MISC; i < (KEY_OK - 1); i++)
-- if (TestBit (i, pEvdev->bits.key)) {
-+ if (test_bit (i, pEvdev->bits.key)) {
- bit = i;
- if ((bit >= BTN_MOUSE) && (bit < BTN_JOYSTICK)) {
- bit -= BTN_MOUSE - BTN_MISC;
---- a/src/evdev_key.c
-+++ b/src/evdev_key.c
-@@ -81,11 +81,6 @@
-
-
- #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
--#define BITS_PER_LONG (sizeof(long) * 8)
--#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
--#define OFF(x) ((x)%BITS_PER_LONG)
--#define LONG(x) ((x)/BITS_PER_LONG)
--#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
-
- #define MIN_KEYCODE 8
- #define GLYPHS_PER_KEY 2
-@@ -356,13 +351,13 @@ EvdevKeyNew (InputInfoPtr pInfo)
- int i, keys = 0;
-
- for (i = 0; i <= KEY_UNKNOWN; i++)
-- if (TestBit (i, pEvdev->bits.key)) {
-+ if (test_bit (i, pEvdev->bits.key)) {
- keys = 1;
- break;
- }
- if (!keys)
- for (i = KEY_OK; i <= KEY_MAX; i++)
-- if (TestBit (i, pEvdev->bits.key)) {
-+ if (test_bit (i, pEvdev->bits.key)) {
- keys = 1;
- break;
- }
---- a/src/inotify-syscalls.h
-+++ b/src/inotify-syscalls.h
-@@ -39,6 +39,10 @@
- # define __NR_inotify_init 290
- # define __NR_inotify_add_watch 291
- # define __NR_inotify_rm_watch 292
-+#elif defined (__hppa__) || defined (__hppa64__)
-+# define __NR_inotify_init 269
-+# define __NR_inotify_add_watch 270
-+# define __NR_inotify_rm_watch 271
- #else
- # error "Unsupported architecture!"
- #endif
+++ /dev/null
-From: Zephaniah E. Hull <warp@aehallh.com>
-Date: Mon, 15 May 2006 22:47:23 +0000 (+0000)
-Subject: Hopefully fix the bitops stuff to actually _work_.
-X-Git-Tag: xf86-video-impact-0_2_0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=1b03250797daa0ac98323a9f43e895dd0b5c7761
-
-Hopefully fix the bitops stuff to actually _work_.
----
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com>
-+
-+ * src/evdev.h:
-+ Hopefully fix the bitops stuff to actually _work_.
-+
- 2006-05-14 Zephaniah E. Hull <warp@aehallh.com>
-
- * man/evdev.man:
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -73,15 +73,15 @@
- #include <xf86Xinput.h>
-
- #ifndef BITS_PER_LONG
--#define BITS_PER_LONG (sizeof(long) * 8)
-+#define BITS_PER_LONG (sizeof(unsigned long) * 8)
- #endif
-
- #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
--#define LONG(x) ((x) >> (sizeof(unsigned long) + 1))
--#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1)))
-+#define LONG(x) ((x)/BITS_PER_LONG)
-+#define MASK(x) (1UL << ((x) & (BITS_PER_LONG - 1)))
-
- #ifndef test_bit
--#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit))
-+#define test_bit(bit, array) (!!(array[LONG(bit)] & MASK(bit)))
- #endif
- #ifndef set_bit
- #define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit))
+++ /dev/null
-Index: xserver-xorg-input-evdev/src/inotify-syscalls.h
-===================================================================
---- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h 2006-11-01 19:37:12.000000000 +1100
-+++ xserver-xorg-input-evdev/src/inotify-syscalls.h 2006-11-01 19:59:51.000000000 +1100
-@@ -43,6 +43,24 @@
- # define __NR_inotify_init 269
- # define __NR_inotify_add_watch 270
- # define __NR_inotify_rm_watch 271
-+#elif defined (__mips__)
-+# if _MIPS_SIM == _MIPS_SIM_ABI32
-+# define __NR_inotify_init 4284
-+# define __NR_inotify_add_watch 4285
-+# define __NR_inotify_rm_watch 4286
-+# elif _MIPS_SIM == _MIPS_SIM_NABI32
-+# define __NR_inotify_init 6247
-+# define __NR_inotify_add_watch 6248
-+# define __NR_inotify_rm_watch 6249
-+# elif _MIPS_SIM == _MIPS_SIM_ABI64
-+# define __NR_inotify_init 5243
-+# define __NR_inotify_add_watch 5244
-+# define __NR_inotify_rm_watch 5245
-+# endif
-+#elif defined (__mc68000__)
-+# define __NR_inotify_init 284
-+# define __NR_inotify_add_watch 285
-+# define __NR_inotify_rm_watch 286
- #else
- # error "Unsupported architecture!"
- #endif
+++ /dev/null
-From: Adam Jackson <ajax@nwnk.net>
-Date: Fri, 2 Jun 2006 19:39:52 +0000 (+0000)
-Subject: Fix an obvious bogon to avoid crashing on absolute axis setup.
-X-Git-Tag: xf86-video-impact-0_2_0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=57a7f2844108072bf03c9f82baf92e3447d18fbe
-
-Fix an obvious bogon to avoid crashing on absolute axis setup.
----
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2006-06-02 Adam Jackson <ajax@freedesktop.org>
-+
-+ * src/evdev_axes.c:
-+ Fix an obvious bogon to avoid crashing on absolute axis setup.
-+
- 2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com>
-
- * src/evdev.h:
---- a/src/evdev_axes.c
-+++ b/src/evdev_axes.c
-@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
- else
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
-- if (k < screenInfo.numScreens) {
-+ if (k < screenInfo.numScreens && k >= 0) {
- state->abs->screen = k;
- xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
- } else {
+++ /dev/null
-From: Zephaniah E. Hull <warp@agamemnon.b5>
-Date: Tue, 11 Jul 2006 07:08:30 +0000 (-0400)
-Subject: Set pInfo->fd to -1 when we close it in EvdevProc.
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=eba5ea8d5a19f2b1984cbf20c95d22e243f19567
-
-Set pInfo->fd to -1 when we close it in EvdevProc.
----
-
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what)
- RemoveEnabledDevice (pInfo->fd);
- xf86RemoveSIGIOHandler (pInfo->fd);
- close (pInfo->fd);
-+ pInfo->fd = -1;
-
- if (pEvdev->state.axes)
- EvdevAxesOff (device);
+++ /dev/null
---- a/src/evdev.c 2008-06-23 08:40:50.000000000 -0400
-+++ b/src/evdev.c 2008-06-23 08:42:00.000000000 -0400
-@@ -233,10 +233,6 @@ EvdevSwitchMode (ClientPtr client, Devic
- else
- return !Success;
- break;
-- case SendCoreEvents:
-- case DontSendCoreEvents:
-- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
-- break;
- default:
- return !Success;
- }
-@@ -263,7 +259,6 @@ EvdevNew(evdevDriverPtr driver, evdevDev
- pInfo->device_control = EvdevProc;
- pInfo->read_input = EvdevReadInput;
- pInfo->switch_mode = EvdevSwitchMode;
-- pInfo->motion_history_proc = xf86GetMotionEvents;
- pInfo->conf_idev = driver->dev;
-
- pInfo->private = device;
#
################################################################################
-XDRIVER_XF86_INPUT_EVDEV_VERSION = 1.1.2
+XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.0.4
XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = NO
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_FPIT
- bool "xf86-input-fpit"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-fpit 1.1.0
- Fujitsu Stylistic input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-fpit -- Fujitsu Stylistic input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_FPIT_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_FPIT_AUTORECONF = NO
-XDRIVER_XF86_INPUT_FPIT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_FPIT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-fpit))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_HYPERPEN
- bool "xf86-input-hyperpen"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-hyperpen 1.1.0
- X.Org driver for hyperpen input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-hyperpen -- X.Org driver for hyperpen input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = NO
-XDRIVER_XF86_INPUT_HYPERPEN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_HYPERPEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-hyperpen))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_JAMSTUDIO
- bool "xf86-input-jamstudio"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-jamstudio 1.1.0
- X.Org driver for jamstudio input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-jamstudio -- X.Org driver for jamstudio input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = NO
-XDRIVER_XF86_INPUT_JAMSTUDIO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_JAMSTUDIO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-jamstudio))
-
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGELLAN
- bool "xf86-input-magellan"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-magellan 1.1.0
- X.Org driver for magellan input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-magellan -- X.Org driver for magellan input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = NO
-XDRIVER_XF86_INPUT_MAGELLAN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_MAGELLAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-magellan))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGICTOUCH
- bool "xf86-input-magictouch"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-magictouch 1.0.0.5
- MagicTouch input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-magictouch -- MagicTouch input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION = 1.0.0.5
-XDRIVER_XF86_INPUT_MAGICTOUCH_SOURCE = xf86-input-magictouch-$(XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_MAGICTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_MAGICTOUCH_AUTORECONF = NO
-XDRIVER_XF86_INPUT_MAGICTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_MAGICTOUCH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-magictouch))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_MICROTOUCH
- bool "xf86-input-microtouch"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-microtouch 1.1.0
- MicroTouch input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-microtouch -- MicroTouch input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = NO
-XDRIVER_XF86_INPUT_MICROTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_MICROTOUCH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-microtouch))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_MUTOUCH
- bool "xf86-input-mutouch"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-mutouch 1.1.0
- Microtouch input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-mutouch -- Microtouch input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = NO
-XDRIVER_XF86_INPUT_MUTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_MUTOUCH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-mutouch))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_PALMAX
- bool "xf86-input-palmax"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-palmax 1.1.0
- Palmax (TR88L803) touchscreen driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-palmax -- Palmax (TR88L803) touchscreen driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = NO
-XDRIVER_XF86_INPUT_PALMAX_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_PALMAX_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-palmax))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_PENMOUNT
- bool "xf86-input-penmount"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-penmount 1.2.0
- PenMount input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-penmount -- PenMount input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.3.0
-XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = NO
-XDRIVER_XF86_INPUT_PENMOUNT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_PENMOUNT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-penmount))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_SPACEORB
- bool "xf86-input-spaceorb"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-spaceorb 1.1.0
- X.Org driver for spaceorb input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-spaceorb -- X.Org driver for spaceorb input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.1
-XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = NO
-XDRIVER_XF86_INPUT_SPACEORB_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_SPACEORB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-spaceorb))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_SUMMA
- bool "xf86-input-summa"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-summa 1.1.0
- X.Org driver for summa input devices
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-summa -- X.Org driver for summa input devices
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = NO
-XDRIVER_XF86_INPUT_SUMMA_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_SUMMA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-summa))
+++ /dev/null
-diff -Nwrup xfree86-driver-synaptics_0.14.7~git20070706.orig/configure xdriver_xf86-input-synaptics-0.14.7~git20070706/configure
---- a/.stamp_configured 1969-12-31 19:00:00.000000000 -0500
-+++ b/.stamp_configured 2008-06-23 11:01:16.000000000 -0400
-@@ -0,0 +1,4 @@
-+#!/bin/sh
-+
-+echo "Dummy configure"
-+
--- /dev/null
+diff -Nwrup xfree86-driver-synaptics_0.15.0.orig/configure xdriver_xf86-input-synaptics-0.15.0/configure
+--- a/.stamp_configured 1969-12-31 19:00:00.000000000 -0500
++++ b/.stamp_configured 2008-06-23 11:01:16.000000000 -0400
+@@ -0,0 +1,4 @@
++#!/bin/sh
++
++echo "Dummy configure"
++
#
################################################################################
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 0.14.7~git20070706
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 0.15.0
XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xfree86-driver-synaptics_$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).orig.tar.gz
XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://ftp.de.debian.org/debian/pool/main/x/xfree86-driver-synaptics
XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_TEK4957
- bool "xf86-input-tek4957"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-tek4957 1.1.0
- Tektronix 4957 input driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-tek4957 -- Tektronix 4957 input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.2.0
-XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = NO
-XDRIVER_XF86_INPUT_TEK4957_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_TEK4957_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-tek4957))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_UR98
- bool "xf86-input-ur98"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-input-ur98 1.1.0
- UR98 (TR88L803) head tracker driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-input-ur98 -- UR98 (TR88L803) head tracker driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_UR98_VERSION = 1.1.0
-XDRIVER_XF86_INPUT_UR98_SOURCE = xf86-input-ur98-$(XDRIVER_XF86_INPUT_UR98_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_UR98_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_UR98_AUTORECONF = NO
-XDRIVER_XF86_INPUT_UR98_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-XDRIVER_XF86_INPUT_UR98_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-ur98))
#
################################################################################
-XDRIVER_XF86_VIDEO_AST_VERSION = 0.81.0
+XDRIVER_XF86_VIDEO_AST_VERSION = 0.85.0
XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_AST_AUTORECONF = NO
#
################################################################################
-XDRIVER_XF86_VIDEO_ATI_VERSION = 6.8.191
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.11.0
XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CYRIX
- bool "xf86-video-cyrix"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-cyrix 1.1.0
- Cyrix video driver
+++ /dev/null
---- a/configure 2006-04-07 14:48:07.000000000 -0400
-+++ b/configure 2008-06-23 11:09:35.000000000 -0400
-@@ -20264,28 +20264,8 @@ echo "$as_me: Building with package name
- as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
- echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
--if eval "test \"\${$as_ac_File+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "$prefix/share/X11/sgml/defs.ent"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
--if test `eval echo '${'$as_ac_File'}'` = yes; then
-- DEFS_ENT_PATH=$prefix/share/X11/sgml
--else
- DEFS_ENT_PATH=
-
--fi
--
-
- # Extract the first word of "linuxdoc", so it can be a program name with args.
- set dummy linuxdoc; ac_word=$2
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-cyrix -- Cyrix video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_CYRIX_VERSION = 1.1.0
-XDRIVER_XF86_VIDEO_CYRIX_SOURCE = xf86-video-cyrix-$(XDRIVER_XF86_VIDEO_CYRIX_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_CYRIX_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_CYRIX_AUTORECONF = NO
-XDRIVER_XF86_VIDEO_CYRIX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-XDRIVER_XF86_VIDEO_CYRIX_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-cyrix))
#
################################################################################
-XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.2.0
+XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.0
XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
+ bool "xf86-video-geode"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_VIDEOPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-geode 2.10.1
+ video driver for geode device
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-geode -- video driver for geode device
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.10.1
+XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GEODE_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_GEODE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-geode))
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLIDE
+ bool "xf86-video-glide"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_VIDEOPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-glide 1.0.1
+ video driver for glide device
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-glide -- video driver for glide device
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.0.1
+XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GLIDE_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_GLIDE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glide))
+++ /dev/null
---- a/configure.ac 2008-06-23 11:17:07.000000000 -0400
-+++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400
-@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- AC_HEADER_STDC
-
- if test "$DRI" != no; then
-- AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h="yes"], [have_dri_h="no"])
-- AC_CHECK_FILE([${sdkdir}/sarea.h],
-- [have_sarea_h="yes"], [have_sarea_h="no"])
-- AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ if test "$cross_compiling" = "no" ; then
-+ AC_CHECK_FILE([${sdkdir}/dri.h],
-+ [have_dri_h="yes"], [have_dri_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/sarea.h],
-+ [have_sarea_h="yes"], [have_sarea_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/damage.h],
-+ [have_damage_h="yes"], [have_damage_h="no"])
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
--- /dev/null
+--- a/configure.ac 2008-06-23 11:17:07.000000000 -0400
++++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400
+@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS"
+ AC_HEADER_STDC
+
+ if test "$DRI" != no; then
+- AC_CHECK_FILE([${sdkdir}/dri.h],
+- [have_dri_h="yes"], [have_dri_h="no"])
+- AC_CHECK_FILE([${sdkdir}/sarea.h],
+- [have_sarea_h="yes"], [have_sarea_h="no"])
+- AC_CHECK_FILE([${sdkdir}/dristruct.h],
+- [have_dristruct_h="yes"], [have_dristruct_h="no"])
++ if test "$cross_compiling" = "no" ; then
++ AC_CHECK_FILE([${sdkdir}/dri.h],
++ [have_dri_h="yes"], [have_dri_h="no"])
++ AC_CHECK_FILE([${sdkdir}/sarea.h],
++ [have_sarea_h="yes"], [have_sarea_h="no"])
++ AC_CHECK_FILE([${sdkdir}/dristruct.h],
++ [have_dristruct_h="yes"], [have_dristruct_h="no"])
++ AC_CHECK_FILE([${sdkdir}/damage.h],
++ [have_damage_h="yes"], [have_damage_h="no"])
++ else
++ have_dri_h="yes"
++ have_sarea_h="yes"
++ have_dristruct_h="yes"
++ fi
+ fi
+
+ AC_MSG_CHECKING([whether to include DRI support])
#
################################################################################
-XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.0
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.1
XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
#
################################################################################
-XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.0
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.1
XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I810
- bool "xf86-video-i810"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXVMC
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-i810 1.6.5
- X.Org driver for Intel cards
+++ /dev/null
---- xf86-video-i810-1.6.5/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200
-+++ xf86-video-i810-1.6.5/configure.ac 2007-06-10 20:59:50.000000000 +0200
-@@ -80,12 +80,18 @@
- AC_HEADER_STDC
-
- if test "$DRI" != no; then
-+ if test "$cross_compiling" = "no" ; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-i810 -- X.Org driver for Intel cards
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_I810_VERSION = 1.7.4
-XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-XDRIVER_XF86_VIDEO_I810_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810))
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMPACT
+ bool "xf86-video-impact"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_VIDEOPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-impact 0.2.0
+ Impact video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-impact -- Impact video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_IMPACT_VERSION = 0.2.0
+XDRIVER_XF86_VIDEO_IMPACT_SOURCE = xf86-video-impact-$(XDRIVER_XF86_VIDEO_IMPACT_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_IMPACT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_IMPACT_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_IMPACT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_IMPACT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-impact))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMSTT
- bool "xf86-video-imstt"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-imstt 1.1.0
- Integrated Micro Solutions Twin Turbo 128 driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-imstt -- Integrated Micro Solutions Twin Turbo 128 driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_IMSTT_VERSION = 1.1.0
-XDRIVER_XF86_VIDEO_IMSTT_SOURCE = xf86-video-imstt-$(XDRIVER_XF86_VIDEO_IMSTT_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_IMSTT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_IMSTT_AUTORECONF = NO
-XDRIVER_XF86_VIDEO_IMSTT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-XDRIVER_XF86_VIDEO_IMSTT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-imstt))
+++ /dev/null
---- xf86-video-i810-1.6.5/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200
-+++ xf86-video-i810-1.6.5/configure.ac 2007-06-10 20:59:50.000000000 +0200
-@@ -92,13 +92,14 @@ AC_HEADER_STDC
-
- AC_MSG_CHECKING([whether to include DRI support])
- if test x$DRI = xauto; then
-+ if test "$cross_compiling" = "no" ; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-- AC_CHECK_FILE([${sdkdir}/damage.h],
-+ AC_CHECK_FILE([${sdkdir}/damage.h],
- [have_damage_h="yes"], [have_damage_h="no"])
-
- if test "$have_dri_h" = yes -a \
-@@ -108,6 +109,12 @@ if test x$DRI = xauto; then
- else
- DRI="no"
- fi
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ DRI="yes"
-+ fi
- fi
- AC_MSG_RESULT([$DRI])
--- /dev/null
+--- xf86-video-intel-2.4.2/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200
++++ xf86-video-intel-2.4.2/configure.ac 2007-06-10 20:59:50.000000000 +0200
+@@ -92,13 +92,14 @@ AC_HEADER_STDC
+
+ AC_MSG_CHECKING([whether to include DRI support])
+ if test x$DRI = xauto; then
++ if test "$cross_compiling" = "no" ; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+ AC_CHECK_FILE([${sdkdir}/sarea.h],
+ [have_sarea_h="yes"], [have_sarea_h="no"])
+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
+- AC_CHECK_FILE([${sdkdir}/damage.h],
++ AC_CHECK_FILE([${sdkdir}/damage.h],
+ [have_damage_h="yes"], [have_damage_h="no"])
+
+ if test "$have_dri_h" = yes -a \
+@@ -108,6 +109,12 @@ if test x$DRI = xauto; then
+ else
+ DRI="no"
+ fi
++ else
++ have_dri_h="yes"
++ have_sarea_h="yes"
++ have_dristruct_h="yes"
++ DRI="yes"
++ fi
+ fi
+ AC_MSG_RESULT([$DRI])
#
################################################################################
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.3.2
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.4.2
XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
+ bool "xf86-video-mach64"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-mach64 6.8.0
+ mach64 video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-mach64 -- mach64 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.8.0
+XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_MACH64_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mach64))
+++ /dev/null
---- xf86-video-mga-1.4.6.1/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200
-+++ xf86-video-mga-1.4.6.1/configure.ac 2007-06-10 12:00:37.000000000 +0200
-@@ -77,12 +77,18 @@
- AC_HEADER_STDC
-
- if test "x$DRI" != xno; then
-+ if test "$cross_compiling" = no; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
--- /dev/null
+--- xf86-video-mga-1.4.9/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200
++++ xf86-video-mga-1.4.9/configure.ac 2007-06-10 12:00:37.000000000 +0200
+@@ -77,12 +77,18 @@
+ AC_HEADER_STDC
+
+ if test "x$DRI" != xno; then
++ if test "$cross_compiling" = no; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+ AC_CHECK_FILE([${sdkdir}/sarea.h],
+ [have_sarea_h="yes"], [have_sarea_h="no"])
+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
++ else
++ have_dri_h="yes"
++ have_sarea_h="yes"
++ have_dristruct_h="yes"
++ fi
+ fi
+
+ AC_MSG_CHECKING([whether to include DRI support])
#
################################################################################
-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.8
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.9
XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NSC
- bool "xf86-video-nsc"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_VIDEOPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-nsc 2.8.3
- Nsc video driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-nsc -- Nsc video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_NSC_VERSION = 2.8.3
-XDRIVER_XF86_VIDEO_NSC_SOURCE = xf86-video-nsc-$(XDRIVER_XF86_VIDEO_NSC_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_NSC_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_NSC_AUTORECONF = NO
-XDRIVER_XF86_VIDEO_NSC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-XDRIVER_XF86_VIDEO_NSC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-nsc))
#
################################################################################
-XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.9
+XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.12
XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_OPENCHROME
+ bool "xf86-video-openchrome"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXVMC
+ select BR2_PACKAGE_XPROTO_GLPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ Openchrome, A free and Open Source video driver for the VIA/S3G
+ UniChrome and UniChrome Pro graphics chipsets.
--- /dev/null
+--- a/configure.ac 2008-04-09 15:42:55.000000000 -0400
++++ b/configure.ac 2008-06-23 09:39:06.000000000 -0400
+@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t
+ fi
+
+ if test "$DRI" != no; then
++ if test "$cross_compiling" = "no" ; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+ AC_CHECK_FILE([${sdkdir}/sarea.h],
+ [have_sarea_h="yes"], [have_sarea_h="no"])
+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
++ else
++ have_dri_h="yes"
++ have_sarea_h="yes"
++ have_dristruct_h="yes"
++ fi
+ fi
+
+ AC_MSG_CHECKING([whether to include DRI support])
+@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC])
+
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+
+-AC_CHECK_FILE([${sdkdir}/xf86Module.h],
+- [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
++if test "$cross_compiling" = "no" ; then
++ AC_CHECK_FILE([${sdkdir}/xf86Module.h],
++ [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
++else
++ have_xf86Module_h="yes"
++fi
+
+ # Check the ABI_VIDEODRV_VERSION
+ SAVE_CFLAGS="$CFLAGS"
--- /dev/null
+#############################################################
+#
+# openchrome
+#
+#############################################################
+OPENCHROME_VERSION = 0.2.903
+OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2
+OPENCHROME_SITE = http://www.openchrome.org/releases
+
+OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+OPENCHROME_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+OPENCHROME_AUTORECONF = YES
+OPENCHROME_CONF_OPT = --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,package/x11r7,openchrome))
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
+ bool "xf86-video-r128"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-r128 6.8.0
+ R128 video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-r128 -- R128 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.0
+XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_R128_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_R128_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-r128))
+++ /dev/null
---- xf86-video-sunffb-1.1.0/configure.ac.orig 2007-06-10 21:01:18.000000000 +0200
-+++ xf86-video-sunffb-1.1.0/configure.ac 2007-06-10 21:01:34.000000000 +0200
-@@ -72,13 +72,20 @@
- # Checks for header files.
- AC_HEADER_STDC
-
--if test "$DRI" != no; then
-+if test "x$DRI" != xno; then
-+ if test "$cross_compiling" = "no" ; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ AC_CHECK_HEADER
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
--- /dev/null
+--- xf86-video-sunffb-1.2.0/configure.ac.orig 2007-06-10 21:01:18.000000000 +0200
++++ xf86-video-sunffb-1.2.0/configure.ac 2007-06-10 21:01:34.000000000 +0200
+@@ -72,13 +72,20 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+
+-if test "$DRI" != no; then
++if test "x$DRI" != xno; then
++ if test "$cross_compiling" = "no" ; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+ AC_CHECK_FILE([${sdkdir}/sarea.h],
+ [have_sarea_h="yes"], [have_sarea_h="no"])
+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
++ AC_CHECK_HEADER
++ else
++ have_dri_h="yes"
++ have_sarea_h="yes"
++ have_dristruct_h="yes"
++ fi
+ fi
+
+ AC_MSG_CHECKING([whether to include DRI support])
#
################################################################################
-XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.2.0
XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES
#
################################################################################
-XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.2.0
XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = NO
+++ /dev/null
---- a/configure 2006-04-07 17:40:13.000000000 -0400
-+++ b/configure 2008-06-23 11:54:36.000000000 -0400
-@@ -20326,27 +20326,8 @@ echo "$as_me: Building with package name
- as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
- echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
--if eval "test \"\${$as_ac_File+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "$prefix/share/X11/sgml/defs.ent"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
--if test `eval echo '${'$as_ac_File'}'` = yes; then
-- DEFS_ENT_PATH=$prefix/share/X11/sgml
--else
- DEFS_ENT_PATH=
-
--fi
-
-
- # Extract the first word of "linuxdoc", so it can be a program name with args.
--- /dev/null
+--- a/configure 2006-04-07 17:40:13.000000000 -0400
++++ b/configure 2008-06-23 11:54:36.000000000 -0400
+@@ -20326,27 +20326,8 @@ echo "$as_me: Building with package name
+ as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
+ echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- test "$cross_compiling" = yes &&
+- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+- { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+- eval "$as_ac_File=yes"
+-else
+- eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+- DEFS_ENT_PATH=$prefix/share/X11/sgml
+-else
+ DEFS_ENT_PATH=
+
+-fi
+
+
+ # Extract the first word of "linuxdoc", so it can be a program name with args.
#
################################################################################
-XDRIVER_XF86_VIDEO_TGA_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.0
XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_TGA_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VERMILION
+ bool "xf86-video-vermilion"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_VIDEOPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-vermilion 1.0.1
+ Vermilion video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-vermilion -- vermilion video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VERMILION_VERSION = 1.0.1
+XDRIVER_XF86_VIDEO_VERMILION_SOURCE = xf86-video-vermilion-$(XDRIVER_XF86_VIDEO_VERMILION_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VERMILION_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VERMILION_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_VERMILION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_VERMILION_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vermilion))
+++ /dev/null
---- xf86-video-vesa-1.3.0/configure.ac.orig 2007-06-11 13:10:35.000000000 +0200
-+++ xf86-video-vesa-1.3.0/configure.ac 2007-06-11 14:16:45.000000000 +0200
-@@ -56,8 +56,8 @@
- PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
-+CFLAGS="$CFLAGS $XORG_CFLAGS "'-I$(top_srcdir)/src'
-+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
-
--- /dev/null
+--- xf86-video-vesa-2.0.0/configure.ac.orig 2007-06-11 13:10:35.000000000 +0200
++++ xf86-video-vesa-2.0.0/configure.ac 2007-06-11 14:16:45.000000000 +0200
+@@ -56,8 +56,8 @@
+ PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
++CFLAGS="$CFLAGS $XORG_CFLAGS "'-I$(top_srcdir)/src'
++INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
+ AC_SUBST([INCLUDES])
+
#
################################################################################
-XDRIVER_XF86_VIDEO_VESA_VERSION = 1.3.0
+XDRIVER_XF86_VIDEO_VESA_VERSION = 2.0.0
XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_VESA_AUTORECONF = NO
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VGA
- bool "xf86-video-vga"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-vga 4.1.0
- Generic VGA video driver
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-vga -- Generic VGA video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_VGA_VERSION = 4.1.0
-XDRIVER_XF86_VIDEO_VGA_SOURCE = xf86-video-vga-$(XDRIVER_XF86_VIDEO_VGA_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_VGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VGA_AUTORECONF = NO
-XDRIVER_XF86_VIDEO_VGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-XDRIVER_XF86_VIDEO_VGA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vga))
+++ /dev/null
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VIA
- bool "xf86-video-via"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXVMC
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_GLPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- help
- xf86-video-via 0.2.2
- VIA unichrome graphics driver
+++ /dev/null
---- xf86-video-via-0.2.2/configure.ac.orig 2007-06-10 14:41:40.000000000 +0200
-+++ xf86-video-via-0.2.2/configure.ac 2007-06-10 14:41:48.000000000 +0200
-@@ -71,6 +71,7 @@
-
-
- if test "x$DRI" != xno; then
-+ if test "$cross_compiling" = "no" ; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
-@@ -78,6 +79,11 @@
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
- AC_CHECK_HEADER
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
+++ /dev/null
-################################################################################
-#
-# xdriver_xf86-video-via -- VIA unichrome graphics driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2
-XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-XDRIVER_XF86_VIDEO_VIA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-via))
#
################################################################################
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.2
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.5
XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_WSFB
+ bool "xf86-video-wsfb"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-wsfb 0.2.1
+ WSFB based chips video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-wsfb -- WSFB video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.2.1
+XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_WSFB_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_WSFB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-wsfb))
--- /dev/null
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP
+ bool "xf86-video-xgixp"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_XPROTO_RENDERPROTO
+ select BR2_PACKAGE_XPROTO_XEXTPROTO
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ xf86-video-xgixp 1.7.99.3
+ XGIXP based chips video driver
--- /dev/null
+################################################################################
+#
+# xdriver_xf86-video-xgixp -- XGIXP video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_XGIXP_VERSION = 1.7.99.3
+XDRIVER_XF86_VIDEO_XGIXP_SOURCE = xf86-video-xgixp-$(XDRIVER_XF86_VIDEO_XGIXP_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_XGIXP_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_XGIXP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-xgixp))
#
################################################################################
-XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.0
+XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.1
XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2
XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_FONT_XFREE86_TYPE1_AUTORECONF = NO
#
################################################################################
-XLIB_LIBFS_VERSION = 1.0.0
+XLIB_LIBFS_VERSION = 1.0.1
XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFS_AUTORECONF = NO
#
################################################################################
-XLIB_LIBSM_VERSION = 1.0.3
+XLIB_LIBSM_VERSION = 1.1.0
XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBSM_AUTORECONF = NO
XLIB_LIBSM_INSTALL_STAGING = YES
XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
-XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static
+XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static --without-libuuid
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libSM))
+++ /dev/null
---- a/src/util/Makefile.in.orig 2008-01-30 10:54:59.000000000 -0500
-+++ b/src/util/Makefile.in 2008-01-30 10:54:16.000000000 -0500
-@@ -50,8 +50,7 @@ PROGRAMS = $(noinst_PROGRAMS)
- makekeys_SOURCES = makekeys.c
- makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
- makekeys_LDADD = $(LDADD)
--makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+HOST_CC = gcc
-+makekeys_LINK = $(HOST_CC) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -307,18 +307,18 @@ distclean-compile:
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- makekeys-makekeys.o: makekeys.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_TRUE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
- @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-
- makekeys-makekeys.obj: makekeys.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_TRUE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
- @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
--- /dev/null
+diff -urN xlib_libX11-1.1.5.orig/src/util/Makefile.in xlib_libX11-1.1.5/src/util/Makefile.in
+--- xlib_libX11-1.1.5.orig/src/util/Makefile.in 2009-01-31 19:59:12.000000000 -0800
++++ xlib_libX11-1.1.5/src/util/Makefile.in 2009-01-31 19:59:53.000000000 -0800
+@@ -50,9 +50,8 @@
+ makekeys_SOURCES = makekeys.c
+ makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
+ makekeys_LDADD = $(LDADD)
+-makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++HOST_CC = gcc
++makekeys_LINK = $(HOST_CC) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -311,18 +310,18 @@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ makekeys-makekeys.o: makekeys.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_TRUE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+
+ makekeys-makekeys.obj: makekeys.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
++@am__fastdepCC_TRUE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
+ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
++@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
+
+ mostlyclean-libtool:
+ -rm -f *.lo
#
################################################################################
-XLIB_LIBX11_VERSION = 1.1.3
+XLIB_LIBX11_VERSION = 1.1.5
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBX11_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXSCRNSAVER_VERSION = 1.1.2
+XLIB_LIBXSCRNSAVER_VERSION = 1.1.3
XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXSCRNSAVER_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXAU_VERSION = 1.0.3
+XLIB_LIBXAU_VERSION = 1.0.4
XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXAU_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXDAMAGE_VERSION = 1.0.4
+XLIB_LIBXDAMAGE_VERSION = 1.1.1
XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXDAMAGE_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXEXT_VERSION = 1.0.2
+XLIB_LIBXEXT_VERSION = 1.0.4
XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXEXT_AUTORECONF = NO
+++ /dev/null
-diff -urN xlib_libXfont-1.2.7.orig/src/builtins/file.c xlib_libXfont-1.2.7/src/builtins/file.c
---- xlib_libXfont-1.2.7.orig/src/builtins/file.c 2007-01-17 23:49:10.000000000 +0200
-+++ xlib_libXfont-1.2.7/src/builtins/file.c 2007-09-30 03:09:29.000000000 +0300
-@@ -50,7 +50,7 @@
- len = BUFFILESIZE;
- if (len > left)
- len = left;
-- bcopy (io->file->bits + io->offset, f->buffer, len);
-+ memmove (f->buffer, io->file->bits + io->offset, len);
- io->offset += len;
- f->left = len - 1;
- f->bufp = f->buffer + 1;
#
################################################################################
-XLIB_LIBXFONT_VERSION = 1.3.1
+XLIB_LIBXFONT_VERSION = 1.3.3
XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFONT_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXFT_VERSION = 2.1.12
+XLIB_LIBXFT_VERSION = 2.1.13
XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFT_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXINERAMA_VERSION = 1.0.2
+XLIB_LIBXINERAMA_VERSION = 1.0.3
XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXINERAMA_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXMU_VERSION = 1.0.3
+XLIB_LIBXMU_VERSION = 1.0.4
XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXMU_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXRANDR_VERSION = 1.2.2
+XLIB_LIBXRANDR_VERSION = 1.2.3
XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRANDR_AUTORECONF = NO
+++ /dev/null
---- a/util/Makefile.in.orig 2008-01-30 11:06:09.000000000 -0500
-+++ b/util/Makefile.in 2008-01-30 11:07:23.000000000 -0500
-@@ -64,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) $(LT_QUIET) --tag
- $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-+HOST_CC = gcc
- LINK = $(LIBTOOL) $(LT_QUIET) --tag=CC --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+makestrs_LINK = $(HOST_CC) \
-+ $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
- SOURCES = $(makestrs_SOURCES)
- DIST_SOURCES = $(makestrs_SOURCES)
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -312,7 +315,7 @@ clean-noinstPROGRAMS:
- makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
- @@AMPRETTYECHO@ ' [LD ] makestrs$(EXEEXT)'
- @rm -f makestrs$(EXEEXT)
-- @AMSHOWCMDSAT@$(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
-+ @AMSHOWCMDSAT@$(makestrs_LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
-
- mostlyclean-compile:
- @@AMPRETTYECHO@ ' [RM ] *.$(OBJEXT)'
-@@ -350,19 +353,19 @@ distclean-compile:
-
- makestrs-makestrs.o: makestrs.c
- @@AMPRETTYECHO@ ' [C ] makestrs.c'
--@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
-+@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ @AMSHOWCMDSAT@source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-+@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-
- makestrs-makestrs.obj: makestrs.c
- @@AMPRETTYECHO@ ' [C ] makestrs.c'
--@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
-+@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ @AMSHOWCMDSAT@source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-+@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-
- mostlyclean-libtool:
- @@AMPRETTYECHO@ ' [RM ] *.lo'
--- /dev/null
+---
+ util/Makefile.in | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+Index: libXt-1.0.5/util/Makefile.in
+===================================================================
+--- libXt-1.0.5.orig/util/Makefile.in
++++ libXt-1.0.5/util/Makefile.in
+@@ -64,8 +64,11 @@
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
++HOST_CC = gcc
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++makestrs_LINK = $(HOST_CC) \
++ $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
+ SOURCES = $(makestrs_SOURCES)
+ DIST_SOURCES = $(makestrs_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -297,7 +300,7 @@
+ done
+ makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
+ @rm -f makestrs$(EXEEXT)
+- $(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
++ $(makestrs_LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,18 +332,18 @@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ makestrs-makestrs.o: makestrs.c
+-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
++@am__fastdepCC_TRUE@ if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
++@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
+
+ makestrs-makestrs.obj: makestrs.c
+-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
++@am__fastdepCC_TRUE@ if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
++@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
+
+ mostlyclean-libtool:
+ -rm -f *.lo
#
################################################################################
-XLIB_LIBXT_VERSION = 1.0.4
+XLIB_LIBXT_VERSION = 1.0.5
XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXT_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXV_VERSION = 1.0.3
+XLIB_LIBXV_VERSION = 1.0.4
XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXV_AUTORECONF = NO
#
################################################################################
-XLIB_LIBXXF86VM_VERSION = 1.0.1
+XLIB_LIBXXF86VM_VERSION = 1.0.2
XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86VM_AUTORECONF = NO
--- /dev/null
+config BR2_PACKAGE_XLIB_LIBPCIACCESS
+ bool "libpciaccess"
+ help
+ libpciaccess 0.10.3
+ X.Org libpciaccess
--- /dev/null
+diff -uNr xlib_libpciaccess-0.10.3.orig/configure.ac xlib_libpciaccess-0.10.3/configure.ac
+--- xlib_libpciaccess-0.10.3.orig/configure.ac 2009-02-09 18:35:50.000000000 -0800
++++ xlib_libpciaccess-0.10.3/configure.ac 2009-02-09 18:38:56.000000000 -0800
+@@ -91,10 +91,12 @@
+ AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
+ AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+
+-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
+- [have_mtrr_h="yes"], [have_mtrr_h="no"])
+-if test "x$have_mtrr_h" = xyes; then
+- AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
++if test "$cross_compiling" != yes; then
++AC_CHECK_FILE([/usr/include/asm/mtrr.h],
++ [have_mtrr_h="yes"], [have_mtrr_h="no"])
++if test "x$have_mtrr_h" = xyes; then
++ AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
++fi
+ fi
+
+ AC_SUBST(PCIACCESS_CFLAGS)
--- /dev/null
+################################################################################
+#
+# xlib_libpciaccess -- X.Org pciaccess library
+#
+################################################################################
+
+XLIB_LIBPCIACCESS_VERSION = 0.10.3
+XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
+XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBPCIACCESS_AUTORECONF = YES
+XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
+XLIB_LIBPCIACCESS_DEPENDENCIES =
+XLIB_LIBPCIACCESS_CONF_OPT = --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
#
################################################################################
-XLIB_LIBXKBFILE_VERSION = 1.0.4
+XLIB_LIBXKBFILE_VERSION = 1.0.5
XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXKBFILE_AUTORECONF = NO
#
################################################################################
-XLIB_XTRANS_VERSION = 1.0.4
+XLIB_XTRANS_VERSION = 1.2.1
XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_XTRANS_AUTORECONF = NO
#
################################################################################
-XPROTO_GLPROTO_VERSION = 1.4.8
+XPROTO_GLPROTO_VERSION = 1.4.9
XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_GLPROTO_AUTORECONF = NO
#
################################################################################
-XPROTO_INPUTPROTO_VERSION = 1.4.3
+XPROTO_INPUTPROTO_VERSION = 1.4.4
XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_INPUTPROTO_AUTORECONF = NO
#
################################################################################
-XPROTO_XEXTPROTO_VERSION = 7.0.2
+XPROTO_XEXTPROTO_VERSION = 7.0.3
XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XEXTPROTO_AUTORECONF = NO
#
################################################################################
-XPROTO_XF86DRIPROTO_VERSION = 2.0.3
+XPROTO_XF86DRIPROTO_VERSION = 2.0.4
XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XF86DRIPROTO_AUTORECONF = NO
#
################################################################################
-XPROTO_XPROTO_VERSION = 7.0.10
+XPROTO_XPROTO_VERSION = 7.0.13
XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XPROTO_AUTORECONF = NO
+++ /dev/null
---- a/configure.orig 2008-01-30 11:14:50.000000000 -0500
-+++ b/configure 2008-01-30 11:15:25.000000000 -0500
-@@ -27686,25 +27686,6 @@ HAVE_DEFS_ENT=
- as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
- echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
--if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--ac_res=`eval echo '${'$as_ac_File'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_File'}'` = yes; then
-- HAVE_DEFS_ENT=yes
--fi
-
-
- # Extract the first word of "linuxdoc", so it can be a program name with args.
+++ /dev/null
---- a/include/servermd.h.orig 2007-08-23 15:04:54.000000000 -0400
-+++ b/include/servermd.h 2007-10-03 12:08:40.000000000 -0400
-@@ -151,6 +151,16 @@ SOFTWARE.
-
- #endif /* __arm32__ */
-
-+#ifdef __avr32__
-+
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+#define AVOID_MEMORY_READ
-+
-+#endif /* __avr32__ */
-+
- #if defined (hpux) || defined __hppa__
-
- #define IMAGE_BYTE_ORDER MSBFirst
+++ /dev/null
---- a/configure 2008-03-18 12:07:31.000000000 -0400
-+++ b/configure 2008-03-18 16:13:03.000000000 -0400
-@@ -35720,7 +35720,7 @@ _ACEOF
- ;;
- esac
- KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-+ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
- KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS"
-
- # check if we can build Xephyr
--- /dev/null
+--- a/include/servermd.h.orig 2007-08-23 15:04:54.000000000 -0400
++++ b/include/servermd.h 2007-10-03 12:08:40.000000000 -0400
+@@ -151,6 +151,16 @@ SOFTWARE.
+
+ #endif /* __arm32__ */
+
++#ifdef __avr32__
++
++#define IMAGE_BYTE_ORDER MSBFirst
++#define BITMAP_BIT_ORDER MSBFirst
++#define GLYPHPADBYTES 4
++#define GETLEFTBITS_ALIGNMENT 1
++#define AVOID_MEMORY_READ
++
++#endif /* __avr32__ */
++
+ #if defined (hpux) || defined __hppa__
+
+ #define IMAGE_BYTE_ORDER MSBFirst
--- /dev/null
+--- xserver_xorg-server-1.5.2.old/configure 2009-03-02 19:44:53.000000000 -0800
++++ xserver_xorg-server-1.5.2/configure 2009-03-02 19:39:55.000000000 -0800
+@@ -38770,7 +38770,7 @@
+ ;;
+ esac
+ KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+- KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
++ KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.4.2
+XSERVER_XORG_SERVER_VERSION = 1.5.2
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_AUTORECONF = NO
endif
ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
-XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev
+XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev --disable-glx --disable-dri
else
XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev
endif
XSERVER_XORG_AIGLX:=--disable-aiglx
endif
-XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \
+XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \
xproto_compositeproto xproto_damageproto xproto_fixesproto \
xproto_glproto xproto_kbproto xproto_randrproto \
xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \
+++ /dev/null
---- util-macros-1.1.5/xorg-macros.m4.in.orig 2007-06-08 22:23:00.000000000 +0200
-+++ util-macros-1.1.5/xorg-macros.m4.in 2007-06-08 22:26:41.000000000 +0200
-@@ -194,7 +194,11 @@
- XORG_SGML_PATH=$prefix/share/sgml
- HAVE_DEFS_ENT=
-
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
-+if test "$cross_compiling" = no; then
-+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
-+else
-+ HAVE_DEFS_ENT=no
-+fi
-
- AC_PATH_PROG(LINUXDOC, linuxdoc)
- AC_PATH_PROG(PS2PDF, ps2pdf)
+++ /dev/null
---- util-macros-1.1.5/xorg-macros.m4.in.orig 2007-06-10 11:34:17.000000000 +0200
-+++ util-macros-1.1.5/xorg-macros.m4.in 2007-06-10 11:34:20.000000000 +0200
-@@ -423,3 +423,5 @@
- AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
-
- ]) # XORG_LINT_LIBRARY
-+
-+AC_SUBST(STAGING_DIR)
--- /dev/null
+--- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-08 22:23:00.000000000 +0200
++++ util-macros-1.1.6/xorg-macros.m4.in 2007-06-08 22:26:41.000000000 +0200
+@@ -194,7 +194,11 @@
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++if test "$cross_compiling" = no; then
++ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++else
++ HAVE_DEFS_ENT=no
++fi
+
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
--- /dev/null
+--- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-10 11:34:17.000000000 +0200
++++ util-macros-1.1.6/xorg-macros.m4.in 2007-06-10 11:34:20.000000000 +0200
+@@ -423,3 +423,5 @@
+ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+ ]) # XORG_LINT_LIBRARY
++
++AC_SUBST(STAGING_DIR)
#
################################################################################
-XUTIL_UTIL_MACROS_VERSION = 1.1.5
+XUTIL_UTIL_MACROS_VERSION = 1.1.6
XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
XUTIL_UTIL_MACROS_AUTORECONF = NO
projects / buildroot.git / commitdiff