summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-26 22:41:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:28 +0000
commit60b932d7a48b724cb174c4ab714c6cd9fa78046c (patch)
tree091ef1470e13a848998088e9631c23b519f9d223
parent4557e95cb39a01ab909cd4dbbe5f0dc4964a306e (diff)
downloadpoky-60b932d7a48b724cb174c4ab714c6cd9fa78046c.tar.gz
xf86-video-intel 2.21.15: remove it
It doesn't work: | checking whether to include DRI1 support... no | configure: error: DRI1 requested but prerequisites not found And there is a xf86-video-intel_2.99.917.bb which is MIT-X. (From OE-Core rev: b2feaf0d542047b28abaf946bf7ad6fcdcaf6784) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch29
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch50
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb32
3 files changed, 0 insertions, 111 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
deleted file mode 100644
index 3a42d1377c..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Backport
2
3From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001
4From: Chris Wilson <chris@chris-wilson.co.uk>
5Date: Sat, 5 Oct 2013 18:42:24 +0100
6Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2
7
8Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
9Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
10---
11 src/compat-api.h | 4 ++++
12 1 file changed, 4 insertions(+)
13
14diff --git a/src/compat-api.h b/src/compat-api.h
15index 8eb46ef..244a486 100644
16--- a/src/compat-api.h
17+++ b/src/compat-api.h
18@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap)
19 if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
20 #endif
21
22+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
23+#define DamageUnregister(d, dd) DamageUnregister(dd)
24+#endif
25+
26 #endif
27--
281.7.9.5
29
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
deleted file mode 100644
index 9e93ca875c..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 11 Sep 2013 21:12:37 +0100
7Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled
8
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10---
11 test/Makefile.am | 10 ++++++++++
12 1 file changed, 10 insertions(+)
13
14diff --git a/test/Makefile.am b/test/Makefile.am
15index f51967b..18528a9 100644
16--- a/test/Makefile.am
17+++ b/test/Makefile.am
18@@ -16,9 +16,14 @@ stress_TESTS = \
19 render-copyarea-size \
20 render-copy-alphaless \
21 mixed-stress \
22+ $(NULL)
23+
24+if DRI2
25+stress_TESTS += \
26 dri2-swap \
27 dri2-race \
28 $(NULL)
29+endif
30
31 check_PROGRAMS = $(stress_TESTS)
32
33@@ -34,9 +39,14 @@ libtest_la_SOURCES = \
34 test_image.c \
35 test_log.c \
36 test_render.c \
37+ $(NULL)
38+
39+if DRI2
40+libtest_la_SOURCES += \
41 dri2.c \
42 dri2.h \
43 $(NULL)
44+endif
45
46 vsync.avi: mkvsync.sh
47 ./mkvsync.sh $@
48--
491.7.10.4
50
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
deleted file mode 100644
index cd8fd63b51..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1require xorg-driver-video.inc
2
3SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
4
5DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
6chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
7the driver supports hardware accelerated 3D via the Direct Rendering \
8Infrastructure (DRI)."
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11
12DEPENDS += "virtual/libx11 drm libpciaccess pixman"
13
14SRC_URI += "file://disable-dri2-tests.patch \
15 file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
16 "
17
18PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
19
20PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"
21PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
22PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
23PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
24PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
25
26# --enable-kms-only option is required by ROOTLESS_X
27EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
28
29COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
30
31SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2"
32SRC_URI[sha256sum] = "7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc"