From 11e5b4ed29e1f0f8343937cf54a21eac8334eb0e Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 9 Jul 2019 12:01:17 +0800 Subject: intel-media-driver: upgrade 19.1.0 -> 19.2.0 Also remove the upstreamed patch. For changes in this release, see: https://github.com/intel/media-driver/releases Signed-off-by: Anuj Mittal --- .../0001-linux-fix-build-when-using-musl.patch | 28 ---------------- .../libva/intel-media-driver_19.1.0.bb | 39 ---------------------- .../libva/intel-media-driver_19.2.0.bb | 38 +++++++++++++++++++++ 3 files changed, 38 insertions(+), 67 deletions(-) delete mode 100644 recipes-multimedia/libva/intel-media-driver/0001-linux-fix-build-when-using-musl.patch delete mode 100644 recipes-multimedia/libva/intel-media-driver_19.1.0.bb create mode 100644 recipes-multimedia/libva/intel-media-driver_19.2.0.bb (limited to 'recipes-multimedia/libva') diff --git a/recipes-multimedia/libva/intel-media-driver/0001-linux-fix-build-when-using-musl.patch b/recipes-multimedia/libva/intel-media-driver/0001-linux-fix-build-when-using-musl.patch deleted file mode 100644 index ea203ca9..00000000 --- a/recipes-multimedia/libva/intel-media-driver/0001-linux-fix-build-when-using-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cc96bcbde6556cb412944ddc40f7b6a89fe4ae27 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 23 Nov 2018 14:22:36 +0800 -Subject: [PATCH] linux: fix build when using musl - -Alternative definition for CONCAT which is not defined by musl. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal ---- - media_driver/linux/common/os/mos_defs_specific.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/media_driver/linux/common/os/mos_defs_specific.h b/media_driver/linux/common/os/mos_defs_specific.h -index 29a8d566..d8244207 100644 ---- a/media_driver/linux/common/os/mos_defs_specific.h -+++ b/media_driver/linux/common/os/mos_defs_specific.h -@@ -81,7 +81,8 @@ typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE, *PTP_CALLBACK_INSTANC - /* compile-time ASSERT */ - - #ifndef C_ASSERT -- #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) -+ #define __CONCATING( a1, a2 ) a1 ## a2 -+ #define __UNIQUENAME( a1, a2 ) __CONCATING( a1, a2 ) - #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) - #define C_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1] - #endif diff --git a/recipes-multimedia/libva/intel-media-driver_19.1.0.bb b/recipes-multimedia/libva/intel-media-driver_19.1.0.bb deleted file mode 100644 index 18bb2052..00000000 --- a/recipes-multimedia/libva/intel-media-driver_19.1.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "VA driver for Intel Gen based graphics hardware" -DESCRIPTION = "Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) \ -user mode driver supporting hardware accelerated decoding, encoding, \ -and video post processing for GEN based graphics hardware." - -HOMEPAGE = "https://github.com/intel/media-driver" -BUGTRACKER = "https://github.com/intel/media-driver/issues" - -LICENSE = "MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ - file://media_driver/media_libvpx.LICENSE;md5=d5b04755015be901744a78cc30d390d4 \ - " - -# Only for 64 bit until this is resolved: https://github.com/intel/media-driver/issues/356 -COMPATIBLE_HOST = '(x86_64).*-linux' - -DEPENDS += "libva gmmlib" - -SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-19.1 \ - file://0001-linux-fix-build-when-using-musl.patch \ - " - -SRCREV = "72d50d2450ee6f642531a5819d317925c7619af9" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" - -inherit cmake pkgconfig - -MEDIA_DRIVER_ARCH_x86 = "32" -MEDIA_DRIVER_ARCH_x86-64 = "64" - -EXTRA_OECMAKE += "-DMEDIA_RUN_TEST_SUITE=OFF -DARCH=${MEDIA_DRIVER_ARCH}" - -# See: https://github.com/intel/media-driver/issues/358 -FILES_${PN} += " \ - ${libdir}/dri/ \ - ${libdir}/igfxcmrt64.so \ - " diff --git a/recipes-multimedia/libva/intel-media-driver_19.2.0.bb b/recipes-multimedia/libva/intel-media-driver_19.2.0.bb new file mode 100644 index 00000000..86569927 --- /dev/null +++ b/recipes-multimedia/libva/intel-media-driver_19.2.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "VA driver for Intel Gen based graphics hardware" +DESCRIPTION = "Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) \ +user mode driver supporting hardware accelerated decoding, encoding, \ +and video post processing for GEN based graphics hardware." + +HOMEPAGE = "https://github.com/intel/media-driver" +BUGTRACKER = "https://github.com/intel/media-driver/issues" + +LICENSE = "MIT & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ + file://media_driver/media_libvpx.LICENSE;md5=d5b04755015be901744a78cc30d390d4 \ + " + +# Only for 64 bit until this is resolved: https://github.com/intel/media-driver/issues/356 +COMPATIBLE_HOST = '(x86_64).*-linux' + +DEPENDS += "libva gmmlib" + +SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-19.2 \ + " + +SRCREV = "bcb3349b353338914f2bf06f306d6eaed2c1e35e" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" + +inherit cmake pkgconfig + +MEDIA_DRIVER_ARCH_x86 = "32" +MEDIA_DRIVER_ARCH_x86-64 = "64" + +EXTRA_OECMAKE += "-DMEDIA_RUN_TEST_SUITE=OFF -DARCH=${MEDIA_DRIVER_ARCH}" + +# See: https://github.com/intel/media-driver/issues/358 +FILES_${PN} += " \ + ${libdir}/dri/ \ + ${libdir}/igfxcmrt64.so \ + " -- cgit v1.2.3-54-g00ecf