diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-05-09 14:21:57 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:33:21 +0100 |
| commit | ef4dfdd815328bb9d1f1380859e86a8b012670d9 (patch) | |
| tree | 261b42c14f674fa4e58290d8067b60dac7f3e22f /meta/recipes-graphics/xorg-xserver | |
| parent | 195d907986f19131d8f545b7473a676553c96028 (diff) | |
| download | openembedded-core-ef4dfdd815328bb9d1f1380859e86a8b012670d9.tar.gz openembedded-core-ef4dfdd815328bb9d1f1380859e86a8b012670d9.tar.bz2 openembedded-core-ef4dfdd815328bb9d1f1380859e86a8b012670d9.tar.xz openembedded-core-ef4dfdd815328bb9d1f1380859e86a8b012670d9.zip | |
xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1
- update the license checksum due to SUN/Oracle name changing
- remove the nodolt.patch because it is already in upstream and release
http://cgit.freedesktop.org/xorg/xserver/commit/?id=a769f4c22a9cfb5ba248c924a66c31ec966bd8a0
- update the patch upstream status
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
4 files changed, 22 insertions, 34 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch index cd408c7bc..2b7542712 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch @@ -6,6 +6,8 @@ xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they are all upgraded to 1.8.99.904, the the files/macro_tweak.patch can be safely replace by this patch. +Upstream-Status: Pending + Signed-off-by: Yu Ke <ke.yu@intel.com> diff --git a/xorg-server.m4 b/xorg-server.m4 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch deleted file mode 100644 index 6b34032a3..000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 -+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 -@@ -62,7 +62,6 @@ - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --DOLT - AC_PROG_MAKE_SET - PKG_PROG_PKG_CONFIG - AC_PROG_LEX diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb new file mode 100644 index 000000000..ea57140e5 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb @@ -0,0 +1,20 @@ +require xserver-xf86-dri-lite.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" + +PROTO_DEPS += "xf86driproto dri2proto" + +DEPENDS += "font-util" + +PE = "1" +PR = "r0" + +SRC_URI += "file://crosscompile.patch" + +# Misc build failure for master HEAD +SRC_URI += "file://fix_open_max_preprocessor_error.patch" + +SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de" +SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d" + +EXTRA_OECONF += "--enable-dri --enable-dri2" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb deleted file mode 100644 index faa4f6415..000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -require xserver-xf86-dri-lite.inc - - -PROTO_DEPS += "xf86driproto dri2proto" - -DEPENDS += "font-util" - -PE = "1" -PR = "r0" - -SRC_URI += "file://nodolt.patch \ - file://crosscompile.patch" -# file://libdri-xinerama-symbol.patch;patch=1 -# file://xserver-boottime.patch;patch=1 - -# Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" - -SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201" -SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d" - -EXTRA_OECONF += "--enable-dri --enable-dri2" |