xorg: remove XTrap

This functionality was broken upstream so it was removed.

(From OE-Core rev: 7661d15957525885e5e9b1129da7a99eef19f4be)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
deleted file mode 100644 (file)
index 4d1f791..0000000
--- a/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "XTrap: X event trapping extension library"
-
-DESCRIPTION = "libXTrap provides an interface to the DEC-XTRAP \
-extension, which allows for capture and synthesis of core input events."
-
-require xorg-lib-common.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=fe7cbb8cc97683303f7814685cc47305"
-DEPENDS += "libxt trapproto libxext"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXTrap"
-
-SRC_URI[md5sum] = "1e2d966b5b2b89910e418bb0f78e10de"
-SRC_URI[sha256sum] = "cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba"

diff --git a/meta/recipes-graphics/xorg-proto/trapproto_3.4.3.bb b/meta/recipes-graphics/xorg-proto/trapproto_3.4.3.bb
deleted file mode 100644 (file)
index 54d962e..0000000
--- a/meta/recipes-graphics/xorg-proto/trapproto_3.4.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XTrap: X event trapping extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X event \
-trapping extension.  This extension provides the interface which allows \
-for capture and synthesis of core input events."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0a984c8e242256a12f3b8dac085893db"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "3b713239e5e6b269b31cb665563358df"
-SRC_URI[sha256sum] = "ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index bea0252..ceb094f 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -22,7 +22,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
 LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"