diff options
author | Pengyu Ma <pengyu.ma@windriver.com> | 2015-02-03 10:11:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-08 08:00:26 +0000 |
commit | 16a01784245ef0e9806f88f8a55d5d3a73c7ce35 (patch) | |
tree | 331cbaed85fddfd12655cbca756e24ed45f2abc2 /meta/recipes-graphics/mesa/mesa.inc | |
parent | 09fba50cf39002fdc90e738818a418f814713e3a (diff) | |
download | poky-16a01784245ef0e9806f88f8a55d5d3a73c7ce35.tar.gz |
mesa: Upgrade to 10.4.3
flags for EGL and GBM Gallium had been removed in 10.4,
so remove these flags, files or packages.
(From OE-Core rev: ba079975fa984f53fde5b4e8131d0f3877323e6c)
Signed-off-by: Pengyu Ma <pengyu.ma@windriver.com>
Tested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index cb1837ac51..c9748e234f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -59,8 +59,6 @@ GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm | |||
59 | GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | 59 | GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" |
60 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers | 60 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers |
61 | PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" | 61 | PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" |
62 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" | ||
63 | PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" | ||
64 | MESA_LLVM_RELEASE ?= "3.3" | 62 | MESA_LLVM_RELEASE ?= "3.3" |
65 | PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ | 63 | PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ |
66 | ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | 64 | ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" |
@@ -85,7 +83,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | |||
85 | libgles2-mesa libgles2-mesa-dev \ | 83 | libgles2-mesa libgles2-mesa-dev \ |
86 | libgles3-mesa libgles3-mesa-dev \ | 84 | libgles3-mesa libgles3-mesa-dev \ |
87 | libwayland-egl libwayland-egl-dev \ | 85 | libwayland-egl libwayland-egl-dev \ |
88 | libegl-gallium libgbm-gallium \ | ||
89 | libopenvg libopenvg-dev \ | 86 | libopenvg libopenvg-dev \ |
90 | libxvmcsoftpipe libxvmcsoftpipe-dev \ | 87 | libxvmcsoftpipe libxvmcsoftpipe-dev \ |
91 | libxatracker libxatracker-dev \ | 88 | libxatracker libxatracker-dev \ |
@@ -169,8 +166,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" | |||
169 | FILES_libglapi = "${libdir}/libglapi.so.*" | 166 | FILES_libglapi = "${libdir}/libglapi.so.*" |
170 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 167 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
171 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" | 168 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" |
172 | FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" | ||
173 | FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" | ||
174 | FILES_libopenvg = "${libdir}/libOpenVG.so.*" | 169 | FILES_libopenvg = "${libdir}/libOpenVG.so.*" |
175 | FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" | 170 | FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" |
176 | FILES_libxatracker = "${libdir}/libxatracker.so.*" | 171 | FILES_libxatracker = "${libdir}/libxatracker.so.*" |