From c3b150f9b649a3e9d60f18f71f9f864ce2f11526 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:43:59 +0000
Subject: xwd_1.0.2.bb : new version for X11R7.4

---
 packages/xorg-app/xwd_1.0.2.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-app/xwd_1.0.2.bb

(limited to 'packages')

diff --git a/packages/xorg-app/xwd_1.0.2.bb b/packages/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000000..7b712390c6
--- /dev/null
+++ b/packages/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
+
-- 
cgit v1.2.3


From fe57f804af1f62c2882dc833b20e6216d2f10ee5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:44:23 +0000
Subject: xwininfo_1.0.4.bb : new version for X11R7.4

---
 packages/xorg-app/xwininfo_1.0.4.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-app/xwininfo_1.0.4.bb

(limited to 'packages')

diff --git a/packages/xorg-app/xwininfo_1.0.4.bb b/packages/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000000..069dd30aa8
--- /dev/null
+++ b/packages/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu libxext virtual/libx11"
+
-- 
cgit v1.2.3


From d85576bcaced88ed82fe6a4752bc0d12a74db1c5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:44:44 +0000
Subject: xserver-xorg_1.5.1.bb : new version for X11R7.4

drmfix.patch was refreshed for this version, problem still there though
---
 packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch | 13 +++++++++++++
 packages/xorg-xserver/xserver-xorg_1.5.1.bb           | 15 +++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
 create mode 100644 packages/xorg-xserver/xserver-xorg_1.5.1.bb

(limited to 'packages')

diff --git a/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
new file mode 100644
index 0000000000..e0f633bc24
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am	2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+ 
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+ 
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
new file mode 100644
index 0000000000..087692d700
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -0,0 +1,15 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess"
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
+
+MESA_VER = "7.2"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
+
+export LDFLAGS += " -ldl "
-- 
cgit v1.2.3


From 78aea95c4966bdb65f0a2f499ea971bc3d0e9042 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 11:44:07 +0000
Subject: libx11_1.1.5.bb : add new version for X11R7.4, keysymdef patch had to
 be refreshed for this version.

---
 packages/xorg-lib/libx11/keysymdef_include.patch | 29 ++++++++++++++++++++++
 packages/xorg-lib/libx11_1.1.5.bb                | 31 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 packages/xorg-lib/libx11/keysymdef_include.patch
 create mode 100644 packages/xorg-lib/libx11_1.1.5.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libx11/keysymdef_include.patch b/packages/xorg-lib/libx11/keysymdef_include.patch
new file mode 100644
index 0000000000..07487b6b2e
--- /dev/null
+++ b/packages/xorg-lib/libx11/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac	2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac	2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++	KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++	dir=`pkg-config --variable=includedir xproto`
++	KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+-        AC_MSG_RESULT([$KEYSYMDEF])
++	AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ 	AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+ 
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/packages/xorg-lib/libx11_1.1.5.bb b/packages/xorg-lib/libx11_1.1.5.bb
new file mode 100644
index 0000000000..a22b7a0158
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.5.bb
@@ -0,0 +1,31 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.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 ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} 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"
-- 
cgit v1.2.3


From 7dd85f96a988b90f9aeb1fcdcd9ae855e41f26d5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 11:50:40 +0000
Subject: diet-x11_1.1.5.bb : new version for X11R7.4

---
 packages/xorg-lib/diet-x11_1.1.5.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/xorg-lib/diet-x11_1.1.5.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/diet-x11_1.1.5.bb b/packages/xorg-lib/diet-x11_1.1.5.bb
new file mode 100644
index 0000000000..19a9efecbf
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.5.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
-- 
cgit v1.2.3


From 3a037b5f5846049ad7d6027d4434507fc103d472 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 13:11:06 +0000
Subject: xf86-input-evdev_2.0.4.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-evdev_2.0.4.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-evdev_2.0.4.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-input-evdev_2.0.4.bb b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
-- 
cgit v1.2.3


From 492c7a952aeb65a0ab2c89f32093c7c9fbf997ab Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:35:38 +0000
Subject: xproto_7.0.13.bb, xproto-native_7.0.13.bb : new versions for X11R7.4

---
 packages/xorg-proto/xproto-native_7.0.13.bb | 3 +++
 packages/xorg-proto/xproto_7.0.13.bb        | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 packages/xorg-proto/xproto-native_7.0.13.bb
 create mode 100644 packages/xorg-proto/xproto_7.0.13.bb

(limited to 'packages')

diff --git a/packages/xorg-proto/xproto-native_7.0.13.bb b/packages/xorg-proto/xproto-native_7.0.13.bb
new file mode 100644
index 0000000000..5dde8a7d4a
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.13.bb
@@ -0,0 +1,3 @@
+require xproto_${PV}.bb
+
+inherit native
diff --git a/packages/xorg-proto/xproto_7.0.13.bb b/packages/xorg-proto/xproto_7.0.13.bb
new file mode 100644
index 0000000000..b403ff5615
--- /dev/null
+++ b/packages/xorg-proto/xproto_7.0.13.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+
+PR = "r0"
+PE = "1"
+
+XORG_PN = "xproto"
-- 
cgit v1.2.3


From edd05a7791c19ab173c6a99a7d9813e4a05ad583 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:36:39 +0000
Subject: libsm_1.1.0.bb : new version for X11R7.4

