diff options
| -rw-r--r-- | recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch | 29 | ||||
| -rw-r--r-- | recipes-multimedia/libyami/libyami_git.bb (renamed from recipes-multimedia/libyami/libyami_1.3.0.bb) | 7 |
2 files changed, 3 insertions, 33 deletions
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 673969cf..00000000 --- a/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 00fc21a41bf7e11d468227487c4e9de9e6d608e6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
| 3 | Date: Mon, 5 Feb 2018 11:16:18 +0800 | ||
| 4 | Subject: [PATCH] Makefile.am: point to build dir for generated headers | ||
| 5 | |||
| 6 | Otherwise it will give out errors for missing YamiVersion.h. | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/intel/libyami/pull/827] | ||
| 9 | |||
| 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 11 | --- | ||
| 12 | common/Makefile.am | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/common/Makefile.am b/common/Makefile.am | ||
| 16 | index 5ee61da..1a788e5 100644 | ||
| 17 | --- a/common/Makefile.am | ||
| 18 | +++ b/common/Makefile.am | ||
| 19 | @@ -40,6 +40,7 @@ extra_includes = \ | ||
| 20 | libyami_common_cppflags = \ | ||
| 21 | $(LIBVA_CFLAGS) \ | ||
| 22 | -I$(top_srcdir)/interface \ | ||
| 23 | + -I$(top_builddir)/interface \ | ||
| 24 | $(extra_includes) \ | ||
| 25 | $(NULL) | ||
| 26 | |||
| 27 | -- | ||
| 28 | 2.7.4 | ||
| 29 | |||
diff --git a/recipes-multimedia/libyami/libyami_1.3.0.bb b/recipes-multimedia/libyami/libyami_git.bb index ce4f253a..7ff9effd 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 \ | |||
| 18 | file://0007-Delete-unused-variables.patch \ | 18 | file://0007-Delete-unused-variables.patch \ |
| 19 | file://0008-NalUnit-is-declared-in-different-namespace.patch \ | 19 | file://0008-NalUnit-is-declared-in-different-namespace.patch \ |
| 20 | file://0009-Fix-clang-warnings.patch \ | 20 | file://0009-Fix-clang-warnings.patch \ |
| 21 | file://0001-Makefile.am-point-to-build-dir-for-generated-headers.patch \ | ||
| 22 | " | 21 | " |
| 23 | SRCREV = "0192c3c041e02e8eb753e9e3e02bfc7b55756ce2" | 22 | SRCREV = "49f32de0e537577927b98deb551e16a7fa89d892" |
| 24 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
| 24 | PV = "1.3.0+git${SRCPV}" | ||
| 25 | 25 | ||
| 26 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | 26 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" |
| 27 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" | 27 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" |
| @@ -31,5 +31,4 @@ inherit autotools pkgconfig distro_features_check | |||
| 31 | 31 | ||
| 32 | REQUIRED_DISTRO_FEATURES = "opengl" | 32 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 33 | 33 | ||
| 34 | UPSTREAM_CHECK_URI = "https://github.com/intel/libyami/releases" | 34 | UPSTREAM_CHECK_COMMITS = "1" |
| 35 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
