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_...@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.k...@gmail.com>: > > On Mon, Dec 5, 2022 at 6:32 AM Alexandre Belloni via lists.openembedded.org > <alexandre.belloni=bootlin....@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_...@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 > > > > -- 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 (#174298): https://lists.openembedded.org/g/openembedded-core/message/174298 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] -=-=-=-=-=-=-=-=-=-=-=-
