[oe-commits] Martin Jansa : xserver-xorg: add 1.7.3 and xf86-video-dummy 0.3.3

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Dec  4 10:13:54 2009 +0100

xserver-xorg: add 1.7.3 and xf86-video-dummy 0.3.3

---

 conf/checksums.ini                                 |    8 ++++++++
 .../include/preferred-xorg-versions-live.inc       |    6 +++---
 recipes/xorg-driver/xf86-video-dummy_0.3.3.bb      |    6 ++++++
 recipes/xorg-xserver/xserver-xorg_1.7.3            |   19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a8bced9..0e405e7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28338,6 +28338,10 @@ sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
 md5=2a6f1f07462fbe336865068cd69c8593
 sha256=9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.3.tar.bz2]
+md5=3ffe3a28f4452e66bf56180e7da9cbc5
+sha256=df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2]
 md5=462654f9be7e3022f97147e3390db97a
 sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698
@@ -30138,6 +30142,10 @@ sha256=a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
 md5=5c087e0f555203065fd90d02ef5f736e
 sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.3.tar.bz2]
+md5=4c63b22cad9ed8ae8b86561f0f92c327
+sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 0c3c53e..3d1ae52 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Sun Nov 29 09:04:41 CET 2009
+#Fri Dec  4 07:59:36 CET 2009
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -147,7 +147,7 @@ PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
 PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
 PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
@@ -350,4 +350,4 @@ PREFERRED_VERSION_util-macros ?= "1.3.0"
 PREFERRED_VERSION_util-macros-native ?= "1.3.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.7.2"
+PREFERRED_VERSION_xserver-xorg ?= "1.7.3"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
new file mode 100644
index 0000000..d85ae16
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- dummy display driver"
+
+SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3 b/recipes/xorg-xserver/xserver-xorg_1.7.3
new file mode 100644
index 0000000..8f72741
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3
@@ -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 "