On Thu, Dec 1, 2022 at 9:39 AM Markus Volk <f_...@t-online.de> wrote: > > - remove deprecated xvmc PACKAGECONFIG > - remove futex.h patch. Code has been reworked, still needed? > > Note: mesa-22.3.0 will require libperfetto update to v28. Otherwise > compilation will fail.
I am also seeing qtwayland fail. https://errors.yoctoproject.org/Errors/Details/682034/ Not sure if this is related but I think its somewhere in egl headers provided by mesa. > > Signed-off-by: Markus Volk <f_...@t-online.de> > --- > ...fine-__NR_futex-if-it-does-not-exist.patch | 34 ------------------- > ...k-for-all-linux-host_os-combinations.patch | 7 ++-- > .../{mesa-gl_22.2.3.bb => mesa-gl_22.3.0.bb} | 0 > meta/recipes-graphics/mesa/mesa.inc | 4 +-- > .../mesa/{mesa_22.2.3.bb => mesa_22.3.0.bb} | 0 > 5 files changed, 5 insertions(+), 40 deletions(-) > delete mode 100644 > meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch > rename meta/recipes-graphics/mesa/{mesa-gl_22.2.3.bb => mesa-gl_22.3.0.bb} > (100%) > rename meta/recipes-graphics/mesa/{mesa_22.2.3.bb => mesa_22.3.0.bb} (100%) > > diff --git > a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch > > b/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch > deleted file mode 100644 > index e7d92197be..0000000000 > --- > a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 859bfc342d1db9b61c43f30d9aa27cea35ca7599 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.k...@gmail.com> > -Date: Fri, 16 Oct 2020 11:03:47 -0700 > -Subject: [PATCH] futex.h: Define __NR_futex if it does not exist > - > -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as > -they only have 64bit variant of time_t. Glibc defines SYS_futex interface > based on > -__NR_futex, since this is used in applications, such applications start > -to fail to build for these newer architectures. This patch defines a > -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps > -working > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj <raj.k...@gmail.com> > - > ---- > - src/util/futex.h | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/src/util/futex.h b/src/util/futex.h > -index 2a2a00c..92fc123 100644 > ---- a/src/util/futex.h > -+++ b/src/util/futex.h > -@@ -38,6 +38,10 @@ > - #define SYS_futex SYS_futex_time64 > - #endif > - > -+#if !defined(SYS_futex) && defined(SYS_futex_time64) > -+# define SYS_futex SYS_futex_time64 > -+#endif > -+ > - static inline long sys_futex(void *addr1, int op, int val1, const struct > timespec *timeout, void *addr2, int val3) > - { > - return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); > 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 ec263ce479..2031ea957a 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,16 +23,16 @@ diff --git a/meson.build b/meson.build > index 250b528..b5c98f8 100644 > --- a/meson.build > +++ b/meson.build > -@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 > +@@ -173,7 +173,7 @@ > # Only build shared_glapi if at least one OpenGL API is enabled > with_shared_glapi = with_shared_glapi and with_any_opengl > > --system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', > 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) > +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', > 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) > +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', > 'dragonfly'].contains(host_machine.system()) or > host_machine.system().startswith('linux') > > dri_drivers = get_option('dri-drivers') > if dri_drivers.length() != 0 > -@@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray') > +@@ -1072,7 +1072,7 @@ > endif > > # TODO: this is very incomplete > @@ -41,3 +41,4 @@ index 250b528..b5c98f8 100644 > pre_args += '-D_GNU_SOURCE' > elif host_machine.system() == 'sunos' > pre_args += '-D__EXTENSIONS__' > + > diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb > b/meta/recipes-graphics/mesa/mesa-gl_22.3.0.bb > similarity index 100% > rename from meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb > rename to meta/recipes-graphics/mesa/mesa-gl_22.3.0.bb > diff --git a/meta/recipes-graphics/mesa/mesa.inc > b/meta/recipes-graphics/mesa/mesa.inc > index 115621228a..86bd91ff5c 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -17,7 +17,6 @@ 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://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ > - file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ > file://0001-util-format-Check-for-NEON-before-using-it.patch \ > ${NATIVE_PATCHES} \ > " > @@ -25,7 +24,7 @@ NATIVE_PATCHES ?= "" > # required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD > enabled > NATIVE_PATCHES:class-native = > "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch" > > -SRC_URI[sha256sum] = > "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6" > +SRC_URI[sha256sum] = > "644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746" > > UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" > > @@ -97,7 +96,6 @@ PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" > X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes > xrandr" > # "x11" requires "opengl" > PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" > -PACKAGECONFIG[xvmc] = > "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" > PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" > > PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto > libxshmfence" > diff --git a/meta/recipes-graphics/mesa/mesa_22.2.3.bb > b/meta/recipes-graphics/mesa/mesa_22.3.0.bb > similarity index 100% > rename from meta/recipes-graphics/mesa/mesa_22.2.3.bb > rename to meta/recipes-graphics/mesa/mesa_22.3.0.bb > -- > 2.34.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174254): https://lists.openembedded.org/g/openembedded-core/message/174254 Mute This Topic: https://lists.openembedded.org/mt/95388063/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
