diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-11-17 17:21:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:10:16 +0000 |
commit | 354d0bc4a38307a866888df64c9e6d9049560c0f (patch) | |
tree | 4508601de38559ebe544e1bfefdffee626d94f80 /meta/recipes-graphics/mesa/mesa.inc | |
parent | bfd8c35c3f917e3806c8dfe36c98c70fbccbb3c9 (diff) | |
download | poky-354d0bc4a38307a866888df64c9e6d9049560c0f.tar.gz |
mesa: Upgrade 12.0.3 -> 13.0.1
New major release with OpenGL 4.4 support. Dependency on libudev has
been removed.
* Rebase replace_glibc_check_with_linux.patch
* Add patch to find native wayland-scanner
* Add PACKAGECONFIG[osmesa], disabled by default
* package osmesa header correctly
(From OE-Core rev: be60ffcbbdcd370f9d367db887d31a8ccc6b2519)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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/mesa/mesa.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e4880ffedd..4ec496143c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d | |||
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
17 | DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" | 17 | DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" |
18 | 18 | ||
19 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" | 19 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" |
20 | 20 | ||
@@ -64,6 +64,9 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, | |||
64 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" | 64 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" |
65 | PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" | 65 | PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" |
66 | 66 | ||
67 | OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" | ||
68 | PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" | ||
69 | |||
67 | # Mesa requires one of the following crypto implementation, pick one of them | 70 | # Mesa requires one of the following crypto implementation, pick one of them |
68 | MESA_CRYPTO ??= "openssl" | 71 | MESA_CRYPTO ??= "openssl" |
69 | PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" | 72 | PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" |
@@ -183,7 +186,7 @@ FILES_libglapi-dev = "${libdir}/libglapi.*" | |||
183 | FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" | 186 | FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" |
184 | FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" | 187 | FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" |
185 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" | 188 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" |
186 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | 189 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" |
187 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" | 190 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" |
188 | FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" | 191 | FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" |
189 | FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ | 192 | FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ |