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 <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2019-07-09 12:01:17 +08:00
parent 69d3b2e735
commit 11e5b4ed29
2 changed files with 2 additions and 31 deletions

View File

@ -1,28 +0,0 @@
From cc96bcbde6556cb412944ddc40f7b6a89fe4ae27 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
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 <anuj.mittal@intel.com>
---
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

View File

@ -16,11 +16,10 @@ 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 \
SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-19.2 \
"
SRCREV = "72d50d2450ee6f642531a5819d317925c7619af9"
SRCREV = "bcb3349b353338914f2bf06f306d6eaed2c1e35e"
S = "${WORKDIR}/git"
UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$"