summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-12-04 10:13:54 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-12-22 13:42:28 +0100
commit49b31c31828747b19b516296da83983e750ae844 (patch)
tree8f55a87cf2488ceee42b74febce033a6a6ac4f54
parent4e88318e8ddf6e42d9a202c58ca757b4230b901f (diff)
xserver-xorg: add 1.7.3 and xf86-video-dummy 0.3.3
-rw-r--r--conf/distro/include/preferred-xorg-versions-live.inc6
-rw-r--r--recipes/xorg-driver/xf86-video-dummy_0.3.3.bb6
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.7.319
3 files changed, 28 insertions, 3 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 0c3c53e40f..3d1ae5235f 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 0000000000..d85ae168b0
--- /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 0000000000..8f72741387
--- /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 "