[package/xorg]: Upgrade Xorg to 1.6.1

diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
deleted file mode 100644 (file)
index fbd0d26..0000000
--- a/package/pixman/pixman-0.10.0-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in      2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index ba8e80d073d0f4e5ef3b9777d96a62737994a876..d9f38c101579d61027e8af7580159143b1a650ad 100644 (file)
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,10 +3,11 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.10.0
+PIXMAN_VERSION = 0.13.2
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = http://cairographics.org/releases/
 PIXMAN_AUTORECONF = NO
 PIXMAN_INSTALL_STAGING = YES
+PIXMAN_LIBTOOL_PATCH = NO
 
 $(eval $(call AUTOTARGETS,package,pixman))

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 6959641b0c365019bfaa236de49468e6fba6fc16..1f4169714fd806ae313df7cf9216947ba963e5c1 100644 (file)
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_XTRANS_VERSION = 1.2.1
+XLIB_XTRANS_VERSION = 1.2.2
 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_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index cd2b8c211cd9bed27dcac741ff42c91b83e343a7..cf6717fb087e7dda2856752f9e847469e378a145 100644 (file)
--- 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.4
+XPROTO_INPUTPROTO_VERSION = 1.5.1
 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_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index dee2b13abc87938ce3838e807ba07e0fa9b78fc2..dbc7dbe094381f5d16a0e3d0e3513b3aa3d48f84 100644 (file)
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RANDRPROTO_VERSION = 1.2.1
+XPROTO_RANDRPROTO_VERSION = 1.2.99.4
 XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
 XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RANDRPROTO_AUTORECONF = NO

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch
deleted file mode 100644 (file)
index 6fbea60..0000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/include/servermd.h.orig  2007-08-23 15:04:54.000000000 -0400
-+++ b/include/servermd.h       2007-10-03 12:08:40.000000000 -0400
-@@ -151,6 +151,16 @@ SOFTWARE.
- 
- #endif /* __arm32__ */
- 
-+#ifdef __avr32__
-+
-+#define IMAGE_BYTE_ORDER        MSBFirst
-+#define BITMAP_BIT_ORDER        MSBFirst
-+#define GLYPHPADBYTES           4
-+#define GETLEFTBITS_ALIGNMENT   1
-+#define AVOID_MEMORY_READ
-+
-+#endif /* __avr32__ */ 
-+
- #if defined (hpux) || defined __hppa__
- 
- #define IMAGE_BYTE_ORDER      MSBFirst

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
deleted file mode 100644 (file)
index 7f2855f..0000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 e268739fd425b070d3b48d30177562736d88c31b..3eccc2d1f02fb60802c0d4709bd18a033fbd7f3c 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.5.2
+XSERVER_XORG_SERVER_VERSION = 1.6.1
 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
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO
+XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_MESA_DEPS:=mesa3d