xserver-dri-lite: Drop dri2 version and enable dri2 by default

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
 
-EXTRA_OECONF += "--enable-dri --disable-dri2"
+EXTRA_OECONF += "--enable-dri --enable-dri2"
 
 S = "${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 @@
-require xserver-xf86-dri-lite.inc
-
-PR = "r1"
-PV = "1.5.99.1+git${SRCREV}"
-
-PROTO_DEPS += "dri2proto"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
-           file://xorg.conf \
-           file://nodolt.patch;patch=1 \
-           file://libdri-xinerama-symbol.patch;patch=1"
-
-# Copied from OBS
-SRC_URI += "file://xorg-server-enable-dri2.patch;patch=1"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
-
-EXTRA_OECONF += "--enable-dri2"
-
-S = "${WORKDIR}/git"