From aad06196254f1d08696ea0fcf50007ce3be933ac Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 12 Oct 2012 09:36:20 +0000 Subject: xorg: remove xf86rushproto The dependency in xserver is spurious and was removed in 2005. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb | 16 ---------------- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb diff --git a/meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb b/meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb deleted file mode 100644 index 1548bd07f9..0000000000 --- a/meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFree86-Rush: XFree86 Rush extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XFree86 \ -Rush extension. This extension is there to allow Glide applications to \ -run." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" - -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "b6a96ffdae084e27487a58314008b000" -SRC_URI[sha256sum] = "07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a850214fa0..3d81c6c8db 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86" PROVIDES += "virtual/xserver" PE = "2" -INC_PR = "r1" +INC_PR = "r2" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" @@ -23,7 +23,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 xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto 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" -- cgit 1.2.3-korg