---
 packages/xorg-lib/libsm_1.1.0.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-lib/libsm_1.1.0.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libsm_1.1.0.bb b/packages/xorg-lib/libsm_1.1.0.bb
new file mode 100644
index 0000000000..669b29c937
--- /dev/null
+++ b/packages/xorg-lib/libsm_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libSM"
-- 
cgit v1.2.3


From 77d762f34ed4f09d56929a77ddbdf32090efdbfe Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:37:14 +0000
Subject: libxft_2.1.13.bb : new version for X11R7.4

---
 packages/xorg-lib/libxft_2.1.13.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/xorg-lib/libxft_2.1.13.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxft_2.1.13.bb b/packages/xorg-lib/libxft_2.1.13.bb
new file mode 100644
index 0000000000..84d0cc2cbe
--- /dev/null
+++ b/packages/xorg-lib/libxft_2.1.13.bb
@@ -0,0 +1,20 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXft"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}"
-- 
cgit v1.2.3


From 5c8db19a138ca178ecfec43c7eac2b275ea2f5fd Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:37:45 +0000
Subject: libxrandr_1.2.3.bb : new version for X11R7.4

---
 packages/xorg-lib/libxrandr_1.2.3.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 packages/xorg-lib/libxrandr_1.2.3.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxrandr_1.2.3.bb b/packages/xorg-lib/libxrandr_1.2.3.bb
new file mode 100644
index 0000000000..f6d7623bca
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_1.2.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXrandr"
-- 
cgit v1.2.3


From 48b29041deae4053038d13fd81f52e04610b61f9 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:38:10 +0000
Subject: libxxf86vm_1.0.2.bb : new version for X11R7.4

---
 packages/xorg-lib/libxxf86vm_1.0.2.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-lib/libxxf86vm_1.0.2.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxxf86vm_1.0.2.bb b/packages/xorg-lib/libxxf86vm_1.0.2.bb
new file mode 100644
index 0000000000..2d1af9c9aa
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXxf86vm"
-- 
cgit v1.2.3


From 00cccdc8f03f15fd2dc05225ab6df273e53c18cb Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:41:36 +0000
Subject: xcursorgen-native_1.0.2.bb : add a native version for X11R7.4

---
 packages/xorg-app/xcursorgen-native_1.0.2.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-app/xcursorgen-native_1.0.2.bb

(limited to 'packages')

diff --git a/packages/xorg-app/xcursorgen-native_1.0.2.bb b/packages/xorg-app/xcursorgen-native_1.0.2.bb
new file mode 100644
index 0000000000..0cbf9fc716
--- /dev/null
+++ b/packages/xorg-app/xcursorgen-native_1.0.2.bb
@@ -0,0 +1,7 @@
+inherit native
+require xcursorgen_${PV}.bb
+
+DEPENDS = "libx11-native libpng-native"
+
+S="${WORKDIR}/xcursorgen-${PV}"
+XORG_PN="xcursorgen"
-- 
cgit v1.2.3


From bed1dbef158b811628c1eb4dd69b2bdd404a73b7 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:02 +0000
Subject: libxcursor-native_1.1.9.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxcursor-native_1.1.9.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxcursor-native_1.1.9.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxcursor-native_1.1.9.bb b/packages/xorg-lib/libxcursor-native_1.1.9.bb
new file mode 100644
index 0000000000..403030e93d
--- /dev/null
+++ b/packages/xorg-lib/libxcursor-native_1.1.9.bb
@@ -0,0 +1,6 @@
+require libxcursor_${PV}.bb
+
+DEPENDS = "libx11-native fixesproto-native libxfixes-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From 64362c68460ae8bda83b9c45948060d13c1d85ea Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:25 +0000
Subject: libxfixes-native_4.0.3.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxfixes-native_4.0.3.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxfixes-native_4.0.3.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxfixes-native_4.0.3.bb b/packages/xorg-lib/libxfixes-native_4.0.3.bb
new file mode 100644
index 0000000000..5ef6ded80a
--- /dev/null
+++ b/packages/xorg-lib/libxfixes-native_4.0.3.bb
@@ -0,0 +1,6 @@
+require libxfixes_${PV}.bb
+
+DEPENDS = "libx11-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From b6b736a45eaa2bb61a36d6056d3c99e4abf1b241 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:54 +0000
Subject: libxrender-native_0.9.4.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxrender-native_0.9.4.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxrender-native_0.9.4.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxrender-native_0.9.4.bb b/packages/xorg-lib/libxrender-native_0.9.4.bb
new file mode 100644
index 0000000000..a4f4ba9e36
--- /dev/null
+++ b/packages/xorg-lib/libxrender-native_0.9.4.bb
@@ -0,0 +1,6 @@
+require libxrender_${PV}.bb
+
+DEPENDS = "libx11-native renderproto-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From 3b5532e4e606cc069273b044be1eb752cd6f0ca2 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:43:18 +0000
Subject: fixesproto-native_4.0.bb : add native version for X11R7.4

---
 packages/xorg-proto/fixesproto-native_4.0.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-proto/fixesproto-native_4.0.bb

(limited to 'packages')

diff --git a/packages/xorg-proto/fixesproto-native_4.0.bb b/packages/xorg-proto/fixesproto-native_4.0.bb
new file mode 100644
index 0000000000..927e004437
--- /dev/null
+++ b/packages/xorg-proto/fixesproto-native_4.0.bb
@@ -0,0 +1,7 @@
+require fixesproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fixesproto"
+
+inherit native
-- 
cgit v1.2.3


