diff options
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver/0001-linux-fix-build-when-using-musl.patch | 28 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver_19.2.0.bb (renamed from recipes-multimedia/libva/intel-media-driver_19.1.0.bb) | 5 |
2 files changed, 2 insertions, 31 deletions
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 @@ | |||
1 | From cc96bcbde6556cb412944ddc40f7b6a89fe4ae27 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 23 Nov 2018 14:22:36 +0800 | ||
4 | Subject: [PATCH] linux: fix build when using musl | ||
5 | |||
6 | Alternative definition for CONCAT which is not defined by musl. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | media_driver/linux/common/os/mos_defs_specific.h | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/media_driver/linux/common/os/mos_defs_specific.h b/media_driver/linux/common/os/mos_defs_specific.h | ||
16 | index 29a8d566..d8244207 100644 | ||
17 | --- a/media_driver/linux/common/os/mos_defs_specific.h | ||
18 | +++ b/media_driver/linux/common/os/mos_defs_specific.h | ||
19 | @@ -81,7 +81,8 @@ typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE, *PTP_CALLBACK_INSTANC | ||
20 | /* compile-time ASSERT */ | ||
21 | |||
22 | #ifndef C_ASSERT | ||
23 | - #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) | ||
24 | + #define __CONCATING( a1, a2 ) a1 ## a2 | ||
25 | + #define __UNIQUENAME( a1, a2 ) __CONCATING( a1, a2 ) | ||
26 | #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) | ||
27 | #define C_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1] | ||
28 | #endif | ||
diff --git a/recipes-multimedia/libva/intel-media-driver_19.1.0.bb b/recipes-multimedia/libva/intel-media-driver_19.2.0.bb index 18bb2052..86569927 100644 --- a/recipes-multimedia/libva/intel-media-driver_19.1.0.bb +++ b/recipes-multimedia/libva/intel-media-driver_19.2.0.bb | |||
@@ -16,11 +16,10 @@ COMPATIBLE_HOST = '(x86_64).*-linux' | |||
16 | 16 | ||
17 | DEPENDS += "libva gmmlib" | 17 | DEPENDS += "libva gmmlib" |
18 | 18 | ||
19 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-19.1 \ | 19 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-19.2 \ |
20 | file://0001-linux-fix-build-when-using-musl.patch \ | ||
21 | " | 20 | " |
22 | 21 | ||
23 | SRCREV = "72d50d2450ee6f642531a5819d317925c7619af9" | 22 | SRCREV = "bcb3349b353338914f2bf06f306d6eaed2c1e35e" |
24 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
25 | 24 | ||
26 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$" |