summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:30 +0100
commite43bad8d3e5199aeefa140709bcf4bbe3d30c08e (patch)
tree215a50dea0f05262b9112b2c35d7a69b0ec1d8f1
parent89a35c10f03e56ec99cb02966f3b773b6e991030 (diff)
downloadpoky-e43bad8d3e5199aeefa140709bcf4bbe3d30c08e.tar.gz
mesa: merge the .bb content into .inc
This allows automated version updates to the recipe, as mesa-gl.bb no longer has to include the main mesa.bb. Bump mesa-gl to 20.0.7 at the same time. (From OE-Core rev: 39aba6948e04f1ee9bb4069be16f68bcfdbbeac4) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb)2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc22
-rw-r--r--meta/recipes-graphics/mesa/mesa_20.0.7.bb22
3 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb
index c7897cdaf3..e50782be1c 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb
@@ -1,4 +1,4 @@
1require mesa_${PV}.bb 1require mesa.inc
2 2
3SUMMARY += " (OpenGL only, no EGL/GLES)" 3SUMMARY += " (OpenGL only, no EGL/GLES)"
4 4
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index bb43a9a8b6..965e12d17e 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -14,6 +14,28 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f
14 14
15PE = "2" 15PE = "2"
16 16
17SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
18 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
19 file://0002-meson.build-make-TLS-ELF-optional.patch \
20 file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
21 file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
22 file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
23 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
24 "
25
26SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
27SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
28
29UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
30
31#because we cannot rely on the fact that all apps will use pkgconfig,
32#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
33do_install_append() {
34 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
35 sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
36 fi
37}
38
17DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native" 39DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native"
18EXTRANATIVEPATH += "chrpath-native" 40EXTRANATIVEPATH += "chrpath-native"
19PROVIDES = " \ 41PROVIDES = " \
diff --git a/meta/recipes-graphics/mesa/mesa_20.0.7.bb b/meta/recipes-graphics/mesa/mesa_20.0.7.bb
index 420565808e..d17d9eb04b 100644
--- a/meta/recipes-graphics/mesa/mesa_20.0.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_20.0.7.bb
@@ -1,23 +1 @@
1require ${BPN}.inc require ${BPN}.inc
2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
5 file://0002-meson.build-make-TLS-ELF-optional.patch \
6 file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
7 file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
8 file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
9 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
10 "
11
12SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
13SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
14
15UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
16
17#because we cannot rely on the fact that all apps will use pkgconfig,
18#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
19do_install_append() {
20 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
21 sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
22 fi
23}