summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 10:23:23 +0000
commitc4e2c59088765d1f1de7ec57cde91980f887c2ff (patch)
treea2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-graphics
parentd5e67725ac11e3296cad104470931ffa16824b90 (diff)
downloadpoky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/cairo/cairo-fpu.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc6
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
5 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc
index ef72e8904b..fe7c53337a 100644
--- a/meta/recipes-graphics/cairo/cairo-fpu.inc
+++ b/meta/recipes-graphics/cairo/cairo-fpu.inc
@@ -1,6 +1,6 @@
1 1
2def get_cairo_fpu_setting(bb, d): 2def get_cairo_fpu_setting(bb, d):
3 if d.getVar('TARGET_FPU', True) in [ 'soft' ]: 3 if d.getVar('TARGET_FPU') in [ 'soft' ]:
4 return "--disable-some-floating-point" 4 return "--disable-some-floating-point"
5 return "" 5 return ""
6 6
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 1f9fbcab7d..5d882b1001 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -114,7 +114,7 @@ do_install_append () {
114# they don't get Debian-renamed (which would remove the -mesa suffix), and 114# they don't get Debian-renamed (which would remove the -mesa suffix), and
115# RPROVIDEs/RCONFLICTs on the generic libgl name. 115# RPROVIDEs/RCONFLICTs on the generic libgl name.
116python __anonymous() { 116python __anonymous() {
117 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() 117 pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
118 for p in (("egl", "libegl", "libegl1"), 118 for p in (("egl", "libegl", "libegl1"),
119 ("dri", "libgl", "libgl1"), 119 ("dri", "libgl", "libgl1"),
120 ("gles", "libgles1", "libglesv1-cm1"), 120 ("gles", "libgles1", "libglesv1-cm1"),
@@ -148,7 +148,7 @@ python mesa_populate_packages() {
148 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) 148 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
149 149
150 import re 150 import re
151 dri_drivers_root = oe.path.join(d.getVar('PKGD', True), d.getVar('libdir', True), "dri") 151 dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
152 if os.path.isdir(dri_drivers_root): 152 if os.path.isdir(dri_drivers_root):
153 dri_pkgs = os.listdir(dri_drivers_root) 153 dri_pkgs = os.listdir(dri_drivers_root)
154 lib_name = d.expand("${MLPREFIX}mesa-megadriver") 154 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
@@ -160,7 +160,7 @@ python mesa_populate_packages() {
160 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) 160 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
161 d.appendVar("RREPLACES_%s" % lib_name, pkg_name) 161 d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
162 162
163 pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") 163 pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
164 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') 164 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
165} 165}
166 166
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 57a4c827dd..fe42f11b68 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -33,8 +33,8 @@ def _add_xorg_abi_depends(d, name):
33 } 33 }
34 34
35 output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read() 35 output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read()
36 mlprefix = d.getVar('MLPREFIX', True) or '' 36 mlprefix = d.getVar('MLPREFIX') or ''
37 abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) 37 abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
38 38
39 pn = d.getVar("PN", True) 39 pn = d.getVar("PN")
40 d.appendVar('RDEPENDS_' + pn, ' ' + abi) 40 d.appendVar('RDEPENDS_' + pn, ' ' + abi)
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
index a967cdc585..b4547819f2 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
@@ -28,6 +28,6 @@ XORG_PN = "libXft"
28BBCLASSEXTEND = "native" 28BBCLASSEXTEND = "native"
29 29
30python () { 30python () {
31 if d.getVar('DEBIAN_NAMES', True): 31 if d.getVar('DEBIAN_NAMES'):
32 d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') 32 d.setVar('PKG_${PN}', '${MLPREFIX}libxft2')
33} 33}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 4a5f9a6a1e..6a13380c98 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -172,10 +172,10 @@ python populate_packages_prepend() {
172 shell=True, env=newenv, stdout=subprocess.PIPE) 172 shell=True, env=newenv, stdout=subprocess.PIPE)
173 stdout, stderr = p.communicate() 173 stdout, stderr = p.communicate()
174 output = stdout.decode("utf-8").split(".")[0] 174 output = stdout.decode("utf-8").split(".")[0]
175 mlprefix = d.getVar('MLPREFIX', True) or '' 175 mlprefix = d.getVar('MLPREFIX') or ''
176 return "%sxorg-abi-%s-%s" % (mlprefix, name, output) 176 return "%sxorg-abi-%s-%s" % (mlprefix, name, output)
177 177
178 pn = d.getVar("PN", True) 178 pn = d.getVar("PN")
179 d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) 179 d.appendVar("RPROVIDES_" + pn, " " + get_abi("input"))
180 d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) 180 d.appendVar("RPROVIDES_" + pn, " " + get_abi("video"))
181} 181}