diff options
164 files changed, 416 insertions, 1790 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index b6c5cf517..05e61642b 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -1,5 +1,5 @@ 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 @@ -61,6 +61,7 @@ if BR2_PACKAGE_XORG7 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 @@ -91,6 +92,7 @@ if BR2_PACKAGE_XORG7 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 @@ -116,6 +118,7 @@ if BR2_PACKAGE_XORG7 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 @@ -156,34 +159,13 @@ if BR2_PACKAGE_XORG7 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 @@ -192,20 +174,22 @@ if BR2_PACKAGE_XORG7 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 @@ -225,12 +209,13 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-trident/Config.in source package/x11r7/xdriver_xf86-video-tseng/Config.in source package/x11r7/xdriver_xf86-video-v4l/Config.in + source package/x11r7/xdriver_xf86-video-vermilion/Config.in source package/x11r7/xdriver_xf86-video-vesa/Config.in - source package/x11r7/xdriver_xf86-video-vga/Config.in - source package/x11r7/xdriver_xf86-video-via/Config.in source package/x11r7/xdriver_xf86-video-vmware/Config.in source package/x11r7/xdriver_xf86-video-voodoo/Config.in + source package/x11r7/xdriver_xf86-video-wsfb/Config.in source package/x11r7/xdriver_xf86-video-xgi/Config.in + source package/x11r7/xdriver_xf86-video-xgixp/Config.in endmenu endif menu "X11R7 Fonts" diff --git a/package/x11r7/mesa3d/mesa3d-7.0.3-cleanup.patch b/package/x11r7/mesa3d/mesa3d-7.0.3-cleanup.patch deleted file mode 100644 index 9a76d57d0..000000000 --- a/package/x11r7/mesa3d/mesa3d-7.0.3-cleanup.patch +++ /dev/null @@ -1,436 +0,0 @@ -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) ; \ diff --git a/package/x11r7/mesa3d/mesa3d-7.0.3-gen_matypes.patch b/package/x11r7/mesa3d/mesa3d-7.0.3-gen_matypes.patch deleted file mode 100644 index 6b1f570ff..000000000 --- a/package/x11r7/mesa3d/mesa3d-7.0.3-gen_matypes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index 01df68731..644c1bcf2 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -3,7 +3,7 @@ # 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) @@ -72,7 +72,7 @@ $(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built 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 diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk index 987751811..252507e57 100644 --- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk +++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk index 0fe42356b..9d0a140af 100644 --- a/package/x11r7/xapp_luit/xapp_luit.mk +++ b/package/x11r7/xapp_luit/xapp_luit.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk index 94238eb56..abd7aa04e 100644 --- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk +++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index 2fae08727..05a3f8146 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 2013065cf..7ffad7968 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk index a228fe157..d2e9f1cbe 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xauth/xapp_xauth-1.0.2-xcb.patch b/package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch index 45b374562..61c6b14f9 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth-1.0.2-xcb.patch +++ b/package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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]) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index 1a2b5716e..06c90c111 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xbacklight/Config.in b/package/x11r7/xapp_xbacklight/Config.in new file mode 100644 index 000000000..c0b125363 --- /dev/null +++ b/package/x11r7/xapp_xbacklight/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_XAPP_XBACKLIGHT + bool "xbacklight" + select BR2_PACKAGE_XLIB_LIBX11 + help + xbacklight 1.1 + xbacklight diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk new file mode 100644 index 000000000..9034cd3a5 --- /dev/null +++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index 822e660ba..3b6859163 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk index 8f96495d4..27b7d51b5 100644 --- a/package/x11r7/xapp_xev/xapp_xev.mk +++ b/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xinput/Config.in b/package/x11r7/xapp_xinput/Config.in new file mode 100644 index 000000000..133499a92 --- /dev/null +++ b/package/x11r7/xapp_xinput/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_XAPP_XINPUT + bool "xinput" + select BR2_PACKAGE_XLIB_LIBX11 + help + xinput 1.3.0 + xinput diff --git a/package/x11r7/xapp_xinput/xapp_xbacklight.mk b/package/x11r7/xapp_xinput/xapp_xbacklight.mk new file mode 100644 index 000000000..eb4f1e130 --- /dev/null +++ b/package/x11r7/xapp_xinput/xapp_xbacklight.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index 23301ab4a..67de0d8ac 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk index f6e73f2f3..a73530312 100644 --- a/package/x11r7/xapp_xpr/xapp_xpr.mk +++ b/package/x11r7/xapp_xpr/xapp_xpr.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index 13e610b95..aee9966fc 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch index 6dc353466..6dc353466 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch +++ b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 3594e59b4..960e26f29 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk index 1cfd414d8..4a65ba560 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk index 97e9e9536..70396e53f 100644 --- a/package/x11r7/xapp_xset/xapp_xset.mk +++ b/package/x11r7/xapp_xset/xapp_xset.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk index c6946ccdd..00da82850 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.mk +++ b/package/x11r7/xapp_xwd/xapp_xwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 9ecdcfadd..e2afbf285 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk index 883fa60e6..cca26ddc9 100644 --- a/package/x11r7/xcb-util/xcb-util.mk +++ b/package/x11r7/xcb-util/xcb-util.mk @@ -7,5 +7,7 @@ XCB_UTIL_VERSION = 0.2 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)) diff --git a/package/x11r7/xdriver_xf86-input-calcomp/Config.in b/package/x11r7/xdriver_xf86-input-calcomp/Config.in deleted file mode 100644 index ee8e67ff2..000000000 --- a/package/x11r7/xdriver_xf86-input-calcomp/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk deleted file mode 100644 index 3990c8298..000000000 --- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-citron/Config.in b/package/x11r7/xdriver_xf86-input-citron/Config.in deleted file mode 100644 index d11d32c61..000000000 --- a/package/x11r7/xdriver_xf86-input-citron/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk deleted file mode 100644 index 815c7a3b5..000000000 --- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/Config.in b/package/x11r7/xdriver_xf86-input-digitaledge/Config.in deleted file mode 100644 index 326e331ee..000000000 --- a/package/x11r7/xdriver_xf86-input-digitaledge/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk deleted file mode 100644 index dc3d157a5..000000000 --- a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-dmc/Config.in b/package/x11r7/xdriver_xf86-input-dmc/Config.in deleted file mode 100644 index 8da0fa591..000000000 --- a/package/x11r7/xdriver_xf86-input-dmc/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk deleted file mode 100644 index c845378a8..000000000 --- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-dynapro/Config.in b/package/x11r7/xdriver_xf86-input-dynapro/Config.in deleted file mode 100644 index 415e8d22d..000000000 --- a/package/x11r7/xdriver_xf86-input-dynapro/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk deleted file mode 100644 index 5050aa5b1..000000000 --- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-elo2300/Config.in b/package/x11r7/xdriver_xf86-input-elo2300/Config.in deleted file mode 100644 index 563e90ff6..000000000 --- a/package/x11r7/xdriver_xf86-input-elo2300/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk deleted file mode 100644 index 538607a91..000000000 --- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-elographics/Config.in b/package/x11r7/xdriver_xf86-input-elographics/Config.in deleted file mode 100644 index 6dd70275a..000000000 --- a/package/x11r7/xdriver_xf86-input-elographics/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk deleted file mode 100644 index ce7140f29..000000000 --- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch deleted file mode 100644 index e2748724a..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch +++ /dev/null @@ -1,324 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch deleted file mode 100644 index 91240faa3..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -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)) diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch deleted file mode 100644 index a70832568..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch deleted file mode 100644 index 5b3737eca..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 { diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch deleted file mode 100644 index e00042406..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch +++ /dev/null @@ -1,18 +0,0 @@ -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); diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch deleted file mode 100644 index d38f56689..000000000 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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; diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk index 6f1e3cbb5..4b6f1a834 100644 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-input-fpit/Config.in b/package/x11r7/xdriver_xf86-input-fpit/Config.in deleted file mode 100644 index 4d3a3948e..000000000 --- a/package/x11r7/xdriver_xf86-input-fpit/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk deleted file mode 100644 index 1744bbb6f..000000000 --- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/Config.in b/package/x11r7/xdriver_xf86-input-hyperpen/Config.in deleted file mode 100644 index 5cf9ea049..000000000 --- a/package/x11r7/xdriver_xf86-input-hyperpen/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk deleted file mode 100644 index 94275bc5f..000000000 --- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/Config.in b/package/x11r7/xdriver_xf86-input-jamstudio/Config.in deleted file mode 100644 index ad0e9a50e..000000000 --- a/package/x11r7/xdriver_xf86-input-jamstudio/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk deleted file mode 100644 index b6ff0839f..000000000 --- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# 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)) - diff --git a/package/x11r7/xdriver_xf86-input-magellan/Config.in b/package/x11r7/xdriver_xf86-input-magellan/Config.in deleted file mode 100644 index 273560ac4..000000000 --- a/package/x11r7/xdriver_xf86-input-magellan/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk deleted file mode 100644 index f56b25e72..000000000 --- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-magictouch/Config.in b/package/x11r7/xdriver_xf86-input-magictouch/Config.in deleted file mode 100644 index bec6f2ba5..000000000 --- a/package/x11r7/xdriver_xf86-input-magictouch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk deleted file mode 100644 index 294f525cf..000000000 --- a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-microtouch/Config.in b/package/x11r7/xdriver_xf86-input-microtouch/Config.in deleted file mode 100644 index 5939ff845..000000000 --- a/package/x11r7/xdriver_xf86-input-microtouch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk deleted file mode 100644 index caabcddbf..000000000 --- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-mutouch/Config.in b/package/x11r7/xdriver_xf86-input-mutouch/Config.in deleted file mode 100644 index 5bb61a10b..000000000 --- a/package/x11r7/xdriver_xf86-input-mutouch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk deleted file mode 100644 index 2d8059967..000000000 --- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-palmax/Config.in b/package/x11r7/xdriver_xf86-input-palmax/Config.in deleted file mode 100644 index 17d26ed1c..000000000 --- a/package/x11r7/xdriver_xf86-input-palmax/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk deleted file mode 100644 index 2c9ed610c..000000000 --- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-penmount/Config.in b/package/x11r7/xdriver_xf86-input-penmount/Config.in deleted file mode 100644 index dd5770c2d..000000000 --- a/package/x11r7/xdriver_xf86-input-penmount/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk deleted file mode 100644 index 593476ebf..000000000 --- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/Config.in b/package/x11r7/xdriver_xf86-input-spaceorb/Config.in deleted file mode 100644 index 0c2c565ff..000000000 --- a/package/x11r7/xdriver_xf86-input-spaceorb/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk deleted file mode 100644 index 354791e05..000000000 --- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-summa/Config.in b/package/x11r7/xdriver_xf86-input-summa/Config.in deleted file mode 100644 index 8aace13ea..000000000 --- a/package/x11r7/xdriver_xf86-input-summa/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk deleted file mode 100644 index 59b4de93f..000000000 --- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.15.0-configure.patch index 0bb70d506..524af1db7 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.15.0-configure.patch @@ -1,4 +1,4 @@ -diff -Nwrup xfree86-driver-synaptics_0.14.7~git20070706.orig/configure xdriver_xf86-input-synaptics-0.14.7~git20070706/configure +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 @@ diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk index 48d464bec..27e789839 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-input-tek4957/Config.in b/package/x11r7/xdriver_xf86-input-tek4957/Config.in deleted file mode 100644 index c81789543..000000000 --- a/package/x11r7/xdriver_xf86-input-tek4957/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk deleted file mode 100644 index e012d5b4a..000000000 --- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-input-ur98/Config.in b/package/x11r7/xdriver_xf86-input-ur98/Config.in deleted file mode 100644 index ede179d47..000000000 --- a/package/x11r7/xdriver_xf86-input-ur98/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk deleted file mode 100644 index 9c047e7c6..000000000 --- a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk index 91ceb8c38..60ff7cd5a 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 08356adcb..b59201589 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch deleted file mode 100644 index 09b371273..000000000 --- a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk deleted file mode 100644 index 2510d3122..000000000 --- a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index 705850a25..0d50a8740 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in new file mode 100644 index 000000000..3af9a57ae --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-geode/Config.in @@ -0,0 +1,11 @@ +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 diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk new file mode 100644 index 000000000..6909af4a4 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-glide/Config.in b/package/x11r7/xdriver_xf86-video-glide/Config.in new file mode 100644 index 000000000..d372c5f63 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glide/Config.in @@ -0,0 +1,11 @@ +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 diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk new file mode 100644 index 000000000..fc23e59ca --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch index 8c420d3a8..8c420d3a8 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk index a8e31b3d3..b06108637 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk index 0e222df97..b6123a881 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-i810/Config.in b/package/x11r7/xdriver_xf86-video-i810/Config.in deleted file mode 100644 index 659b2ab6f..000000000 --- a/package/x11r7/xdriver_xf86-video-i810/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch deleted file mode 100644 index 9f0179d59..000000000 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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]) diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk deleted file mode 100644 index d9980cdb0..000000000 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-nsc/Config.in b/package/x11r7/xdriver_xf86-video-impact/Config.in index 3f78aa699..1547ffd4a 100644 --- a/package/x11r7/xdriver_xf86-video-nsc/Config.in +++ b/package/x11r7/xdriver_xf86-video-impact/Config.in @@ -1,13 +1,12 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NSC - bool "xf86-video-nsc" +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_XF86DGAPROTO select BR2_PACKAGE_XPROTO_XPROTO help - xf86-video-nsc 2.8.3 - Nsc video driver + xf86-video-impact 0.2.0 + Impact video driver diff --git a/package/x11r7/xdriver_xf86-video-impact/xdriver_xf86-video-impact.mk b/package/x11r7/xdriver_xf86-video-impact/xdriver_xf86-video-impact.mk new file mode 100644 index 000000000..fa42731a0 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-impact/xdriver_xf86-video-impact.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk deleted file mode 100644 index 0f2a28e45..000000000 --- a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch index 0258d7018..ff476bd0e 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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]) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 7e81cc9eb..829cc3a5d 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-cyrix/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in index c473337ae..4454a2f62 100644 --- a/package/x11r7/xdriver_xf86-video-cyrix/Config.in +++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in @@ -1,12 +1,11 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CYRIX - bool "xf86-video-cyrix" +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_XF86DGAPROTO select BR2_PACKAGE_XPROTO_XPROTO help - xf86-video-cyrix 1.1.0 - Cyrix video driver + xf86-video-mach64 6.8.0 + mach64 video driver diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk new file mode 100644 index 000000000..a28d6718d --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.9.patch index 34cc1330c..5707bd1b3 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.9.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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 diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 40f580a3d..1345ca72f 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk deleted file mode 100644 index b72cccddf..000000000 --- a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index ec1f8f881..481d999a6 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in index f78429d4f..3921a92f5 100644 --- a/package/x11r7/openchrome/Config.in +++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_OPENCHROME - bool "openchrome" + bool "xf86-video-openchrome" select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XLIB_LIBX11 diff --git a/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch b/package/x11r7/xdriver_xf86-video-openchrome/openchrome-0.2.903-cross-compile.patch index c7bfc9350..c7bfc9350 100644 --- a/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-openchrome/openchrome-0.2.903-cross-compile.patch diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/openchrome.mk index 09af445eb..8ced23e56 100644 --- a/package/x11r7/openchrome/openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/openchrome.mk @@ -3,7 +3,7 @@ # openchrome # ############################################################# -OPENCHROME_VERSION = 0.2.902 +OPENCHROME_VERSION = 0.2.903 OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2 OPENCHROME_SITE = http://www.openchrome.org/releases diff --git a/package/x11r7/xdriver_xf86-video-vga/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in index 30673718f..616849c22 100644 --- a/package/x11r7/xdriver_xf86-video-vga/Config.in +++ b/package/x11r7/xdriver_xf86-video-r128/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VGA - bool "xf86-video-vga" +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 @@ -7,5 +7,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VGA select BR2_PACKAGE_XPROTO_XEXTPROTO select BR2_PACKAGE_XPROTO_XPROTO help - xf86-video-vga 4.1.0 - Generic VGA video driver + xf86-video-r128 6.8.0 + R128 video driver diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk new file mode 100644 index 000000000..0804fea91 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.1.0.patch b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.2.0.patch index 7dceabef4..36db305ce 100644 --- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.1.0.patch +++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.2.0.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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 diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk index 44c068a68..845152eea 100644 --- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk +++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk index f915f6d5c..ddfb61d9a 100644 --- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk +++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.2.0-cross-compile.patch index fac8018aa..fac8018aa 100644 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.2.0-cross-compile.patch diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk index ce9a18a8b..673164673 100644 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-vermilion/Config.in b/package/x11r7/xdriver_xf86-video-vermilion/Config.in new file mode 100644 index 000000000..ffc46fc3b --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-vermilion/Config.in @@ -0,0 +1,12 @@ +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 diff --git a/package/x11r7/xdriver_xf86-video-vermilion/xdriver_xf86-video-vermilion.mk b/package/x11r7/xdriver_xf86-video-vermilion/xdriver_xf86-video-vermilion.mk new file mode 100644 index 000000000..43769f193 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-vermilion/xdriver_xf86-video-vermilion.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-1.3.0.patch b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch index 89dc6d7b4..bf9ffe79e 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-1.3.0.patch +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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) diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index 4b8b39bde..6c672691e 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk deleted file mode 100644 index 39ff29e5b..000000000 --- a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-via/Config.in b/package/x11r7/xdriver_xf86-video-via/Config.in deleted file mode 100644 index 5aeec78df..000000000 --- a/package/x11r7/xdriver_xf86-video-via/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch deleted file mode 100644 index 5ebdd9b28..000000000 --- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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]) diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk deleted file mode 100644 index a244e0481..000000000 --- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# 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)) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index f07652feb..be1bdafe3 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xdriver_xf86-video-imstt/Config.in b/package/x11r7/xdriver_xf86-video-wsfb/Config.in index 30e1833fc..4dd39bdb3 100644 --- a/package/x11r7/xdriver_xf86-video-imstt/Config.in +++ b/package/x11r7/xdriver_xf86-video-wsfb/Config.in @@ -1,10 +1,11 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMSTT - bool "xf86-video-imstt" +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-imstt 1.1.0 - Integrated Micro Solutions Twin Turbo 128 driver + xf86-video-wsfb 0.2.1 + WSFB based chips video driver diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk new file mode 100644 index 000000000..7f829c140 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xdriver_xf86-video-xgixp/Config.in b/package/x11r7/xdriver_xf86-video-xgixp/Config.in new file mode 100644 index 000000000..a42a8035f --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-xgixp/Config.in @@ -0,0 +1,11 @@ +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 diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk new file mode 100644 index 000000000..f8e99b44e --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk index 44060416e..8a5bf4ae2 100644 --- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 358a6d2ba..4d41b59c2 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 285971346..70df5f0b5 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -4,12 +4,12 @@ # ################################################################################ -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)) diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.1.3-makekeys-nocc.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.1.5-makekeys-nocc.patch index cefb1a513..df0825d9c 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11-1.1.3-makekeys-nocc.patch +++ b/package/x11r7/xlib_libX11/xlib_libX11-1.1.5-makekeys-nocc.patch @@ -1,6 +1,7 @@ ---- 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) +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) @@ -9,9 +10,10 @@ - $(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@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -307,18 +307,18 @@ distclean-compile: + am__depfiles_maybe = depfiles +@@ -311,18 +310,18 @@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< makekeys-makekeys.o: makekeys.c diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 9e464d5d0..e5619668d 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk index c71ac05e1..d2323fa7c 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index 728f84159..907f86bbe 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index cca3a6ed7..957c52c2a 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index 33e4c6bd7..1b646acfe 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont-1.2.7-susv3-legacy.patch b/package/x11r7/xlib_libXfont/xlib_libXfont-1.2.7-susv3-legacy.patch deleted file mode 100644 index 6aef12bad..000000000 --- a/package/x11r7/xlib_libXfont/xlib_libXfont-1.2.7-susv3-legacy.patch +++ /dev/null @@ -1,12 +0,0 @@ -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; diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 58682c8c3..39b25fc81 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 8a2f049f7..b112d235e 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index c470b8c34..f13ace433 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk index 0bbb43820..e6c01b5fe 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index 1ceeee0cc..83dc60b19 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs-nocc.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs-nocc.patch deleted file mode 100644 index b919ca792..000000000 --- a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs-nocc.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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' diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch new file mode 100644 index 000000000..284ce625d --- /dev/null +++ b/package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch @@ -0,0 +1,52 @@ +--- + 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 diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index 7e281c684..546721aa8 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index b299a1ada..be38208bb 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 6845339e9..b1b5bcd41 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in new file mode 100644 index 000000000..5b52e0fcb --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_XLIB_LIBPCIACCESS + bool "libpciaccess" + help + libpciaccess 0.10.3 + X.Org libpciaccess diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch new file mode 100644 index 000000000..6608d0dbb --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch @@ -0,0 +1,20 @@ +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) diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk new file mode 100644 index 000000000..94c52f194 --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# 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)) diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index d7fde6d51..4c9cb691a 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk index a3695e33b..6959641b0 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk index 252acc77f..339a71184 100644 --- a/package/x11r7/xproto_glproto/xproto_glproto.mk +++ b/package/x11r7/xproto_glproto/xproto_glproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk index a89f1ec68..cd2b8c211 100644 --- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk +++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk index 13aad1810..80c9e1051 100644 --- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk +++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk index feb74bdce..264c28eea 100644 --- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk +++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk index 78a30107b..9d4faf4f6 100644 --- a/package/x11r7/xproto_xproto/xproto_xproto.mk +++ b/package/x11r7/xproto_xproto/xproto_xproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch deleted file mode 100644 index 8072bcd14..000000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-tslib-fix.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-tslib-fix.patch deleted file mode 100644 index 2ebafd2fc..000000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-tslib-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-servermd-add-avr32.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch index 6fbea607f..6fbea607f 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-servermd-add-avr32.patch +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch new file mode 100644 index 000000000..7f2855fd9 --- /dev/null +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch @@ -0,0 +1,11 @@ +--- 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" diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 2e9eddf27..b0e1bc3d0 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 @@ -20,7 +20,7 @@ XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg 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 @@ -43,7 +43,7 @@ else 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 \ diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch index 9f7dfaabb..26c83aac0 100644 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch +++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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= diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch index 97a2dc4d1..3b70e7cc3 100644 --- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch +++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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]) diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk index 2baeeb93f..9cc2a4518 100644 --- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk +++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 |