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:45:02 +0000 |
| commit | 93c11e6e7ec3f0315d60f02e3b7aa67cf2b03b7b (patch) | |
| tree | ae77f39ecf006f0dea4d7b66bf28a03efdc632a9 /meta/recipes-graphics | |
| parent | d88764864f670c0d67114f140944aa8857f0b2d5 (diff) | |
| download | openembedded-core-contrib-93c11e6e7ec3f0315d60f02e3b7aa67cf2b03b7b.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.
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 @@ -From 8fc14e4bc81885b80c3072e549c2e6f59533d7ef Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Fri, 8 Feb 2019 11:45:55 +0800 -Subject: [PATCH] Build sfcsample only when X11 backend is enabled - -See: https://github.com/intel/libva-utils/pull/149, and -https://github.com/intel/libva-utils/issues/150 - -Upstream-Status: Submitted - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d28175a..e294e25 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,10 +24,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample -+SUBDIRS = common decode encode vainfo videoprocess vendor/intel - - if USE_X11 - SUBDIRS += putsurface -+SUBDIRS += vendor/intel/sfcsample - else - if USE_WAYLAND - SUBDIRS += putsurface --- -2.17.1 - 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 \ - file://0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch \ - " - -SRC_URI[md5sum] = "c1fada26c286654859eff33b2562cb79" -SRC_URI[sha256sum] = "9238c9d5110d60f935683390b8383fdac3507346384cd5f117a23c6db1d72a17" +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.6-branch" +SRCREV = "8ea1eba433dcbceb0e5dcb54b8e3f984987f7a17" +S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" DEPENDS = "libva" -inherit autotools pkgconfig features_check +inherit meson pkgconfig features_check # depends on libva which requires opengl REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" +PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland" |