summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc27
1 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index b45cb4429d..33564eb66e 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"
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2" 15PE = "2"
16INC_PR = "r2" 16INC_PR = "r3"
17 17
18XORG_PN = "xorg-server" 18XORG_PN = "xorg-server"
19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -132,3 +132,28 @@ do_install_append () {
132 # Its assumed base-files creates this for us 132 # Its assumed base-files creates this for us
133 rmdir ${D}${localstatedir}/log/ 133 rmdir ${D}${localstatedir}/log/
134} 134}
135
136# Add runtime provides for the ABI versions of the video and input subsystems,
137# so that drivers can depend on the relevant version.
138python populate_packages_prepend() {
139 import subprocess
140
141 # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
142 # into the new package, not the staged ones.
143 newenv = dict(os.environ)
144 newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/")
145
146 def get_abi(name):
147 abis = {
148 "video": "abi_videodrv",
149 "input": "abi_xinput"
150 }
151 p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
152 shell=True, env=newenv, stdout=subprocess.PIPE)
153 output = p.communicate()[0]
154 return "xorg-abi-%s-%s" % (name, output.split(".")[0])
155
156 pn = d.getVar("PN", True)
157 d.appendVar("RPROVIDES_" + pn, " " + get_abi("input"))
158 d.appendVar("RPROVIDES_" + pn, " " + get_abi("video"))
159}