| Message ID | 20221201173942.1218836-1-f_l_k@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | mesa: update 22.2.3 -> 22.3.0 | expand |
On Thu, Dec 1, 2022 at 9:39 AM Markus Volk <f_l_k@t-online.de> wrote: > > - remove deprecated xvmc PACKAGECONFIG > - remove futex.h patch. Code has been reworked, still needed? > build for qemuriscv32 to find out. > Note: mesa-22.3.0 will require libperfetto update to v28. Otherwise compilation will fail. > > Signed-off-by: Markus Volk <f_l_k@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.khem@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.khem@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 (#174199): https://lists.openembedded.org/g/openembedded-core/message/174199 > Mute This Topic: https://lists.openembedded.org/mt/95388063/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Am Do, 1. Dez 2022 um 11:44:16 -0800 schrieb Khem Raj
<raj.khem@gmail.com>:
> build for qemuriscv32 to find out.
mesa 22.3.0 did compile for qemuriscv32 without errors
On Thu, Dec 1, 2022 at 9:36 PM Markus Volk <f_l_k@t-online.de> wrote: > > Am Do, 1. Dez 2022 um 11:44:16 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > > build for qemuriscv32 to find out. > > > mesa 22.3.0 did compile for qemuriscv32 without errors OK. Thanks for checking.
On Thu, Dec 1, 2022 at 9:39 AM Markus Volk <f_l_k@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_l_k@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.khem@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.khem@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 (#174199): https://lists.openembedded.org/g/openembedded-core/message/174199 > Mute This Topic: https://lists.openembedded.org/mt/95388063/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Am So, 4. Dez 2022 um 09:23:49 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > Not sure if this is related but I think its somewhere in egl headers > provided by mesa. This is related to an update of the egl headers in Mesa, just as you thought: <https://github.com/meta-qt5/meta-qt5/pull/491>
Em seg., 5 de dez. de 2022 às 02:52, Markus Volk <f_l_k@t-online.de> escreveu: > Am So, 4. Dez 2022 um 09:23:49 -0800 schrieb Khem Raj <raj.khem@gmail.com > >: > > Not sure if this is related but I think its somewhere in egl headers > provided by mesa. > > > This is related to an update of the egl headers in Mesa, just as you > thought: > https://github.com/meta-qt5/meta-qt5/pull/491 > It looks fine for me. @Martin Jansa <Martin.Jansa@gmail.com> could you check the PR above and merge if fine with it?
Hello, This caused: | FAILED: gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o | x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot -Igst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p -Igst-libs/gst/vaapi -I../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi -I. -I../gstreamer-vaapi-1.20.4 -Igst-libs -I../gstreamer-vaapi-1.20.4/gst-libs -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/gstreamer-1.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot-native= -fPIC -pthread -DHAVE_CONFIG_H -DGST_USE_UNSTABLE_API '-DGST_VAAPI_VERSION_ID="1.20.4"' -MD -MQ gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -MF gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o.d -o gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -c ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c | In file included from /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/egl.h:20, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.h:26, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c:24: | /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: fatal error: X11/Xlib.h: No such file or directory | 109 | #include <X11/Xlib.h> | | ^~~~~~~~~~~~ | compilation terminated. | ninja: build stopped: subcommand failed. | WARNING: /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472:153 exit 1 from 'ninja -v -j 16 -l 52' | WARNING: Backtrace (BB generated script): | #1: meson_do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 153 | #2: do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 148 | #3: main, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 157 NOTE: recipe gstreamer1.0-vaapi-1.20.4-r0: task do_compile: Failed ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.4.bb:do_compile) failed with exit code '1' https://autobuilder.yoctoproject.org/typhoon/#builders/40/builds/6280/steps/11/logs/stdio On 01/12/2022 18:39:42+0100, Markus Volk 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. > > Signed-off-by: Markus Volk <f_l_k@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.khem@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.khem@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 (#174199): https://lists.openembedded.org/g/openembedded-core/message/174199 > Mute This Topic: https://lists.openembedded.org/mt/95388063/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Dec 5, 2022 at 6:32 AM Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > Hello, > > This caused: > > | FAILED: gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o > | x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot -Igst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p -Igst-libs/gst/vaapi -I../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi -I. -I../gstreamer-vaapi-1.20.4 -Igst-libs -I../gstreamer-vaapi-1.20.4/gst-libs -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/gstreamer-1.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot-native= -fPIC -pthread -DHAVE_CONFIG_H -DGST_USE_UNSTABLE_API '-DGST_VAAPI_VERSION_ID="1.20.4"' -MD -MQ gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -MF gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o.d -o gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -c ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c > | In file included from /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/egl.h:20, > | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.h:26, > | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c:24: > | /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: fatal error: X11/Xlib.h: No such file or directory > | 109 | #include <X11/Xlib.h> > | | ^~~~~~~~~~~~ for no-x11 builds gstreamer1.0-vaapi needs to pass -UUSE_X11 maybe, the code where we were tweaking. https://git.yoctoproject.org/poky/tree/meta/recipes-graphics/mesa/mesa.inc#n38 is removed from upstream. > | compilation terminated. > | ninja: build stopped: subcommand failed. > | WARNING: /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472:153 exit 1 from 'ninja -v -j 16 -l 52' > | WARNING: Backtrace (BB generated script): > | #1: meson_do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 153 > | #2: do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 148 > | #3: main, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 157 > NOTE: recipe gstreamer1.0-vaapi-1.20.4-r0: task do_compile: Failed > ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.4.bb:do_compile) failed with exit code '1' > > > https://autobuilder.yoctoproject.org/typhoon/#builders/40/builds/6280/steps/11/logs/stdio > > On 01/12/2022 18:39:42+0100, Markus Volk 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. > > > > Signed-off-by: Markus Volk <f_l_k@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.khem@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.khem@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 > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174289): https://lists.openembedded.org/g/openembedded-core/message/174289 > Mute This Topic: https://lists.openembedded.org/mt/95388063/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Wouldn't it be best if we just removed the gstreamer-1.0-vaapi recipe. Gitlab repo says: *ARCHIVED REPOSITORY*: Hardware-accelerated video decoding, encoding and processing on Intel graphics through VA-API *This code has been moved to the GStreamer mono repo <https://gitlab.freedesktop.org/gstreamer/gstreamer>, please submit new issues and merge requests there!* Like I understand it, the code has been merged into gstreamer1.0 and can be enabled by <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/meson_options.txt#L13> Am Mo, 5. Dez 2022 um 09:23:21 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > On Mon, Dec 5, 2022 at 6:32 AM Alexandre Belloni via > lists.openembedded.org > <alexandre.belloni=bootlin.com@lists.openembedded.org > <mailto:alexandre.belloni=bootlin.com@lists.openembedded.org>> wrote: >> >> Hello, >> >> This caused: >> >> | FAILED: >> gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o >> | x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 >> -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 >> -Wformat -Wformat-security -Werror=format-security >> --sysroot=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot >> -Igst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p -Igst-libs/gst/vaapi >> -I../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi -I. >> -I../gstreamer-vaapi-1.20.4 -Igst-libs >> -I../gstreamer-vaapi-1.20.4/gst-libs >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/glib-2.0 >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/glib-2.0/include >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/orc-0.4 >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/gstreamer-1.0/include >> -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/libdrm >> -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall >> -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -O2 -pipe -g >> -feliminate-unused-debug-types >> -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 >> -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 >> -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 >> -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 >> -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= >> -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= >> -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot-native= >> -fPIC -pthread -DHAVE_CONFIG_H -DGST_USE_UNSTABLE_API >> '-DGST_VAAPI_VERSION_ID="1.20.4"' -MD -MQ >> gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o >> -MF >> gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o.d >> -o gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o >> -c ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c >> | In file included from >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/egl.h:20, >> | from >> ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.h:26, >> | from >> ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c:24: >> | >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: >> fatal error: X11/Xlib.h: No such file or directory >> | 109 | #include <X11/Xlib.h> >> | | ^~~~~~~~~~~~ > > for no-x11 builds gstreamer1.0-vaapi needs to pass -UUSE_X11 maybe, > the code where we were tweaking. > > <https://git.yoctoproject.org/poky/tree/meta/recipes-graphics/mesa/mesa.inc#n38> > > is removed from upstream. > >> | compilation terminated. >> | ninja: build stopped: subcommand failed. >> | WARNING: >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472:153 >> exit 1 from 'ninja -v -j 16 -l 52' >> | WARNING: Backtrace (BB generated script): >> | #1: meson_do_compile, >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, >> line 153 >> | #2: do_compile, >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, >> line 148 >> | #3: main, >> /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, >> line 157 >> NOTE: recipe gstreamer1.0-vaapi-1.20.4-r0: task do_compile: Failed >> ERROR: Task >> (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.4.bb:do_compile) >> failed with exit code '1' >> >> >> >> <https://autobuilder.yoctoproject.org/typhoon/#builders/40/builds/6280/steps/11/logs/stdio> >> >> On 01/12/2022 18:39:42+0100, Markus Volk 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. >> > >> > Signed-off-by: Markus Volk <f_l_k@t-online.de >> <mailto:f_l_k@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.khem@gmail.com <mailto:raj.khem@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.khem@gmail.com >> <mailto:raj.khem@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 >> <https://mesa.freedesktop.org/archive/mesa-$%7BPV%7D.tar.xz> \ >> > >> file://0001-meson.build-check-for-all-linux-host_os-combinations.patch >> <file://0001-meson.build-check-for-all-linux-host_os-combinations.patch/> >> \ >> > >> file://0001-meson-misdetects-64bit-atomics-on-mips-clang.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-futex.h-define-__nr_futex-if-it-does-not-exist.patch/> \ >> > >> file://0001-util-format-Check-for-NEON-before-using-it.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" >> <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 >> > >> >> > >> > >> > >> >> >> -- >> Alexandre Belloni, co-owner and COO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com <https://bootlin.com/> >> >> >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174294): > <https://lists.openembedded.org/g/openembedded-core/message/174294> > Mute This Topic: <https://lists.openembedded.org/mt/95388063/3618223> > Group Owner: openembedded-core+owner@lists.openembedded.org > <mailto:openembedded-core+owner@lists.openembedded.org> > Unsubscribe: > <https://lists.openembedded.org/g/openembedded-core/unsub> > [f_l_k@t-online.de <mailto:f_l_k@t-online.de>] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Dec 5, 2022 at 11:04 AM Markus Volk <f_l_k@t-online.de> wrote: > > Wouldn't it be best if we just removed the gstreamer-1.0-vaapi recipe. Gitlab repo says: > > ARCHIVED REPOSITORY: Hardware-accelerated video decoding, encoding and processing on Intel graphics through VA-API > > This code has been moved to the GStreamer mono repo, please submit new issues and merge requests there! > > Like I understand it, the code has been merged into gstreamer1.0 and can be enabled by > > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/meson_options.txt#L13 > yes I think that would be preferred. > > Am Mo, 5. Dez 2022 um 09:23:21 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > > On Mon, Dec 5, 2022 at 6:32 AM Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > Hello, This caused: | FAILED: gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o | x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot -Igst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p -Igst-libs/gst/vaapi -I../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi -I. -I../gstreamer-vaapi-1.20.4 -Igst-libs -I../gstreamer-vaapi-1.20.4/gst-libs -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/gstreamer-1.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot-native= -fPIC -pthread -DHAVE_CONFIG_H -DGST_USE_UNSTABLE_API '-DGST_VAAPI_VERSION_ID="1.20.4"' -MD -MQ gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -MF gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o.d -o gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -c ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c | In file included from /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/egl.h:20, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.h:26, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c:24: | /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: fatal error: X11/Xlib.h: No such file or directory | 109 | #include <X11/Xlib.h> | | ^~~~~~~~~~~~ > > for no-x11 builds gstreamer1.0-vaapi needs to pass -UUSE_X11 maybe, the code where we were tweaking. https://git.yoctoproject.org/poky/tree/meta/recipes-graphics/mesa/mesa.inc#n38 is removed from upstream. > > | compilation terminated. | ninja: build stopped: subcommand failed. | WARNING: /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472:153 exit 1 from 'ninja -v -j 16 -l 52' | WARNING: Backtrace (BB generated script): | #1: meson_do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 153 | #2: do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 148 | #3: main, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 157 NOTE: recipe gstreamer1.0-vaapi-1.20.4-r0: task do_compile: Failed ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.4.bb:do_compile) failed with exit code '1' https://autobuilder.yoctoproject.org/typhoon/#builders/40/builds/6280/steps/11/logs/stdio On 01/12/2022 18:39:42+0100, Markus Volk 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. > > Signed-off-by: Markus Volk <f_l_k@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.khem@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.khem@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 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174294): https://lists.openembedded.org/g/openembedded-core/message/174294 Mute This Topic: https://lists.openembedded.org/mt/95388063/3618223 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [f_l_k@t-online.de] -=-=-=-=-=-=-=-=-=-=-=-
We don't use the monorepo, we use source tarballs and in them vaapi continues to be provided separately: https://gstreamer.freedesktop.org/src/gstreamer-vaapi/ Alex On Mon, 5 Dec 2022 at 20:04, Markus Volk <f_l_k@t-online.de> wrote: > > Wouldn't it be best if we just removed the gstreamer-1.0-vaapi recipe. Gitlab repo says: > > ARCHIVED REPOSITORY: Hardware-accelerated video decoding, encoding and processing on Intel graphics through VA-API > > This code has been moved to the GStreamer mono repo, please submit new issues and merge requests there! > > Like I understand it, the code has been merged into gstreamer1.0 and can be enabled by > > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/meson_options.txt#L13 > > > Am Mo, 5. Dez 2022 um 09:23:21 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > > On Mon, Dec 5, 2022 at 6:32 AM Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > Hello, This caused: | FAILED: gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o | x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot -Igst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p -Igst-libs/gst/vaapi -I../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi -I. -I../gstreamer-vaapi-1.20.4 -Igst-libs -I../gstreamer-vaapi-1.20.4/gst-libs -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/lib/gstreamer-1.0/include -I/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/gstreamer-vaapi-1.20.4=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/build=/usr/src/debug/gstreamer1.0-vaapi/1.20.4-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot-native= -fPIC -pthread -DHAVE_CONFIG_H -DGST_USE_UNSTABLE_API '-DGST_VAAPI_VERSION_ID="1.20.4"' -MD -MQ gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -MF gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o.d -o gst-libs/gst/vaapi/libgstlibvaapi-1.0.a.p/gstvaapidisplay_egl.c.o -c ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c | In file included from /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/egl.h:20, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.h:26, | from ../gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c:24: | /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: fatal error: X11/Xlib.h: No such file or directory | 109 | #include <X11/Xlib.h> | | ^~~~~~~~~~~~ > > for no-x11 builds gstreamer1.0-vaapi needs to pass -UUSE_X11 maybe, the code where we were tweaking. https://git.yoctoproject.org/poky/tree/meta/recipes-graphics/mesa/mesa.inc#n38 is removed from upstream. > > | compilation terminated. | ninja: build stopped: subcommand failed. | WARNING: /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472:153 exit 1 from 'ninja -v -j 16 -l 52' | WARNING: Backtrace (BB generated script): | #1: meson_do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 153 | #2: do_compile, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 148 | #3: main, /home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/gstreamer1.0-vaapi/1.20.4-r0/temp/run.do_compile.281472, line 157 NOTE: recipe gstreamer1.0-vaapi-1.20.4-r0: task do_compile: Failed ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.4.bb:do_compile) failed with exit code '1' https://autobuilder.yoctoproject.org/typhoon/#builders/40/builds/6280/steps/11/logs/stdio On 01/12/2022 18:39:42+0100, Markus Volk 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. > > Signed-off-by: Markus Volk <f_l_k@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.khem@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.khem@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 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174296): https://lists.openembedded.org/g/openembedded-core/message/174296 > Mute This Topic: https://lists.openembedded.org/mt/95388063/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Am Mo, 5. Dez 2022 um 20:17:53 +0100 schrieb Alexander Kanavin <alex.kanavin@gmail.com>: > We don't use the monorepo, we use source tarballs and in them vaapi > continues to be provided separately: I see. Their meson.build is quite broken :(
On Mon, Dec 5, 2022 at 3:04 PM Otavio Salvador < otavio.salvador@ossystems.com.br> wrote: > > > Em seg., 5 de dez. de 2022 às 02:52, Markus Volk <f_l_k@t-online.de> > escreveu: > >> Am So, 4. Dez 2022 um 09:23:49 -0800 schrieb Khem Raj <raj.khem@gmail.com >> >: >> >> Not sure if this is related but I think its somewhere in egl headers >> provided by mesa. >> >> >> This is related to an update of the egl headers in Mesa, just as you >> thought: >> https://github.com/meta-qt5/meta-qt5/pull/491 >> > > It looks fine for me. @Martin Jansa <Martin.Jansa@gmail.com> could you > check the PR above and merge if fine with it? > Thanks, I've merged this yesterday. +Samuli Piippo <samuli.piippo@qt.io> as qtbase in meta-qt6 fails with this mesa upgrade as well.
Qt6 should handle this already with https://codereview.qt-project.org/c/qt/qtbase/+/371780 in place. I tried test build with the mesa upgrade and didn't catch any build errors. -samuli
On Thu, Dec 8, 2022 at 8:42 AM Samuli Piippo <samuli.piippo@qt.io> wrote: > Qt6 should handle this already with > https://codereview.qt-project.org/c/qt/qtbase/+/371780 in place. > I tried test build with the mesa upgrade and didn't catch any build errors. > I've tried qemux86-64 build with 6.4.1 and 6.5.0 from yesterday's dev branch and both failed after including this mesa upgrade with: | In file included from qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/egl.h:20, | from qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/../../../../../../git/src/gui/opengl/platform/egl/qt_egl_p.h:43, | from qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/qt_egl_p.h:1, | from qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience_p.h:20, | from qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience.cpp:4: | qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: fatal error: X11/Xlib.h: No such file or directory | 109 | #include <X11/Xlib.h> | | ^~~~~~~~~~~~ | compilation terminated. >
Samuli: Similar mesa upgrade was merged recently: https://git.openembedded.org/openembedded-core/commit/?id=3bf4341ef6a681574a1c6f393bf241f412e26eac qtbase still fails the same, more details in: https://github.com/shr-project/meta-webosose/commit/c96010fe4df28397a33e447bde650932a3463a9e The change you've mentioned is the one which actually breaks some PACKAGECONFIG combinations, hopefully now you'll be able to reproduce it. Regards, On Thu, Dec 8, 2022 at 8:55 AM Martin Jansa via lists.openembedded.org <Martin.Jansa=gmail.com@lists.openembedded.org> wrote: > On Thu, Dec 8, 2022 at 8:42 AM Samuli Piippo <samuli.piippo@qt.io> wrote: > >> Qt6 should handle this already with >> https://codereview.qt-project.org/c/qt/qtbase/+/371780 in place. >> I tried test build with the mesa upgrade and didn't catch any build >> errors. >> > > I've tried qemux86-64 build with 6.4.1 and 6.5.0 from yesterday's dev > branch and both failed after including this mesa upgrade with: > | In file included from > qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/egl.h:20, > | from > qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/../../../../../../git/src/gui/opengl/platform/egl/qt_egl_p.h:43, > | from > qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/qt_egl_p.h:1, > | from > qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience_p.h:20, > | from > qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience.cpp:4: > | qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: > fatal error: X11/Xlib.h: No such file or directory > | 109 | #include <X11/Xlib.h> > | | ^~~~~~~~~~~~ > | compilation terminated. > >> > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174392): > https://lists.openembedded.org/g/openembedded-core/message/174392 > Mute This Topic: https://lists.openembedded.org/mt/95388063/3617156 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > Martin.Jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
I think this is now a webos specific issue since they have disabled xlib feature ( https://github.com/shr-project/meta-webosose/blob/c96010fe4df28397a33e447bde650932a3463a9e/meta-webos/recipes-qt/qt6/qtbase_git.bbappend#L56 ) While the qtbase cmake configuration could be improved to better handle situation where x11 dependencies are found but shouldn't be used, I think the simplest solution would be to disable egl on X11 in the webos bbappend (-DFEATURE_egl_x11=OFF) -samuli On Tue, 17 Jan 2023 at 13:01, Martin Jansa <Martin.Jansa@gmail.com> wrote: > Samuli: > > Similar mesa upgrade was merged recently: > > https://git.openembedded.org/openembedded-core/commit/?id=3bf4341ef6a681574a1c6f393bf241f412e26eac > > qtbase still fails the same, more details in: > > https://github.com/shr-project/meta-webosose/commit/c96010fe4df28397a33e447bde650932a3463a9e > > The change you've mentioned is the one which actually breaks some > PACKAGECONFIG combinations, hopefully now you'll be able to reproduce it. > > Regards, > > On Thu, Dec 8, 2022 at 8:55 AM Martin Jansa via lists.openembedded.org > <Martin.Jansa=gmail.com@lists.openembedded.org> wrote: > >> On Thu, Dec 8, 2022 at 8:42 AM Samuli Piippo <samuli.piippo@qt.io> wrote: >> >>> Qt6 should handle this already with >>> https://codereview.qt-project.org/c/qt/qtbase/+/371780 in place. >>> I tried test build with the mesa upgrade and didn't catch any build >>> errors. >>> >> >> I've tried qemux86-64 build with 6.4.1 and 6.5.0 from yesterday's dev >> branch and both failed after including this mesa upgrade with: >> | In file included from >> qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/egl.h:20, >> | from >> qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/../../../../../../git/src/gui/opengl/platform/egl/qt_egl_p.h:43, >> | from >> qtbase/6.4.1-r0/build/include/QtGui/6.4.1/QtGui/private/qt_egl_p.h:1, >> | from >> qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience_p.h:20, >> | from >> qtbase/6.4.1-r0/git/src/gui/opengl/platform/egl/qeglstreamconvenience.cpp:4: >> | qtbase/6.4.1-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:109:10: >> fatal error: X11/Xlib.h: No such file or directory >> | 109 | #include <X11/Xlib.h> >> | | ^~~~~~~~~~~~ >> | compilation terminated. >> >>> >> >> >> > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#176031): > https://lists.openembedded.org/g/openembedded-core/message/176031 > Mute This Topic: https://lists.openembedded.org/mt/95388063/3617605 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > samuli.piippo@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
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.khem@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.khem@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
- 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. Signed-off-by: Markus Volk <f_l_k@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%)