From c059319acceb2ccc6691935e520a532fe6e0eec4 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 12 Feb 2019 10:47:08 +0800 Subject: libva-utils: upgrade 2.3.0 -> 2.4.0 For changes, see: https://github.com/intel/libva-utils/releases Switch back to using tarball now that it is available. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...fcsample-only-when-X11-backend-is-enabled.patch | 35 ++++++++++++++++++++++ meta/recipes-graphics/libva/libva-utils_2.3.0.bb | 33 -------------------- meta/recipes-graphics/libva/libva-utils_2.4.0.bb | 35 ++++++++++++++++++++++ 3 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch delete mode 100644 meta/recipes-graphics/libva/libva-utils_2.3.0.bb create mode 100644 meta/recipes-graphics/libva/libva-utils_2.4.0.bb 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 new file mode 100644 index 0000000000..01fb71913b --- /dev/null +++ b/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch @@ -0,0 +1,35 @@ +From 8fc14e4bc81885b80c3072e549c2e6f59533d7ef Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +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 +--- + 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.3.0.bb b/meta/recipes-graphics/libva/libva-utils_2.3.0.bb deleted file mode 100644 index a1b7596e86..0000000000 --- a/meta/recipes-graphics/libva/libva-utils_2.3.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "libva-utils is a collection of utilities from libva project" - -DESCRIPTION = "libva-utils is a collection of utilities \ -and examples to exercise VA-API in accordance with the libva \ -project.VA-API is an open-source library and API specification, \ -which provides access to graphics hardware acceleration capabilities \ -for video processing. It consists of a main library and driver-specific \ -acceleration backends for each supported hardware vendor" - -HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/intel/libva-utils/issues" - -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" - -SRC_URI = "git://github.com/intel/libva-utils.git;protocol=https;branch=v2.3-branch" -SRCREV = "b5a56ad33ef7d72fc522f26d2de874461be4b41e" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" - -DEPENDS = "libva" - -inherit autotools pkgconfig distro_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" diff --git a/meta/recipes-graphics/libva/libva-utils_2.4.0.bb b/meta/recipes-graphics/libva/libva-utils_2.4.0.bb new file mode 100644 index 0000000000..7b764314bf --- /dev/null +++ b/meta/recipes-graphics/libva/libva-utils_2.4.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "libva-utils is a collection of utilities from libva project" + +DESCRIPTION = "libva-utils is a collection of utilities \ +and examples to exercise VA-API in accordance with the libva \ +project.VA-API is an open-source library and API specification, \ +which provides access to graphics hardware acceleration capabilities \ +for video processing. It consists of a main library and driver-specific \ +acceleration backends for each supported hardware vendor" + +HOMEPAGE = "https://01.org/linuxmedia/vaapi" +BUGTRACKER = "https://github.com/intel/libva-utils/issues" + +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] = "f5374c4c32ce136e50aea0267887aed5" +SRC_URI[sha256sum] = "5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3" + +UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" + +DEPENDS = "libva" + +inherit autotools pkgconfig distro_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" -- cgit 1.2.3-korg