meta-moblin: Add initial menlow support

4 files changed, 79 insertions, 0 deletions

diff --git a/meta-moblin/packages/xorg-driver/files/104_disable_locks.diff b/meta-moblin/packages/xorg-driver/files/104_disable_locks.diff
new file mode 100644
index 0000000000..1f0a5ba9c2
--- /dev/null
+++ b/meta-moblin/packages/xorg-driver/files/104_disable_locks.diff
@@ -0,0 +1,23 @@
+Index: git/src/psb_driver.c
+===================================================================
+--- git.orig/src/psb_driver.c   2008-12-12 15:14:28.000000000 +0000
++++ git/src/psb_driver.c        2008-12-30 14:18:16.000000000 +0000
+@@ -1326,7 +1326,7 @@
+ 
+     pScrn->pScreen = pScreen;
+ 
+-    psbDRILock(pScrn, 0);
++/*    psbDRILock(pScrn, 0);*/
+     pPsb->front = psbScanoutCreate(pScrn, pScrn->bitsPerPixel >> 3,
+                                   pScrn->depth, pScrn->virtualX,
+                                   pScrn->virtualY, 0, -1, 0);
+@@ -1489,7 +1489,9 @@
+     
+     return psbEnterVT(pScreen->myNum, 0);
+   out_err_unlock:
++    /* Temporary Fix TBD
+     psbDRIUnlock(pScrn);
++    */
+   out_err:
+     psbRestoreHWState(pDevice);
+     return FALSE;
diff --git a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc
new file mode 100644
index 0000000000..308d06e0b1
--- /dev/null
+++ b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "1"
+PR = "r0"
+
+DEPENDS = "virtual/xserver-xf86 xproto randrproto"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
diff --git a/meta-moblin/packages/xorg-driver/xf86-video-common.inc b/meta-moblin/packages/xorg-driver/xf86-video-common.inc
new file mode 100644
index 0000000000..f2e28170e7
--- /dev/null
+++ b/meta-moblin/packages/xorg-driver/xf86-video-common.inc
@@ -0,0 +1,4 @@
+include xf86-driver-common.inc
+
+DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+
diff --git a/meta-moblin/packages/xorg-driver/xf86-video-psb_git.bb b/meta-moblin/packages/xorg-driver/xf86-video-psb_git.bb
new file mode 100644
index 0000000000..c48215523a
--- /dev/null
+++ b/meta-moblin/packages/xorg-driver/xf86-video-psb_git.bb
@@ -0,0 +1,20 @@
+require xf86-video-common.inc
+
+DESCRIPTION = "X.Org X server -- PIntel i8xx, i9xx display driver"
+DEPENDS += "virtual/libx11 libxvmc libdrm-psb dri2proto glproto \
+            virtual/libgl xineramaproto libpciaccess"
+RDEPENDS += linux-psb-modules
+
+PV = "0.2.6+git${SRCREV}"
+PR = "r4"
+
+SRC_URI = "git://git.moblin.org/projects/xf86-video-psb;protocol=git \
+           file://104_disable_locks.diff;patch=1"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST = '(i.86.*-linux)'
+COMPATIBLE_MACHINE = "menlow"
+
+EXTRA_OECONF = "--enable-dri --disable-static"
+