diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-01 12:51:41 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-05 12:49:55 +0000 |
| commit | 1648db00b9d5895f885f117ab8f4eeb9f681f55b (patch) | |
| tree | 4469a723bc455b4128a11a861128c6ac1eafe473 | |
| parent | 925d5f1c725ceeb36c180b38a22dfdedd0dfc220 (diff) | |
| download | poky-1648db00b9d5895f885f117ab8f4eeb9f681f55b.tar.gz | |
gstreamer1.0-vaapi: upgrade 1.24.10 -> 1.24.12
(From OE-Core rev: c6c06bde51727d083015eaa0b60658b299d6f96e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-meson-Re-added-required-lines-accidentally-removed.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.12.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.10.bb) | 6 |
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-meson-Re-added-required-lines-accidentally-removed.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-meson-Re-added-required-lines-accidentally-removed.patch deleted file mode 100644 index 404ee5fb78..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-meson-Re-added-required-lines-accidentally-removed.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 75730490d2c0416ae8ad4d3e2a47ccb66d260d9f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nirbheek Chauhan <nirbheek@centricular.com> | ||
| 3 | Date: Fri, 13 Sep 2024 14:37:10 +0530 | ||
| 4 | Subject: [PATCH] meson: Re-added required: lines accidentally removed | ||
| 5 | |||
| 6 | Broke in e3f086c648171c3c993f5dd73e2d025480c3729e | ||
| 7 | |||
| 8 | Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3801 | ||
| 9 | |||
| 10 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7512> | ||
| 11 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/577df3a02f7f26283b2749c58ae7738bbdf4be4c] | ||
| 12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 13 | --- | ||
| 14 | meson.build | 6 +++--- | ||
| 15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/meson.build b/meson.build | ||
| 18 | index 1a8301f..6c61773 100644 | ||
| 19 | --- a/meson.build | ||
| 20 | +++ b/meson.build | ||
| 21 | @@ -80,9 +80,9 @@ else | ||
| 22 | endif | ||
| 23 | |||
| 24 | libva_dep = dependency('libva', version: libva_req) | ||
| 25 | -libva_drm_dep = dependency('libva-drm', version: libva_req) | ||
| 26 | -libva_wayland_dep = dependency('libva-wayland', version: libva_req) | ||
| 27 | -libva_x11_dep = dependency('libva-x11', version: libva_req) | ||
| 28 | +libva_drm_dep = dependency('libva-drm', required: get_option('drm'), version: libva_req) | ||
| 29 | +libva_wayland_dep = dependency('libva-wayland', required: get_option('wayland'), version: libva_req) | ||
| 30 | +libva_x11_dep = dependency('libva-x11', required: get_option('x11'), version: libva_req) | ||
| 31 | |||
| 32 | libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm')) | ||
| 33 | libudev_dep = dependency('libudev', required: get_option('drm')) | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.12.bb index 31b4aa27e3..c634de7c6a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.12.bb | |||
| @@ -9,11 +9,9 @@ REALPN = "gstreamer-vaapi" | |||
| 9 | LICENSE = "LGPL-2.1-or-later" | 9 | LICENSE = "LGPL-2.1-or-later" |
| 10 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | 10 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" |
| 11 | 11 | ||
| 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ | 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" |
| 13 | file://0001-meson-Re-added-required-lines-accidentally-removed.patch \ | ||
| 14 | " | ||
| 15 | 13 | ||
| 16 | SRC_URI[sha256sum] = "21593dbde5c6bcdcfe99195defbe3c3f4da01cb85f8ec10aae943887d39d8a4c" | 14 | SRC_URI[sha256sum] = "39ab3d2a381c99a9e10f46182ed57c6baaeaa8be810bd2f84f162c8be299753c" |
| 17 | 15 | ||
| 18 | S = "${WORKDIR}/${REALPN}-${PV}" | 16 | S = "${WORKDIR}/${REALPN}-${PV}" |
| 19 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
