diff options
| author | Jeff Dike <jdike@x86_64.user-mode-linux.org> | 2010-07-28 11:43:51 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-30 14:50:30 +0100 |
| commit | ae035f151f87a9a1ff48ceac10cff45754c21027 (patch) | |
| tree | 1b902271530c06438b14e9edeccca68ffcd62f01 | |
| parent | d9f22d402459d2e70df83df65d4acc273297426a (diff) | |
| download | openembedded-core-ae035f151f87a9a1ff48ceac10cff45754c21027.tar.gz openembedded-core-ae035f151f87a9a1ff48ceac10cff45754c21027.tar.bz2 openembedded-core-ae035f151f87a9a1ff48ceac10cff45754c21027.zip | |
emenlow - boot to a GUI
Here are a couple of small fixes that allow an emenlow image to boot
to a GUI.
The X server now RDEPENDS on the packages that need to be in the
image.
xserver-xorg-video-psb needed a name change to depend on
libdrm_poulsbo.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
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 @@ require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc -PR = "r2" +PR = "r3" PROTO_DEPS += "xf86driproto dri2proto" @@ -15,6 +15,7 @@ SRC_URI += "file://fix_open_max_preprocessor_error.patch" EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" -DEPENDS += "psb-firmware xpsb-glx psb-kernel-source libdrm-poulsbo libva" +RDEPENDS_${PN} += "xserver-xorg-video-psb psb-firmware xpsb-glx \ + psb-kernel-source libdrm-poulsbo libva" COMPATIBLE_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 @@ +Index: xserver-xorg-video-psb-0.32.1/configure.ac +=================================================================== +--- xserver-xorg-video-psb-0.32.1.orig/configure.ac ++++ xserver-xorg-video-psb-0.32.1/configure.ac +@@ -94,7 +94,7 @@ AC_MSG_RESULT([$DRI]) + + AM_CONDITIONAL(DRI, test x$DRI = xyes) + if test "$DRI" = yes; then +- PKG_CHECK_MODULES(DRI, [libdrm-poulsbo >= 2.0 xf86driproto]) ++ PKG_CHECK_MODULES(DRI, [libdrm_poulsbo >= 2.0 xf86driproto]) + AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) + AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) + 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 @@ DESCRIPTION = "2D graphics driver for Poulsbo" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" -PR = "r1" +PR = "r2" inherit autotools @@ -16,7 +16,8 @@ SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/xserver-xorg-video- file://01_disable_lid_timer.patch;patch=1 \ file://psb_xvtempfix.patch;patch=1 \ file://psb_mixed.patch;patch=1 \ - file://dri-h.patch" + file://dri-h.patch \ + file://libdrm-poulsbo.patch" export DRI_CFLAGS="-I${STAGING_INCDIR}/psb -I${STAGING_INCDIR}/psb/drm \ -I${STAGING_INCDIR}/X11/dri" |