[oe-commits] Martin Jansa : Latest xorg stuff 2009-10-24
git version control
git at git.openembedded.org
Sat Oct 24 13:20:47 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 883b92198e2806d2e845d808ee8b7bd97dee53c7
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=883b92198e2806d2e845d808ee8b7bd97dee53c7
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Sat Oct 24 09:33:19 2009 +0000
Latest xorg stuff 2009-10-24
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
conf/checksums.ini | 20 +++++++-----
.../include/preferred-xorg-versions-live.inc | 8 ++---
recipes/xorg-lib/libx11-native_1.3.2.bb | 8 +++++
recipes/xorg-lib/libx11_1.3.2.bb | 33 ++++++++++++++++++++
4 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 93e5c44..259941b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1434,6 +1434,10 @@ sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
md5=2fe7dcdbbdbf3b2821f627e02c406caa
sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
+[http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz]
+md5=61156ef32015c56dc0f2e3317f4ae09e
+sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760
+
[http://downloads.sourceforge.net/acpid/acpid-1.0.2.tar.gz]
md5=15884aaf0b82717954f9366b5c00808b
sha256=7347042a5328b22965256d98462e8dd8f1cad37de992b135912f32c70163ae71
@@ -1466,10 +1470,6 @@ sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
md5=1d9c52fe2c0b51f8463f357c2a3d3ddb
sha256=d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1
-[http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz]
-md5=61156ef32015c56dc0f2e3317f4ae09e
-sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760
-
[http://ftp.gnu.org/gnu/classpathx/activation-1.1.1.tar.gz]
md5=de50d7728e8140eb404f2b4554321f8c
sha256=b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7
@@ -4910,10 +4910,6 @@ sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
md5=b57aa1ba0834cbbb1e7502dc2cbfacc2
sha256=8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.3.tar.gz]
-md5=f71641385768e99361bd298568207cee
-sha256=16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
-
[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.14.tar.gz]
md5=2c267ccd45d0b18db8c9edacad63ec98
sha256=f58c66e5117f0c66fbc51f99dd994c5e603baa5df2e3d7250a9d880f2b4e1a54
@@ -4922,6 +4918,10 @@ sha256=f58c66e5117f0c66fbc51f99dd994c5e603baa5df2e3d7250a9d880f2b4e1a54
md5=c7a47b851ebe02f6726b65b78d1b730b
sha256=968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
+[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.3.tar.gz]
+md5=f71641385768e99361bd298568207cee
+sha256=16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
+
[http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz]
md5=b3298d5ce0e4ad4731b1e4e1787d56bb
sha256=fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
@@ -13386,6 +13386,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
md5=5e6895c6003f3f0172ba8a07b865d8b2
sha256=5f612c38492e81eda783feee0b1da79634cabb2375668c3ffd23ee4e3eae9691
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.2.tar.bz2]
+md5=001d780829f936e34851ef7cd37b4dfd
+sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2
+
[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
md5=0545089013213e90aac19b8f8045d32e
sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 0ec11cd..c9e7198 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Fri Oct 23 14:24:20 CEST 2009
+#Sat Oct 24 09:10:02 CEST 2009
PREFERRED_VERSION_appres ?= "1.0.2"
PREFERRED_VERSION_appres-native ?= "1.0.2"
PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -485,8 +485,8 @@ PREFERRED_VERSION_libsm ?= "1.1.1"
PREFERRED_VERSION_libsm-native ?= "1.1.1"
PREFERRED_VERSION_libwindowswm ?= "1.0.1"
PREFERRED_VERSION_libwindowswm-native ?= "1.0.1"
-PREFERRED_VERSION_libx11 ?= "1.3.1"
-PREFERRED_VERSION_libx11-native ?= "1.3.1"
+PREFERRED_VERSION_libx11 ?= "1.3.2"
+PREFERRED_VERSION_libx11-native ?= "1.3.2"
PREFERRED_VERSION_libxau ?= "1.0.5"
PREFERRED_VERSION_libxau-native ?= "1.0.5"
PREFERRED_VERSION_libxaw ?= "1.0.7"
@@ -636,6 +636,4 @@ PREFERRED_VERSION_util-macros-native ?= "1.3.0"
PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
PREFERRED_VERSION_xorg-cf-files-native ?= "1.0.3"
PREFERRED_VERSION_xserver-xorg ?= "1.7.1"
-#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.1"
PREFERRED_VERSION_xserver-xorg-native ?= "1.7.1"
-#PREFERRED_VERSION_xserver-xorg-native ?= "1.7.99.1"
diff --git a/recipes/xorg-lib/libx11-native_1.3.2.bb b/recipes/xorg-lib/libx11-native_1.3.2.bb
new file mode 100644
index 0000000..71b45af
--- /dev/null
+++ b/recipes/xorg-lib/libx11-native_1.3.2.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
+
+inherit native
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
new file mode 100644
index 0000000..a69f0a8
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -0,0 +1,33 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto xproto-native \
+ groff"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.1.6.3.patch;patch=1 \
+ file://dolt-fix.patch;patch=1 \
+ file://keysymdef_include.patch;patch=1"
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util;
+ mv makekeys.c.orig makekeys.c || true
+ touch makekeys-makekeys.o ; gcc makekeys.c -o makekeys
+ mv to stop it getting rebuilt
+ mv makekeys.c makekeys.c.orig
+ cd ../../
+ ) || exit 1
+ oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
More information about the Openembedded-commits
mailing list