xorg: new versions 2010-11-22 libx11, rendercheck, libxxf86misc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

8 files changed, 30 insertions, 47 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index bc4b3ea3ba..9b7290d5d7 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Wed Nov 17 13:36:22 CET 2010
+#Mon Nov 22 13:39:43 CET 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.3"
 PREFERRED_VERSION_bdftopcf ?= "1.0.3"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_mkfontscale ?= "1.0.8"
 PREFERRED_VERSION_mkfontscale-native ?= "1.0.8"
 PREFERRED_VERSION_oclock ?= "1.0.2"
 PREFERRED_VERSION_proxymngr ?= "1.0.2"
-PREFERRED_VERSION_rendercheck ?= "1.3"
+PREFERRED_VERSION_rendercheck ?= "1.4"
 PREFERRED_VERSION_rgb ?= "1.0.4"
 PREFERRED_VERSION_rstart ?= "1.0.4"
 PREFERRED_VERSION_scripts ?= "1.0.1"
@@ -242,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.7"
 PREFERRED_VERSION_libsm ?= "1.2.0"
 PREFERRED_VERSION_libsm-native ?= "1.2.0"
 PREFERRED_VERSION_libwindowswm ?= "1.0.1"
-PREFERRED_VERSION_libx11 ?= "1.3.99.903"
-PREFERRED_VERSION_libx11-native ?= "1.3.99.903"
+PREFERRED_VERSION_libx11 ?= "1.4.0"
+PREFERRED_VERSION_libx11-native ?= "1.4.0"
 PREFERRED_VERSION_libxscrnsaver ?= "1.2.1"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxau ?= "1.0.6"
@@ -282,7 +282,7 @@ PREFERRED_VERSION_libxtst ?= "1.2.0"
 PREFERRED_VERSION_libxv ?= "1.0.6"
 PREFERRED_VERSION_libxvmc ?= "1.0.6"
 PREFERRED_VERSION_libxxf86dga ?= "1.1.2"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.3"
 PREFERRED_VERSION_libxxf86vm ?= "1.1.1"
 PREFERRED_VERSION_libdmx ?= "1.1.1"
 PREFERRED_VERSION_libfontenc ?= "1.1.0"
diff --git a/recipes/xorg-app/rendercheck_1.4.bb b/recipes/xorg-app/rendercheck_1.4.bb
new file mode 100644
index 0000000000..a77f8a0639
--- /dev/null
+++ b/recipes/xorg-app/rendercheck_1.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to test Render extension implementations"
+DEPENDS += "libxrender"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d0e7541004b9a1d8210a63fffebac139"
+SRC_URI[archive.sha256sum] = "6835ce19788e2e9b9ac0307b92adac88daee57edd56e0739c822a0811bc83b87"
diff --git a/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
deleted file mode 100644
index 2e2d475acb..0000000000
--- a/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
-From: Dan Nicholson <dbn.lists@gmail.com>
-Date: Sat, 06 Nov 2010 21:58:09 +0000
-Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
-
-The OS/2 platform requires some utility functions as well as having a
-non-32 bit wchar_t. Fix the configure check so that it doesn't also
-affect the nios2 cpu, which wouldn't influence these operating system
-issues.
-
-Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
-Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/configure.ac b/configure.ac
-index 1b4a8b7..01f43fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
- 
- # arch specific things
- WCHAR32="1"
--case $target_alias in
--  *os2*) os2="true" ; WCHAR32="0" ;;
-+case $target_os in
-+  os2*) os2="true" ; WCHAR32="0" ;;
-   *) ;;
- esac
- AC_SUBST(WCHAR32)
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.4.0/keysymdef_include.patch
index 1a30e345f9..1a30e345f9 100644
--- a/recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch
+++ b/recipes/xorg-lib/libx11-1.4.0/keysymdef_include.patch
diff --git a/recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.4.0/x11_disable_makekeys.patch
index 9763313975..9763313975 100644
--- a/recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch
+++ b/recipes/xorg-lib/libx11-1.4.0/x11_disable_makekeys.patch
diff --git a/recipes/xorg-lib/libx11_1.3.99.903.bb b/recipes/xorg-lib/libx11_1.3.99.903.bb
deleted file mode 100644
index 5ea3291bdc..0000000000
--- a/recipes/xorg-lib/libx11_1.3.99.903.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-#--without-xcb is not an option anymore
-#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
-DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
-PR = "${INC_PR}.1"
-
-SRC_URI += " file://configure.ac-nios2.patch"
-SRC_URI[archive.md5sum] = "3e8ed7a91f70bb819b5dab9c124a7062"
-SRC_URI[archive.sha256sum] = "50205aad0646c0ab13aff8e8eaec7c5cddff416d3a012f83c5661ad98e49736f"
diff --git a/recipes/xorg-lib/libx11_1.4.0.bb b/recipes/xorg-lib/libx11_1.4.0.bb
new file mode 100644
index 0000000000..2b6b1bb4fe
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.4.0.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+#--without-xcb is not an option anymore
+#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
+DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b63d9f7493a61df51d0c0be04ac435e4"
+SRC_URI[archive.sha256sum] = "b2f8fcf30b72226ed5e83975ed1b0665c5fcb3d77d626cc0e66d58f951d1cffb"
diff --git a/recipes/xorg-lib/libxxf86misc_1.0.3.bb b/recipes/xorg-lib/libxxf86misc_1.0.3.bb
new file mode 100644
index 0000000000..95a57c2109
--- /dev/null
+++ b/recipes/xorg-lib/libxxf86misc_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 miscellaneous extension library"
+DEPENDS += "libxext xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6bc0bf78909fd71021c466c793d4385c"
+SRC_URI[archive.sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b"
+
+XORG_PN = "libXxf86misc"