From dd1f7452642d819dd4bc15500d9e4eb5e5cd64c6 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 2 Jan 2024 15:21:29 +0800 Subject: mesa: upgrade 23.3.1 -> 23.3.2 0001-meson.build-check-for-all-linux-host_os-combinations.patch refreshed for 23.3.2 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...n.build-check-for-all-linux-host_os-combinations.patch | 6 +++--- meta/recipes-graphics/mesa/mesa-gl_23.3.1.bb | 15 --------------- meta/recipes-graphics/mesa/mesa-gl_23.3.2.bb | 15 +++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_23.3.1.bb | 2 -- meta/recipes-graphics/mesa/mesa_23.3.2.bb | 2 ++ 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.3.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.3.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_23.3.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_23.3.2.bb (limited to 'meta/recipes-graphics') 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 a555c5f865..fadd6ee201 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 @@ -1,4 +1,4 @@ -From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001 +From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations @@ -20,7 +20,7 @@ Signed-off-by: Alistair Francis 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 22385d8..15f48a6 100644 +index 35cc5f1..9a49c0d 100644 --- a/meson.build +++ b/meson.build @@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 @@ -32,7 +32,7 @@ index 22385d8..15f48a6 100644 gallium_drivers = get_option('gallium-drivers') if gallium_drivers.contains('auto') -@@ -909,7 +909,7 @@ if cc.has_function('fmemopen') +@@ -956,7 +956,7 @@ if cc.has_function('fmemopen') endif # TODO: this is very incomplete diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_23.3.1.bb deleted file mode 100644 index ca160f1bfc..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_23.3.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" -PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" - diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.3.2.bb b/meta/recipes-graphics/mesa/mesa-gl_23.3.2.bb new file mode 100644 index 0000000000..ca160f1bfc --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_23.3.2.bb @@ -0,0 +1,15 @@ +require mesa.inc + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" + +# At least one DRI rendering engine is required to build mesa. +# When no X11 is available, use osmesa for the rendering engine. +PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" +PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" + diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 5f5c8ceb4c..ddbebccd9b 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 \ file://0001-gallium-Fix-build-with-llvm-17.patch \ " -SRC_URI[sha256sum] = "6e48126d70fdb3f20ffeb246ca0c2e41ffdc835f0663a03d4526b8bf5db41de6" +SRC_URI[sha256sum] = "3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_23.3.1.bb b/meta/recipes-graphics/mesa/mesa_23.3.1.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_23.3.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_23.3.2.bb b/meta/recipes-graphics/mesa/mesa_23.3.2.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_23.3.2.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit 1.2.3-korg