From a0938840e88fcba106062342ecd4179aa8110e18 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 May 2007 12:37:53 +0000 Subject: xserver-xorg: update mesa dep to 6.5.2 --- packages/xorg-xserver/xserver-xorg_1.2.0.bb | 2 ++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/xorg-xserver/xserver-xorg_1.3.0.0.bb diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index 206e384262..08b965bb75 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -1,3 +1,5 @@ +MESA_VER = "6.5.2" + require xorg-xserver-common.inc PE = "1" diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb new file mode 100644 index 0000000000..08b965bb75 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -0,0 +1,10 @@ +MESA_VER = "6.5.2" + +require xorg-xserver-common.inc +PE = "1" + +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 8f282cdaee0b41edbb31f69577a8cc1a85738100 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 May 2007 13:35:04 +0000 Subject: xorg-xserver-common: substitute drmfix.patch with a more robust sed statement --- packages/xorg-xserver/xorg-xserver-common.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index ce7658054d..7bcd483c24 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -47,6 +47,10 @@ PACKAGES =+ "${PN}-multimedia ${PN}-configtools" FILES_${PN}-multimedia = "${libdir}/xorg/modules/multimedia/*.so" FILES_${PN}-configtools = "${bindir}/xorgconfig ${bindir}/xorgcfg" +do_configure_prepend() { + sed -i -e s:/usr/include/drm:${STAGING_INCDIR}/drm:g hw/xfree86/os-support/linux/Makefile.am +} + do_stage() { autotools_stage_all } -- cgit v1.2.3