mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc

Browse Source 
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)

(From OE-Core rev: f7fb209cd447418e72c421ab473c35430ee46893)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2011-10-07 17:42:13 +02:00
committed by Richard Purdie
parent 9e34241ec1
commit fbf9e2fd49
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+4
View File
@@ -20,6 +20,10 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig 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"
LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
# Split out some modules and extensions from the main package # Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space: # These aren't needed for basic operations and only take up space:
# 32.0k libdri.so # 32.0k libdri.so
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
-6
View File
@@ -1,11 +1,5 @@
require xserver-xorg-common.inc require xserver-xorg-common.inc
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"
LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
RDEPENDS_${PN} += "xorg-minimal-fonts" RDEPENDS_${PN} += "xorg-minimal-fonts"
FILES_${PN} += "${bindir}/Xorg " FILES_${PN} += "${bindir}/Xorg "
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+2 -5
View File
@@ -1,10 +1,7 @@
require xserver-xorg-common.inc require xserver-xorg-common.inc
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 += "xf86driproto dri2proto"
LIB_DEPS += "virtual/libgl"
LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
RDEPENDS_${PN} += "xorg-minimal-fonts" RDEPENDS_${PN} += "xorg-minimal-fonts"