[oe-commits] Martin Jansa : shr/merge: Latest xorg stuff 2009-10-23 only xserver stay with 1.7.1 instead of 1.7. 99.1

git version control git at git.openembedded.org
Fri Oct 23 15:08:57 UTC 2009 

Module: openembedded.git
Branch: shr/merge
Commit: ad75ad90dd26f3faae5e006412eeabf7eae7d5ff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ad75ad90dd26f3faae5e006412eeabf7eae7d5ff

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Oct 23 11:53:22 2009 +0000

shr/merge: Latest xorg stuff 2009-10-23 only xserver stay with 1.7.1 instead of 1.7.99.1

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/checksums.ini                                 |   12 ++++++++++++
 .../include/preferred-xorg-versions-live.inc       |   16 +++++++++-------
 recipes/xorg-doc/xorg-sgml-doctools_1.3.bb         |    4 ++++
 recipes/xorg-lib/libxext-native_1.1.1.bb           |   12 ++++++++++++
 recipes/xorg-lib/libxext_1.1.1.bb                  |    9 +++++++++
 recipes/xorg-xserver/xserver-xorg_1.7.1.bb         |   19 +++++++++++++++++++
 6 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0e04b78..fdc0105 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13582,6 +13582,10 @@ sha256=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
 md5=24da44888b87c66edb326acec35b85aa
 sha256=af941a61486ded37ae58c14ae2612046a3c88c36f825aa9b1769a8a704ebee8e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.1.1.tar.bz2]
+md5=c417c0e8df39a067f90a2a2e7133637d
+sha256=110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3
+
 [http://xorg.freedesktop.org/releases/individual/lib/libXext-1.1.tar.bz2]
 md5=b8ee455effbcaf5a475870e92ed6973c
 sha256=5ebde6ef24d04db758ce60f5b99f96926ba1215547cdff88753d9a2b46fc3e26
@@ -30046,6 +30050,10 @@ sha256=76adfb910784a1ba11508a2eb04cdb0cbf73173ae3aa1af9253235a3b237748d
 md5=e0b70d3d542959f677210172d2b0f237
 sha256=e55996b1e4217f84c61fd8d1126d7171295d83ddfaa63c5c516c63bf4703a6c4
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.1.tar.bz2]
+md5=dda7842467cda6018fdc87e6002e4db1
+sha256=a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -30070,6 +30078,10 @@ sha256=769919b80b84d24c9427dad7eab1cace4e3864965869ae3518fb8a643daf0cb4
 md5=f930e5be117922f0841614c8d43f1ae8
 sha256=4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea
 
+[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.3.tar.bz2]
+md5=1e3ee108688d1df91049a565813c973d
+sha256=d5c0279fa84dc4a61ba2a6a9a892b34b7e9266f9562721b529b0296f5b75dbb2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/doc/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2]
 md5=d08d4fd10ac46d8b4636efe4d8c0de74
 sha256=2a676fdaf45a7a1e40f4df2cbd09d542672c2d0fe1f890a874b8719e0a448ad7
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index a06429f..0ec11cd 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Mon Oct 19 09:12:31 CEST 2009
+#Fri Oct 23 14:24:20 CEST 2009
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_appres-native ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -215,8 +215,8 @@ PREFERRED_VERSION_xkeyboard-config ?= "1.4"
 PREFERRED_VERSION_xkeyboard-config-native ?= "1.4"
 PREFERRED_VERSION_xorg-docs ?= "1.4.99.902"
 PREFERRED_VERSION_xorg-docs-native ?= "1.4.99.902"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2.99.901"
-PREFERRED_VERSION_xorg-sgml-doctools-native ?= "1.2.99.901"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
+PREFERRED_VERSION_xorg-sgml-doctools-native ?= "1.3"
 PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-acecad-native ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
@@ -501,8 +501,8 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.3"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
 PREFERRED_VERSION_libxevie-native ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.1"
-PREFERRED_VERSION_libxext-native ?= "1.1"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-native ?= "1.1.1"
 PREFERRED_VERSION_libxfixes ?= "4.0.4"
 PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
 PREFERRED_VERSION_libxfont ?= "1.4.1"
@@ -635,5 +635,7 @@ PREFERRED_VERSION_util-macros ?= "1.3.0"
 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.0.902"
-PREFERRED_VERSION_xserver-xorg-native ?= "1.7.0.902"
+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-doc/xorg-sgml-doctools_1.3.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.3.bb
new file mode 100644
index 0000000..053ca2e
--- /dev/null
+++ b/recipes/xorg-doc/xorg-sgml-doctools_1.3.bb
@@ -0,0 +1,4 @@
+require xorg-doc-common.inc
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/recipes/xorg-lib/libxext-native_1.1.1.bb b/recipes/xorg-lib/libxext-native_1.1.1.bb
new file mode 100644
index 0000000..531242e
--- /dev/null
+++ b/recipes/xorg-lib/libxext-native_1.1.1.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto-native libx11-native xextproto-native libxau-native util-macros-native"
+PROVIDES = "xext-native"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
+
+inherit native 
+
diff --git a/recipes/xorg-lib/libxext_1.1.1.bb b/recipes/xorg-lib/libxext_1.1.1.bb
new file mode 100644
index 0000000..81231a8
--- /dev/null
+++ b/recipes/xorg-lib/libxext_1.1.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
new file mode 100644
index 0000000..8f72741
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
@@ -0,0 +1,19 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+PR = "r1"
+
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch;patch=1 \
+            file://randr-support-1.7.0.patch;patch=1 \
+           "
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "

More information about the Openembedded-commits mailing list