From c8dc1e0d8602c8032cb70d70b43a0d28a903c3c1 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:43:50 +0000
Subject: renderproto-native_0.9.3.bb : add native version for X11R7.4

---
 packages/xorg-proto/renderproto-native_0.9.3.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-proto/renderproto-native_0.9.3.bb

(limited to 'packages')

diff --git a/packages/xorg-proto/renderproto-native_0.9.3.bb b/packages/xorg-proto/renderproto-native_0.9.3.bb
new file mode 100644
index 0000000000..8d83c99774
--- /dev/null
+++ b/packages/xorg-proto/renderproto-native_0.9.3.bb
@@ -0,0 +1,7 @@
+require renderproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "renderproto"
+
+inherit native
-- 
cgit v1.2.3


From 4bd704a989dcadd905da9027821c4088792f8a2a Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:44:23 +0000
Subject: xcursor-themes_1.0.1.bb : needs xcursorgen-native which has now been
 added

---
 packages/xorg-data/xcursor-themes_1.0.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/xorg-data/xcursor-themes_1.0.1.bb b/packages/xorg-data/xcursor-themes_1.0.1.bb
index 8cf822e56f..1107d08da9 100644
--- a/packages/xorg-data/xcursor-themes_1.0.1.bb
+++ b/packages/xorg-data/xcursor-themes_1.0.1.bb
@@ -1,5 +1,7 @@
 require xorg-data-common.inc
 PE = "1"
 
-DEPENDS += " libxcursor"
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
 
-- 
cgit v1.2.3


From a2267085ab6a2d2e04f70794cba393ed3b6cad1c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:24:07 +0000
Subject: xorg-driver-common.inc : fix the header file detections now we are
 using sysroot. Seems to actually work in use, but maybe there is a better
 way!

