diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-02-14 19:14:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-15 09:18:10 +0000 |
commit | 3a5e5742fcf85d34f4220b7705290c6d4bc7800c (patch) | |
tree | 33e26af16f0d1ba1e1fbd3505a474b1e50b44b22 /meta/recipes-graphics/mesa | |
parent | b83bd953dae17a7243b11ab98bd02459c717db89 (diff) | |
download | poky-3a5e5742fcf85d34f4220b7705290c6d4bc7800c.tar.gz |
mesa: update 23.3.5 -> 24.0.0
- refresh 0001-meson.build-check-for-all-linux-host_os-combinations.patch
- rework VIDEO_CODECS. mesa now provides options for 'all' and 'all_free'
Adjust accordingly.
Free codecs are built by default:
Codecs : av1dec av1enc vp9dec
If LICENSE_FLAGS_ACCEPTED contains 'commercial' all supported codecs are built:
Codecs : vc1dec h264dec h264enc h265dec h265enc
av1dec av1enc vp9dec
(From OE-Core rev: 8975bf600de8a3faa8d222f50beb1e2b02fb2870)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_24.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_23.3.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_24.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa_23.3.5.bb) | 0 |
4 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index fadd6ee201..b0be8d0feb 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
@@ -23,21 +23,21 @@ diff --git a/meson.build b/meson.build | |||
23 | index 35cc5f1..9a49c0d 100644 | 23 | index 35cc5f1..9a49c0d 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | 26 | @@ -128,7 +128,7 @@ |
27 | # Only build shared_glapi if at least one OpenGL API is enabled | 27 | # Only build shared_glapi if at least one OpenGL API is enabled |
28 | with_shared_glapi = with_shared_glapi and with_any_opengl | 28 | with_shared_glapi = with_shared_glapi and with_any_opengl |
29 | 29 | ||
30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) | 30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) |
31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
32 | 32 | ||
33 | gallium_drivers = get_option('gallium-drivers') | 33 | gallium_drivers = get_option('gallium-drivers') |
34 | if gallium_drivers.contains('auto') | 34 | if gallium_drivers.contains('auto') |
35 | @@ -956,7 +956,7 @@ if cc.has_function('fmemopen') | 35 | @@ -998,7 +998,7 @@ |
36 | endif | 36 | endif |
37 | 37 | ||
38 | # TODO: this is very incomplete | 38 | # TODO: this is very incomplete |
39 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system()) | 39 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) |
40 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 40 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
41 | pre_args += '-D_GNU_SOURCE' | 41 | pre_args += '-D_GNU_SOURCE' |
42 | elif host_machine.system() == 'sunos' | 42 | elif host_machine.system() == 'sunos' |
43 | pre_args += '-D__EXTENSIONS__' | 43 | pre_args += '-D__EXTENSIONS__' |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.3.5.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.0.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_23.3.5.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.0.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 3a7b91f637..fabc52f0e7 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ | 20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f" | 23 | SRC_URI[sha256sum] = "dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36" |
24 | 24 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
26 | 26 | ||
@@ -81,12 +81,12 @@ def strip_comma(s): | |||
81 | 81 | ||
82 | PACKAGECONFIG = " \ | 82 | PACKAGECONFIG = " \ |
83 | gallium \ | 83 | gallium \ |
84 | video-codecs \ | ||
84 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland', d)} \ | 85 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland', d)} \ |
85 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \ | 86 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \ |
86 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \ | 87 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \ |
87 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ | 88 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ |
88 | ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \ | 89 | ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \ |
89 | ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'video-codecs', '', d)} \ | ||
90 | " | 90 | " |
91 | 91 | ||
92 | PACKAGECONFIG:append:class-native = "gallium-llvm r600" | 92 | PACKAGECONFIG:append:class-native = "gallium-llvm r600" |
@@ -203,8 +203,8 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" | |||
203 | 203 | ||
204 | PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors" | 204 | PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors" |
205 | 205 | ||
206 | VIDEO_CODECS = "vc1dec,h264dec,h264enc,h265dec,h265enc" | 206 | VIDEO_CODECS ?= "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'all', 'all_free', d)}" |
207 | PACKAGECONFIG[video-codecs] = "-Dvideo-codecs=${@strip_comma('${VIDEO_CODECS}')}, -Dvideo-codecs=''" | 207 | PACKAGECONFIG[video-codecs] = "-Dvideo-codecs=${VIDEO_CODECS}, -Dvideo-codecs=''" |
208 | 208 | ||
209 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) | 209 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) |
210 | FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer" | 210 | FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer" |
diff --git a/meta/recipes-graphics/mesa/mesa_23.3.5.bb b/meta/recipes-graphics/mesa/mesa_24.0.0.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_23.3.5.bb +++ b/meta/recipes-graphics/mesa/mesa_24.0.0.bb | |||