summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-19 21:06:56 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-19 21:06:56 +0100
commit25185d5bb2cc100c606d332482ba2243f0aab3c9 (patch)
treeb479507d8601aa0cad33ca7c060ca384ce0e31c0 /meta
parent14cba802f2ddd4af9ba9423a6a149ec0deee4769 (diff)
downloadpoky-25185d5bb2cc100c606d332482ba2243f0aab3c9.tar.gz
xserver-dri-lite: Drop dri2 version and enable dri2 by default
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb23
2 files changed, 1 insertions, 24 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 76b4a75a4a..8486ac2aca 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -17,6 +17,6 @@ SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=se
17# Misc build failure for master HEAD 17# Misc build failure for master HEAD
18SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" 18SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
19 19
20EXTRA_OECONF += "--enable-dri --disable-dri2" 20EXTRA_OECONF += "--enable-dri --enable-dri2"
21 21
22S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
deleted file mode 100644
index ecdcb3936a..0000000000
--- a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require xserver-xf86-dri-lite.inc
2
3PR = "r1"
4PV = "1.5.99.1+git${SRCREV}"
5
6PROTO_DEPS += "dri2proto"
7
8DEFAULT_PREFERENCE = "-1"
9
10SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
11 file://xorg.conf \
12 file://nodolt.patch;patch=1 \
13 file://libdri-xinerama-symbol.patch;patch=1"
14
15# Copied from OBS
16SRC_URI += "file://xorg-server-enable-dri2.patch;patch=1"
17
18# Misc build failure for master HEAD
19SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
20
21EXTRA_OECONF += "--enable-dri2"
22
23S = "${WORKDIR}/git"