[meta-intel] [PATCH v2 1/3] libyami: update to latest SRCREV

Anuj Mittal anuj.mittal at intel.com
Fri Jun 22 22:35:18 PDT 2018


Fixes errors with musl:

| ../../git/codecparsers/vp8_parser.cpp: In member function 'YamiParser::Vp8ParserResult YamiParser::Vp8Parser::ParseFrame(const uint8_t*, size_t, YamiParser::Vp8FrameHeader*)':
| ../../git/codecparsers/vp8_parser.cpp:98:32: error: 'void* memset(void*, int, size_t)' clearing an object of non-trivial type 'struct YamiParser::Vp8FrameHeader'; use assignment or value-initialization instead [-Werror=class-memaccess]
|    memset(fhdr, 0, sizeof(*fhdr));
|                                 ^
| In file included from ../../git/codecparsers/vp8_parser.cpp:44:
| ../../git/codecparsers/vp8_parser.h:131:8: note: 'struct YamiParser::Vp8FrameHeader' declared here
|  struct Vp8FrameHeader {
|         ^~~~~~~~~~~~~~
| cc1plus: all warnings being treated as errors

Also, remove the upstreamed patch and change upstream checks to use git
commits instead.

Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
---
 ...t-to-build-dir-for-generated-headers.patch | 29 -------------------
 .../{libyami_1.3.0.bb => libyami_git.bb}      |  7 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch
 rename recipes-multimedia/libyami/{libyami_1.3.0.bb => libyami_git.bb} (84%)

diff --git a/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch b/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch
deleted file mode 100644
index 673969c..0000000
--- a/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 00fc21a41bf7e11d468227487c4e9de9e6d608e6 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Mon, 5 Feb 2018 11:16:18 +0800
-Subject: [PATCH] Makefile.am: point to build dir for generated headers
-
-Otherwise it will give out errors for missing YamiVersion.h.
-
-Upstream-Status: Submitted [https://github.com/intel/libyami/pull/827]
-
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
----
- common/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/Makefile.am b/common/Makefile.am
-index 5ee61da..1a788e5 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -40,6 +40,7 @@ extra_includes = \
- libyami_common_cppflags = \
- 	$(LIBVA_CFLAGS) \
- 	-I$(top_srcdir)/interface \
-+	-I$(top_builddir)/interface \
- 	$(extra_includes) \
- 	$(NULL)
- 
--- 
-2.7.4
-
diff --git a/recipes-multimedia/libyami/libyami_1.3.0.bb b/recipes-multimedia/libyami/libyami_git.bb
similarity index 84%
rename from recipes-multimedia/libyami/libyami_1.3.0.bb
rename to recipes-multimedia/libyami/libyami_git.bb
index ce4f253..7ff9eff 100644
--- a/recipes-multimedia/libyami/libyami_1.3.0.bb
+++ b/recipes-multimedia/libyami/libyami_git.bb
@@ -18,10 +18,10 @@ SRC_URI = "git://github.com/intel/libyami.git;branch=apache \
            file://0007-Delete-unused-variables.patch \
            file://0008-NalUnit-is-declared-in-different-namespace.patch \
            file://0009-Fix-clang-warnings.patch \
-           file://0001-Makefile.am-point-to-build-dir-for-generated-headers.patch \
 "
-SRCREV = "0192c3c041e02e8eb753e9e3e02bfc7b55756ce2"
+SRCREV = "49f32de0e537577927b98deb551e16a7fa89d892"
 S = "${WORKDIR}/git"
+PV = "1.3.0+git${SRCPV}"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"
@@ -31,5 +31,4 @@ inherit autotools pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-UPSTREAM_CHECK_URI = "https://github.com/intel/libyami/releases"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+UPSTREAM_CHECK_COMMITS = "1"
-- 
2.17.1



More information about the meta-intel mailing list