summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-05-09 14:21:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 16:41:53 +0100
commitc532f96b5b4528fff2eb009c52b8ff5a76721404 (patch)
treea6ad3ff678ffcbd294e483cb241aa6bbe9fdc525
parent03439a38e367bb817e7f332b617df289c73b847b (diff)
downloadpoky-c532f96b5b4528fff2eb009c52b8ff5a76721404.tar.gz
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 (From OE-Core rev: ef4dfdd815328bb9d1f1380859e86a8b012670d9) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch12
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb20
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb22
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 cd408c7bc2..2b75427129 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
6are all upgraded to 1.8.99.904, the the files/macro_tweak.patch 6are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
7can be safely replace by this patch. 7can be safely replace by this patch.
8 8
9Upstream-Status: Pending
10
9Signed-off-by: Yu Ke <ke.yu@intel.com> 11Signed-off-by: Yu Ke <ke.yu@intel.com>
10 12
11diff --git a/xorg-server.m4 b/xorg-server.m4 13diff --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 6b34032a39..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000
4+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000
5@@ -62,7 +62,6 @@
6 AC_LIBTOOL_WIN32_DLL
7 AC_DISABLE_STATIC
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_MAKE_SET
11 PKG_PROG_PKG_CONFIG
12 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 0000000000..ea57140e5e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -0,0 +1,20 @@
1require xserver-xf86-dri-lite.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
4
5PROTO_DEPS += "xf86driproto dri2proto"
6
7DEPENDS += "font-util"
8
9PE = "1"
10PR = "r0"
11
12SRC_URI += "file://crosscompile.patch"
13
14# Misc build failure for master HEAD
15SRC_URI += "file://fix_open_max_preprocessor_error.patch"
16
17SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
18SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"
19
20EXTRA_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 faa4f64159..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1require xserver-xf86-dri-lite.inc
2
3
4PROTO_DEPS += "xf86driproto dri2proto"
5
6DEPENDS += "font-util"
7
8PE = "1"
9PR = "r0"
10
11SRC_URI += "file://nodolt.patch \
12 file://crosscompile.patch"
13# file://libdri-xinerama-symbol.patch;patch=1
14# file://xserver-boottime.patch;patch=1
15
16# Misc build failure for master HEAD
17SRC_URI += "file://fix_open_max_preprocessor_error.patch"
18
19SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
20SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
21
22EXTRA_OECONF += "--enable-dri --enable-dri2"