diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-05-23 13:32:16 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-05-23 13:32:16 +0000 |
| commit | f38387aff2c4bf96800232d87130ce86083d45ac (patch) | |
| tree | 03f155f3cb60075af479ed14253dc11d32ebc24e | |
| parent | 5a54db7c0f6b6fbda8d5fa8b66281e9340c6c098 (diff) | |
| parent | 8f282cdaee0b41edbb31f69577a8cc1a85738100 (diff) | |
merge of '0d418eb8c24867f4b26d5be6f9684d8737b541ad'
and '1540ceee03cc4f3eb1e8920d649a07e871f55e27'
| -rw-r--r-- | packages/xorg-xserver/xorg-xserver-common.inc | 4 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.2.0.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 10 |
3 files changed, 16 insertions, 0 deletions
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 } 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 += " " |