summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb5
-rw-r--r--meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch13
-rw-r--r--meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb5
3 files changed, 19 insertions, 4 deletions
diff --git a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb
index 60906919ca..84dacd405e 100644
--- a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb
+++ b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb
@@ -1,6 +1,6 @@
1require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc 1require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5PROTO_DEPS += "xf86driproto dri2proto" 5PROTO_DEPS += "xf86driproto dri2proto"
6 6
@@ -15,6 +15,7 @@ SRC_URI += "file://fix_open_max_preprocessor_error.patch"
15 15
16EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" 16EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx"
17 17
18DEPENDS += "psb-firmware xpsb-glx psb-kernel-source libdrm-poulsbo libva" 18RDEPENDS_${PN} += "xserver-xorg-video-psb psb-firmware xpsb-glx \
19 psb-kernel-source libdrm-poulsbo libva"
19 20
20COMPATIBLE_MACHINE = "emenlow" 21COMPATIBLE_MACHINE = "emenlow"
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch
new file mode 100644
index 0000000000..0ecc880c02
--- /dev/null
+++ b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/libdrm-poulsbo.patch
@@ -0,0 +1,13 @@
1Index: xserver-xorg-video-psb-0.32.1/configure.ac
2===================================================================
3--- xserver-xorg-video-psb-0.32.1.orig/configure.ac
4+++ xserver-xorg-video-psb-0.32.1/configure.ac
5@@ -94,7 +94,7 @@ AC_MSG_RESULT([$DRI])
6
7 AM_CONDITIONAL(DRI, test x$DRI = xyes)
8 if test "$DRI" = yes; then
9- PKG_CHECK_MODULES(DRI, [libdrm-poulsbo >= 2.0 xf86driproto])
10+ PKG_CHECK_MODULES(DRI, [libdrm_poulsbo >= 2.0 xf86driproto])
11 AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
12 AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
13 fi
diff --git a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb
index efba6f628b..1ff92bbc61 100644
--- a/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb
+++ b/meta-emenlow/packages/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "2D graphics driver for Poulsbo" 1DESCRIPTION = "2D graphics driver for Poulsbo"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" 3LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7"
4PR = "r1" 4PR = "r2"
5 5
6inherit autotools 6inherit autotools
7 7
@@ -16,7 +16,8 @@ SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/xserver-xorg-video-
16 file://01_disable_lid_timer.patch;patch=1 \ 16 file://01_disable_lid_timer.patch;patch=1 \
17 file://psb_xvtempfix.patch;patch=1 \ 17 file://psb_xvtempfix.patch;patch=1 \
18 file://psb_mixed.patch;patch=1 \ 18 file://psb_mixed.patch;patch=1 \
19 file://dri-h.patch" 19 file://dri-h.patch \
20 file://libdrm-poulsbo.patch"
20 21
21export DRI_CFLAGS="-I${STAGING_INCDIR}/psb -I${STAGING_INCDIR}/psb/drm \ 22export DRI_CFLAGS="-I${STAGING_INCDIR}/psb -I${STAGING_INCDIR}/psb/drm \
22 -I${STAGING_INCDIR}/X11/dri" 23 -I${STAGING_INCDIR}/X11/dri"