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.
Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
.../{mesa-gl_20.0.2.bb => mesa-gl_20.0.7.bb} | 2 +-
meta/recipes-graphics/mesa/mesa.inc | 22 +++++++++++++++++++
meta/recipes-graphics/mesa/mesa_20.0.7.bb | 22 -------------------
3 files changed, 23 insertions(+), 23 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_20.0.2.bb => mesa-gl_20.0.7.bb}
(96%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb
b/meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb
similarity index 96%
rename from meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb
rename to 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 @@
-require mesa_${PV}.bb
+require mesa.inc
SUMMARY += " (OpenGL only, no EGL/GLES)"
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
PE = "2"
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
+ file://0002-meson.build-make-TLS-ELF-optional.patch \
+ file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
+
file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
+
file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
+ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
+ "
+
+SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
+SRC_URI[sha256sum] =
"fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
+
+UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+ if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+ 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
+ fi
+}
+
DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native
zlib chrpath-replacement-native python3-mako-native gettext-native"
EXTRANATIVEPATH += "chrpath-native"
PROVIDES = " \
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 @@
require ${BPN}.inc
-
-SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
- file://0002-meson.build-make-TLS-ELF-optional.patch \
- file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
-
file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
-
file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
- file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
- "
-
-SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
-SRC_URI[sha256sum] =
"fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
-
-UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
-
-#because we cannot rely on the fact that all apps will use pkgconfig,
-#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-do_install_append() {
- if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
- 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
- fi
-}
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138964):
https://lists.openembedded.org/g/openembedded-core/message/138964
Mute This Topic: https://lists.openembedded.org/mt/74584189/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