---
 packages/xorg-driver/xorg-driver-common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index a75e409c8c..7126b8be83 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -25,10 +25,10 @@ do_stage() {
 # Of course this will blow up when cross compiling.
 
 do_configure_prepend() {
-	incdir=${STAGING_INCDIR}/xorg
+	incdir=${layout_includedir}/xorg
 	for f in dri.h sarea.h dristruct.h exa.h damage.h; do
 		path="$incdir/$f"
-		if [ -f "$path" ]; then
+		if [ -f "${STAGING_DIR_HOST}/$path" ]; then
 			p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
 			eval "export ac_cv_file_$p=yes"
 		fi
-- 
cgit v1.2.3


From f1ce3d73d57b4d0b57cd56175c489ff2a0d2f3cf Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:25:00 +0000
Subject: xf86-input-joystick_1.3.2.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-joystick_1.3.2.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-joystick_1.3.2.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.2.bb b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
new file mode 100644
index 0000000000..a53297fd8a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
-- 
cgit v1.2.3


From caa50b894e8dcd8eec45b3db7a1864931794f8e9 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:25:32 +0000
Subject: xf86-input-synaptics_0.15.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-synaptics_0.15.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-synaptics_0.15.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
new file mode 100644
index 0000000000..e6325675f8
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
-- 
cgit v1.2.3


From efb56de6034d9d711ab652b1320ca539e746d2be Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:26:10 +0000
Subject: xf86-video-geode_2.10.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-geode_2.10.1.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-geode_2.10.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-geode_2.10.1.bb b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
new file mode 100644
index 0000000000..380ce2ea0b
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-- 
cgit v1.2.3


From 3c916ebbef9d39275c5406824acea4af5e4b5010 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:26:46 +0000
Subject: xf86-video-glint_1.2.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-glint_1.2.1.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-glint_1.2.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-glint_1.2.1.bb b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
new file mode 100644
index 0000000000..eac23c74d9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Glint display driver"
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
+
-- 
cgit v1.2.3


From adbbbdb1dd01e19f003734544b119bf5b6e41d6c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:27:19 +0000
Subject: xf86-video-i128_1.3.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-i128_1.3.1.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-i128_1.3.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-i128_1.3.1.bb b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
new file mode 100644
index 0000000000..78d5eda810
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
-- 
cgit v1.2.3


From 97f5f354bb5ccf9a6041352656b1081a0904a619 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:12:42 +0000
Subject: xorg-driver-common.inc : add an extra header to our autoconf
 workaround for the openchrome driver

---
 packages/xorg-driver/xorg-driver-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index 7126b8be83..0f24dd5e30 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -26,7 +26,7 @@ do_stage() {
 
 do_configure_prepend() {
 	incdir=${layout_includedir}/xorg
-	for f in dri.h sarea.h dristruct.h exa.h damage.h; do
+	for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
 		path="$incdir/$f"
 		if [ -f "${STAGING_DIR_HOST}/$path" ]; then
 			p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
-- 
cgit v1.2.3


From 43a57a4629278063141896467df06448d330560c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:13:39 +0000
Subject: xf86-video-impact_0.2.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-impact_0.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-impact_0.2.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-impact_0.2.0.bb b/packages/xorg-driver/xf86-video-impact_0.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-impact_0.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
-- 
cgit v1.2.3


From cf5409b40b5857cc77dfb9fcb760f2f7f681b5d6 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:14:00 +0000
Subject: xf86-video-intel_2.4.2.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-intel_2.4.2.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-intel_2.4.2.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-intel_2.4.2.bb b/packages/xorg-driver/xf86-video-intel_2.4.2.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-intel_2.4.2.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
-- 
cgit v1.2.3


From 8bbb673ca2fa9eff8c57958558debe28a1ac72ce Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:14:38 +0000
Subject: xf86-video-mach64_6.8.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-mach64_6.8.0.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-mach64_6.8.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-mach64_6.8.0.bb b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
-- 
cgit v1.2.3


From 01a26acee5e38be617d585670d03b7ec03c954a7 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:14:57 +0000
Subject: xf86-video-mga_1.4.9.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-mga_1.4.9.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-mga_1.4.9.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-mga_1.4.9.bb b/packages/xorg-driver/xf86-video-mga_1.4.9.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mga_1.4.9.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
-- 
cgit v1.2.3


From 9084e5c49b1e7878d809acea739c657b6da099c4 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:15:19 +0000
Subject: xf86-video-nv_2.1.12.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-nv_2.1.12.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-nv_2.1.12.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-nv_2.1.12.bb b/packages/xorg-driver/xf86-video-nv_2.1.12.bb
new file mode 100644
index 0000000000..0d4ee2ed19
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_2.1.12.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
-- 
cgit v1.2.3


From 1f4668a1a8ddd8bd6e1921c10fbad2ec0d181794 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:15:38 +0000
Subject: xf86-video-openchrome_0.2.903.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-openchrome_0.2.903.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-openchrome_0.2.903.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb
new file mode 100644
index 0000000000..facae8950a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- openchrome display driver"
+PE = "1"
+
+do_configure_prepend() {
+	rm ${S}/acinclude.m4 || true
+}
+
-- 
cgit v1.2.3


From f608c6407ce093c5f6da08395c024b8a5834c2c7 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:16:02 +0000
Subject: xf86-video-r128_6.8.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-r128_6.8.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-r128_6.8.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-r128_6.8.0.bb b/packages/xorg-driver/xf86-video-r128_6.8.0.bb
new file mode 100644
index 0000000000..994ea24d8f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-r128_6.8.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- r128 display driver"
+PE = "1"
-- 
cgit v1.2.3


From 45678d670e14ebd1c9df55903d2bb565a21eaf2b Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:16:30 +0000
Subject: xf86-video-sunffb_1.2.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-sunffb_1.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-sunffb_1.2.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
-- 
cgit v1.2.3


From 5bf326ca42238512f931d20d4e5543661dcd42fc Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:16:49 +0000
Subject: xf86-video-sunleo_1.2.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-sunleo_1.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-sunleo_1.2.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
-- 
cgit v1.2.3


From 005aaa85725f695140219f381c9063b2f65aeb83 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:17:12 +0000
Subject: xf86-video-tga_1.2.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-tga_1.2.0.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-tga_1.2.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-tga_1.2.0.bb b/packages/xorg-driver/xf86-video-tga_1.2.0.bb
new file mode 100644
index 0000000000..d3cf65f034
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tga_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "DEC 21030 X11 driver"
+
+DEPENDS += " xf86dgaproto"
+
-- 
cgit v1.2.3


From 7c3bfd6775cc8717172a4d3612bc1b3e19f70df9 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Nov 2008 14:17:30 +0000
Subject: xf86-video-vermilion_1.0.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-vermilion_1.0.1.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-vermilion_1.0.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb
new file mode 100644
index 0000000000..c3054b9051
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+PE = "1"
+
-- 
cgit v1.2.3


From b72baf9c0d6125c1aeace4ddb1aa2722d8b45484 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Nov 2008 16:21:40 +0000
Subject: xf86-video-vesa_2.0.0.bb : new version for X11R7.4 with some more
 include path fixes

---
 .../xf86-video-vesa/fix-configure-includes.patch            | 13 +++++++++++++
 packages/xorg-driver/xf86-video-vesa_2.0.0.bb               |  9 +++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch
 create mode 100644 packages/xorg-driver/xf86-video-vesa_2.0.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch
new file mode 100644
index 0000000000..a886e6c150
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch
@@ -0,0 +1,13 @@
+Index: xf86-video-vesa-2.0.0/configure.ac
+===================================================================
+--- xf86-video-vesa-2.0.0.orig/configure.ac	2008-11-06 15:13:02.000000000 +0000
++++ xf86-video-vesa-2.0.0/configure.ac	2008-11-06 15:13:16.000000000 +0000
+@@ -69,7 +69,7 @@
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+ CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
++INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
+ AC_SUBST([INCLUDES])
+ 
diff --git a/packages/xorg-driver/xf86-video-vesa_2.0.0.bb b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb
new file mode 100644
index 0000000000..bd2f7cf7c1
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+PE = "1"
+
+SRC_URI += "file://fix-includepath.patch;patch=1 \
+            file://fix-configure-includes.patch;patch=1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
-- 
cgit v1.2.3


From a563eb63d8bacb3c87cd3daef4ddc2b6a3dd80e3 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Nov 2008 16:22:09 +0000
Subject: xf86-video-vmware_10.16.5.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-vmware_10.16.5.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-vmware_10.16.5.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-- 
cgit v1.2.3


From eb3d1b13739f7dc2a0803bfa216af257f2c16032 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Nov 2008 16:22:31 +0000
Subject: xf86-video-wsfb_0.2.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-wsfb_0.2.1.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-wsfb_0.2.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb
new file mode 100644
index 0000000000..ea1c005e8c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- wsfb display driver"
+PE = "1"
-- 
cgit v1.2.3


From df89db9f59ff601d4e69260e9f87d2c60b5939fe Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Nov 2008 16:22:53 +0000
Subject: xf86-video-xgixp_1.7.99.3.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-- 
cgit v1.2.3


From c1082ecb6cacc41fe3d9ef685a9f90d53c5edeb5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 9 Nov 2008 12:13:47 +0000
Subject: libsm_1.1.0.bb : add e2fsprogs-libs to DEPENDS, needed for libuuid

---
 packages/xorg-lib/libsm_1.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/xorg-lib/libsm_1.1.0.bb b/packages/xorg-lib/libsm_1.1.0.bb
index 669b29c937..7a3089894d 100644
--- a/packages/xorg-lib/libsm_1.1.0.bb
+++ b/packages/xorg-lib/libsm_1.1.0.bb
@@ -1,7 +1,7 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans"
+DEPENDS += "libice xproto xtrans e2fsprogs-libs"
 PR = "r0"
 PE = "1"
 
-- 
cgit v1.2.3


From 3af7475c0582f6a5d52ad6ee4279a3d473c43b1f Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 9 Nov 2008 18:46:26 +0000
Subject: xserver-xorg_1.5.1.bb : add openssl to DEPENDS as its used for SHA

---
 packages/xorg-xserver/xserver-xorg_1.5.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
index 087692d700..b936aec95e 100644
--- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -1,7 +1,7 @@
 require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess"
+DEPENDS += "pixman libpciaccess openssl"
 PE = "1"
 PR = "r0"
 
-- 
cgit v1.2.3


From 57f0f91a0efc6e6c5a7569ef49710998c6362c8f Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 10 Nov 2008 10:00:33 +0000
Subject: xf86-input-tslib_0.0.5.bb : needs to DEPEND on tslib

---
 packages/xorg-driver/xf86-input-tslib_0.0.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
index bed0160138..f5c0186565 100644
--- a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
+++ b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
@@ -8,8 +8,8 @@ PR = "r6"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
            file://use-hal-for-device.diff;patch=1 \
-	   file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \
-	   file://dynamic-xy.patch;patch=1 \
+           file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \
+           file://dynamic-xy.patch;patch=1 \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {
-- 
cgit v1.2.3


From 4979adbbeb99dda028ad52085ff8d7bb71fc9a2c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 09:23:52 +0000
Subject: xserver-common_1.22.bb : update with two xorg patches, one generic to
 stop -mouse argument being passed. The other om-gta* specific to stop -screen
 argument being passed for these machines.

---
 packages/xserver-common/files/gta-xorg-fixes.patch | 29 ++++++++++++++++++++++
 packages/xserver-common/files/xorg-fixes.patch     | 25 +++++++++++++++++++
 packages/xserver-common/xserver-common_1.22.bb     |  4 ++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 packages/xserver-common/files/gta-xorg-fixes.patch
 create mode 100644 packages/xserver-common/files/xorg-fixes.patch

(limited to 'packages')

diff --git a/packages/xserver-common/files/gta-xorg-fixes.patch b/packages/xserver-common/files/gta-xorg-fixes.patch
new file mode 100644
index 0000000000..adf6798a99
--- /dev/null
+++ b/packages/xserver-common/files/gta-xorg-fixes.patch
@@ -0,0 +1,29 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver	2008-11-12 09:16:50.000000000 +0000
++++ xserver-common-1.22/X11/Xserver	2008-11-12 09:18:53.000000000 +0000
+@@ -109,7 +109,11 @@
+ 	"Nokia RX-44")
+ 		ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+ 	"GTA01" )
+-		ARGS="$ARGS -dpi 285 -screen 480x640" ;;
++		ARGS="$ARGS -dpi 285"
++		if [ "$XSERVER" != "Xorg" ] ; then
++			ARGS="$ARGS -screen 480x640"
++		fi
++		;;
+ 	"Motorola Ezx Platform")
+ 		ARGS="$ARGS -dpi 170 -screen 240x320" ;;
+ 	"ARM-IntegratorCP" | "ARM-Versatile PB")
+@@ -118,7 +122,10 @@
+ 		modprobe mbxfb
+ 	        ARGS="$ARGS -fb /dev/fb1" ;;
+ 	"GTA02")
+- 		ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE}" 
++ 		ARGS="$ARGS -dpi 285"
++		if [ "$XSERVER" != "Xorg" ] ; then
++			ARGS="$ARGS -screen ${SCREEN_SIZE}"
++		fi
+ 		;;
+ 	"Boundary Devices Neon board")
+ 		ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
diff --git a/packages/xserver-common/files/xorg-fixes.patch b/packages/xserver-common/files/xorg-fixes.patch
new file mode 100644
index 0000000000..b2fd544fb5
--- /dev/null
+++ b/packages/xserver-common/files/xorg-fixes.patch
@@ -0,0 +1,25 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver	2008-11-12 09:14:55.000000000 +0000
++++ xserver-common-1.22/X11/Xserver	2008-11-12 09:16:22.000000000 +0000
+@@ -48,6 +48,7 @@
+ 
+ ARGS="-br -pn $INPUT_EXTRA_ARGS"
+ 
++if [ "$XSERVER" != "Xorg" ] ; then
+ # use ucb 1x00 touchscreen if present
+ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+   ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+@@ -58,10 +59,11 @@
+ if [ -e "$TSLIB_TSDEVICE" ] ; then
+   ARGS="$ARGS -mouse tslib"
+ else
+-  if  [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
++  if  [ -e /dev/input/mice ] ; then
+     ARGS="$ARGS -mouse mouse"
+   fi
+ fi
++fi
+ 
+ # start off server in conventional location.
+ case `module_id` in
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index 6dcbc6862d..05b15ae564 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "all"
 
@@ -11,6 +11,8 @@ inherit gpe
 
 SRC_URI_append = " file://setDPI.sh "
 SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
+                            file://xorg-fixes.patch;patch=1 \
+			    file://gta-xorg-fixes.patch;patch=1 \
                             file://default.xmodmap "
 
 do_install_append() {
-- 
cgit v1.2.3


From 6d368be335fe5b168b767667f9cdbef58a9a8006 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 10:32:42 +0000
Subject: xorg-xserver-common.inc : disable apm handling for Xorg on arm, it
 causes Xorg to enter D state on suspend. Xorg doesnt actually seem to need to
 know about apm. And a similar hack has been used with kdrive for years in OE.

---
 packages/xorg-xserver/xorg-xserver-common.inc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages')

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 190de2c49a..84e3c30978 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -26,6 +26,8 @@ inherit autotools pkgconfig
 EXTRA_OECONF += " --enable-xcalibrate \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
+EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
+
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
 RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb"
-- 
cgit v1.2.3


From 5ba0aa492879e92b6ed278b7a3f9a1e32f859101 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 10:33:50 +0000
Subject: xserver-xorg_*.bb : remove duplicate EXTRA_OECONF entry that is
 already set in the common file

---
 packages/xorg-xserver/xserver-xorg_1.2.0.bb   | 2 --
 packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 --
 packages/xorg-xserver/xserver-xorg_1.4.bb     | 2 --
 packages/xorg-xserver/xserver-xorg_1.5.1.bb   | 2 --
 4 files changed, 8 deletions(-)

(limited to 'packages')

diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index 218e6dc026..a57eddfc31 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -4,8 +4,6 @@ require xorg-xserver-common.inc
 PE = "1"
 PR = "r3"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
 
 #DESCRIPTION = ""
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index d28fec16e1..40f8480375 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -7,8 +7,6 @@ PR = "r7"
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
 
 #DESCRIPTION = ""
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 3f53002a34..fe3703da61 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -11,6 +11,4 @@ SRC_URI += "file://drmfix.patch;patch=1 \
 
 MESA_VER = "7.0.2"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
index b936aec95e..e0d64017f7 100644
--- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -10,6 +10,4 @@ SRC_URI += "file://drmfix.patch;patch=1 \
 
 MESA_VER = "7.2"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
-- 
cgit v1.2.3


From e2f7722a89a2fa001e3fc04322f3d37ed045a79b Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 10:35:58 +0000
Subject: xserver-xorg_*.bb : bump PR for apm change

---
 packages/xorg-xserver/xserver-xorg_1.2.0.bb   | 2 +-
 packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +-
 packages/xorg-xserver/xserver-xorg_1.4.2.bb   | 2 +-
 packages/xorg-xserver/xserver-xorg_1.4.bb     | 2 +-
 packages/xorg-xserver/xserver-xorg_1.5.1.bb   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index a57eddfc31..61f73b3454 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 export LDFLAGS += " -ldl "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index 40f8480375..9d6dca4489 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 562266ff39..852e847265 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index fe3703da61..ba64d72d35 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
index e0d64017f7..92ef22fd63 100644
--- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"
-- 
cgit v1.2.3


From d876de8271a798310cd226c5c2db81843fbf2c8a Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 11:15:52 +0000
Subject: xserver-xorg-conf_0.1.bb : split the xorg.conf out of xserver-xorg
 package to prevent xserver-xorg becoming a machine package.

---
 packages/xorg-xserver/xorg-xserver-common.inc      |   9 +-
 .../xserver-xorg-conf/omap3evm/xorg.conf           |  29 +++++
 packages/xorg-xserver/xserver-xorg-conf/xorg.conf  |   0
 packages/xorg-xserver/xserver-xorg-conf_0.1.bb     |  11 ++
 .../xorg-xserver/xserver-xorg/omap3evm/xorg.conf   |  29 -----
 packages/xorg-xserver/xserver-xorg/xorg.conf       | 135 ---------------------
 6 files changed, 42 insertions(+), 171 deletions(-)
 create mode 100644 packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
 create mode 100644 packages/xorg-xserver/xserver-xorg-conf/xorg.conf
 create mode 100644 packages/xorg-xserver/xserver-xorg-conf_0.1.bb
 delete mode 100644 packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf
 delete mode 100644 packages/xorg-xserver/xserver-xorg/xorg.conf

(limited to 'packages')

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 84e3c30978..d391ffe60b 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -16,8 +16,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate"
 RECOMMENDS_${PN} = "hal"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
-	file://xorg.conf"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
@@ -30,7 +29,7 @@ EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
 
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
 
 PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
 
@@ -45,14 +44,10 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 		    ${libdir}/xorg/modules/*/*/.debug \
 		    "
 
-CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
-
 do_stage() {
 	autotools_stage_all
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
 	ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
 }
diff --git a/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
new file mode 100644
index 0000000000..983bb0823a
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
@@ -0,0 +1,29 @@
+Section "Module"                                       
+        Load    "extmod"                                
+        Load    "dbe"                           
+        Load    "glx"                                           
+        Load    "freetype"                             
+        Load    "type1"                        
+        Load    "record"                    
+        Load    "dri"                       
+EndSection                            
+
+Section "Monitor"                                                                    
+        Identifier      "Builtin Default Monitor"
+EndSection                                       
+
+Section "Device"                                  
+        Identifier      "Builtin Default fbdev Device 0"
+        Driver  "omapfb"
+EndSection                                                
+
+Section "Screen"                                        
+        Identifier      "Builtin Default fbdev Screen 0"     
+        Device  "Builtin Default fbdev Device 0"            
+        Monitor "Builtin Default Monitor"               
+EndSection                                              
+
+Section "ServerLayout"                                 
+        Identifier      "Builtin Default Layout"                                     
+        Screen  "Builtin Default fbdev Screen 0"        
+EndSection                                              
diff --git a/packages/xorg-xserver/xserver-xorg-conf/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/xorg.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xorg-xserver/xserver-xorg-conf_0.1.bb b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb
new file mode 100644
index 0000000000..1ff83ea27b
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Machine specific xorg.conf files"
+
+SRC_URI = "file://xorg.conf"
+
+do_install() {
+	install -d ${D}/${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+}
+
+CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+
diff --git a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf b/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf
deleted file mode 100644
index 983bb0823a..0000000000
--- a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"                                       
-        Load    "extmod"                                
-        Load    "dbe"                           
-        Load    "glx"                                           
-        Load    "freetype"                             
-        Load    "type1"                        
-        Load    "record"                    
-        Load    "dri"                       
-EndSection                            
-
-Section "Monitor"                                                                    
-        Identifier      "Builtin Default Monitor"
-EndSection                                       
-
-Section "Device"                                  
-        Identifier      "Builtin Default fbdev Device 0"
-        Driver  "omapfb"
-EndSection                                                
-
-Section "Screen"                                        
-        Identifier      "Builtin Default fbdev Screen 0"     
-        Device  "Builtin Default fbdev Device 0"            
-        Monitor "Builtin Default Monitor"               
-EndSection                                              
-
-Section "ServerLayout"                                 
-        Identifier      "Builtin Default Layout"                                     
-        Screen  "Builtin Default fbdev Screen 0"        
-EndSection                                              
diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf
deleted file mode 100644
index 4b327022f6..0000000000
--- a/packages/xorg-xserver/xserver-xorg/xorg.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-
-# xorg configuration
-
-Section "ServerLayout"
-	Identifier     "Default Layout"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-
-# RgbPath is the location of the RGB database.  Note, this is the name of the 
-# file minus the extension (like ".txt" or ".db").  There is normally
-# no need to change the default.
-# Multiple FontPath entries are allowed (they are concatenated together)
-# By default, Red Hat 6.0 and later now use a font server independent of
-# the X server to render fonts.
-#       FontPath     "unix/:7100"
-	FontPath     "/usr/lib/X11/fonts/misc"
-EndSection
-
-Section "Module"
-	Load  "dbe"
-	Load  "extmod"
-	Load  "fbdevhw"
-#	Load  "glx"
-	Load  "record"
-	Load  "freetype"
-	Load  "type1"
-# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
-#	Load  "z4l"
-EndSection
-
-Section "InputDevice"
-
-# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
-#	Option	"Xleds"		"1 2 3"
-# To disable the XKEYBOARD extension, uncomment XkbDisable.
-#	Option	"XkbDisable"
-# To customise the XKB settings to suit your keyboard, modify the
-# lines below (which are the defaults).  For example, for a non-U.S.
-# keyboard, you will probably want to use:
-#	Option	"XkbModel"	"pc102"
-# If you have a US Microsoft Natural keyboard, you can use:
-#	Option	"XkbModel"	"microsoft"
-#
-# Then to change the language, change the Layout setting.
-# For example, a german layout can be obtained with:
-#	Option	"XkbLayout"	"de"
-# or:
-#	Option	"XkbLayout"	"de"
-#	Option	"XkbVariant"	"nodeadkeys"
-#
-# If you'd like to switch the positions of your capslock and
-# control keys, use:
-#	Option	"XkbOptions"	"ctrl:swapcaps"
-# Or if you just want both to be control, use:
-#	Option	"XkbOptions"	"ctrl:nocaps"
-#
-	Identifier  "Keyboard0"
-	Driver      "keyboard"
-	Option	    "XkbModel" "pc105"
-	Option	    "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "IMPS/2"
-	Option	    "Device" "/dev/input/mice"
-	Option	    "ZAxisMapping" "4 5"
-	Option	    "Emulate3Buttons" "yes"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor0"
-	VendorName   "Monitor Vendor"
-	ModelName    "NEC FP2141SB"
-#	DisplaySize  400 300
-# Note: setting HorizSync/VertRefresh will override DDC probe
-#	HorizSync    30.0 - 140.0
-#	VertRefresh  25.0 - 160.0
-	Option	     "dpms"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor1"
-	VendorName   "Generic Vendor"
-	ModelName    "Generic Monitor"
-	HorizSync    28-50
-	VertRefresh  43-73
-	Modeline     "800x600-60"  40.0000  800  840  976 1056   600  601  605  628
-	Modeline     "800x600-72"  50.0000  800  856  976 1040   600  637  643  666
-	Modeline     "640x480-60"  25.1749  640  656  744  800   480  490  492  525 -HSync -VSync
-	Modeline     "640x480-72"  31.5000  640  664  704  832   480  489  492  520 -HSync -VSync
-	Option	     "dpms"
-EndSection
-
-
-Section "Device"
-        Identifier  "FBDev"
-        Driver      "fbdev"
-	#Option     "shadowfb" "off"
-EndSection
-
-Section "Screen"
-    Identifier	"Screen0"
-    Device	"FBDev"
-    Monitor	"Monitor0"
-    DefaultDepth 16
-
-    SubSection "Display"
-        Depth		8
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth		16
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth		24
-	FbBpp		32
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-EndSection
-
-Section "DRI"
-	Group        0
-	Mode         0666
-EndSection
-
-- 
cgit v1.2.3


From 067fd09f1b5055d5f277f316a7b0a28a99623727 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Nov 2008 11:23:38 +0000
Subject: xserver-xorg/beagleboard/xorg.conf : forgot to move this into the new
 xserver-xorg-conf

---
 .../xserver-xorg-conf/beagleboard/xorg.conf        | 135 +++++++++++++++++++++
 .../xserver-xorg/beagleboard/xorg.conf             | 135 ---------------------
 2 files changed, 135 insertions(+), 135 deletions(-)
 create mode 100644 packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
 delete mode 100644 packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf

(limited to 'packages')

diff --git a/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
new file mode 100644
index 0000000000..1778960638
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
@@ -0,0 +1,135 @@
+
+# xorg configuration
+
+Section "ServerLayout"
+	Identifier     "Default Layout"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Mouse0" "CorePointer"
+	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+
+# RgbPath is the location of the RGB database.  Note, this is the name of the 
+# file minus the extension (like ".txt" or ".db").  There is normally
+# no need to change the default.
+# Multiple FontPath entries are allowed (they are concatenated together)
+# By default, Red Hat 6.0 and later now use a font server independent of
+# the X server to render fonts.
+#       FontPath     "unix/:7100"
+	FontPath     "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+	Load  "dbe"
+	Load  "extmod"
+	Load  "fbdevhw"
+#	Load  "glx"
+	Load  "record"
+	Load  "freetype"
+	Load  "type1"
+# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
+#	Load  "z4l"
+EndSection
+
+Section "InputDevice"
+
+# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
+#	Option	"Xleds"		"1 2 3"
+# To disable the XKEYBOARD extension, uncomment XkbDisable.
+#	Option	"XkbDisable"
+# To customise the XKB settings to suit your keyboard, modify the
+# lines below (which are the defaults).  For example, for a non-U.S.
+# keyboard, you will probably want to use:
+#	Option	"XkbModel"	"pc102"
+# If you have a US Microsoft Natural keyboard, you can use:
+#	Option	"XkbModel"	"microsoft"
+#
+# Then to change the language, change the Layout setting.
+# For example, a german layout can be obtained with:
+#	Option	"XkbLayout"	"de"
+# or:
+#	Option	"XkbLayout"	"de"
+#	Option	"XkbVariant"	"nodeadkeys"
+#
+# If you'd like to switch the positions of your capslock and
+# control keys, use:
+#	Option	"XkbOptions"	"ctrl:swapcaps"
+# Or if you just want both to be control, use:
+#	Option	"XkbOptions"	"ctrl:nocaps"
+#
+	Identifier  "Keyboard0"
+	Driver      "keyboard"
+	Option	    "XkbModel" "pc105"
+	Option	    "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "IMPS/2"
+	Option	    "Device" "/dev/input/mice"
+	Option	    "ZAxisMapping" "4 5"
+	Option	    "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor0"
+	VendorName   "Monitor Vendor"
+	ModelName    "NEC FP2141SB"
+#	DisplaySize  400 300
+# Note: setting HorizSync/VertRefresh will override DDC probe
+#	HorizSync    30.0 - 140.0
+#	VertRefresh  25.0 - 160.0
+	Option	     "dpms"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor1"
+	VendorName   "Generic Vendor"
+	ModelName    "Generic Monitor"
+	HorizSync    28-50
+	VertRefresh  43-73
+	Modeline     "800x600-60"  40.0000  800  840  976 1056   600  601  605  628
+	Modeline     "800x600-72"  50.0000  800  856  976 1040   600  637  643  666
+	Modeline     "640x480-60"  25.1749  640  656  744  800   480  490  492  525 -HSync -VSync
+	Modeline     "640x480-72"  31.5000  640  664  704  832   480  489  492  520 -HSync -VSync
+	Option	     "dpms"
+EndSection
+
+
+Section "Device"
+        Identifier  "FBDev"
+        Driver      "omapfb"
+	#Option     "shadowfb" "off"
+EndSection
+
+Section "Screen"
+    Identifier	"Screen0"
+    Device	"FBDev"
+    Monitor	"Monitor0"
+    DefaultDepth 16
+
+    SubSection "Display"
+        Depth		8
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth		16
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth		24
+	FbBpp		32
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+EndSection
+
+Section "DRI"
+	Group        0
+	Mode         0666
+EndSection
+
diff --git a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf b/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf
deleted file mode 100644
index 1778960638..0000000000
--- a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-
-# xorg configuration
-
-Section "ServerLayout"
-	Identifier     "Default Layout"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevi