diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2019-12-26 15:43:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-30 08:47:12 +0000 |
commit | e2a0c27364c260ec2e088fc34a4805269e862079 (patch) | |
tree | e3527edf82b2e4b4aad1aaf4b6b5640162629b58 /meta/recipes-graphics | |
parent | 1f7ba4ff4eb7243da987240de55ed218b785b0a6 (diff) | |
download | poky-e2a0c27364c260ec2e088fc34a4805269e862079.tar.gz |
libva-utils: upgrade 2.5.0 -> 2.6.0
Release details can be found here:
https://github.com/intel/libva-utils/releases/tag/2.6.0
Removed the patch which is not required anymore.
Also switched to meson.
(From OE-Core rev: 93c11e6e7ec3f0315d60f02e3b7aa67cf2b03b7b)
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/libva/libva-utils_2.6.0.bb (renamed from meta/recipes-graphics/libva/libva-utils_2.5.0.bb) | 15 |
2 files changed, 6 insertions, 44 deletions
diff --git a/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch b/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch deleted file mode 100644 index 01fb71913b..0000000000 --- a/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 8fc14e4bc81885b80c3072e549c2e6f59533d7ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 8 Feb 2019 11:45:55 +0800 | ||
4 | Subject: [PATCH] Build sfcsample only when X11 backend is enabled | ||
5 | |||
6 | See: https://github.com/intel/libva-utils/pull/149, and | ||
7 | https://github.com/intel/libva-utils/issues/150 | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | Makefile.am | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index d28175a..e294e25 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -24,10 +24,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
21 | |||
22 | AUTOMAKE_OPTIONS = foreign | ||
23 | |||
24 | -SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample | ||
25 | +SUBDIRS = common decode encode vainfo videoprocess vendor/intel | ||
26 | |||
27 | if USE_X11 | ||
28 | SUBDIRS += putsurface | ||
29 | +SUBDIRS += vendor/intel/sfcsample | ||
30 | else | ||
31 | if USE_WAYLAND | ||
32 | SUBDIRS += putsurface | ||
33 | -- | ||
34 | 2.17.1 | ||
35 | |||
diff --git a/meta/recipes-graphics/libva/libva-utils_2.5.0.bb b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb index f68d0cf8b6..0037fdfd85 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.5.0.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb | |||
@@ -14,22 +14,19 @@ SECTION = "x11" | |||
14 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" |
16 | 16 | ||
17 | SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 \ | 17 | SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.6-branch" |
18 | file://0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch \ | 18 | SRCREV = "8ea1eba433dcbceb0e5dcb54b8e3f984987f7a17" |
19 | " | 19 | S = "${WORKDIR}/git" |
20 | |||
21 | SRC_URI[md5sum] = "c1fada26c286654859eff33b2562cb79" | ||
22 | SRC_URI[sha256sum] = "9238c9d5110d60f935683390b8383fdac3507346384cd5f117a23c6db1d72a17" | ||
23 | 20 | ||
24 | UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" | 21 | UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" |
25 | 22 | ||
26 | DEPENDS = "libva" | 23 | DEPENDS = "libva" |
27 | 24 | ||
28 | inherit autotools pkgconfig features_check | 25 | inherit meson pkgconfig features_check |
29 | 26 | ||
30 | # depends on libva which requires opengl | 27 | # depends on libva which requires opengl |
31 | REQUIRED_DISTRO_FEATURES = "opengl" | 28 | REQUIRED_DISTRO_FEATURES = "opengl" |
32 | 29 | ||
33 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" | 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" |
34 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" | 31 | PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes" |
35 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" | 32 | PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland" |