From c73317916b3f3251cbea885cdd484eab5a18cc18 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 21 Jun 2018 12:10:44 +0800 Subject: libyami-utils: update to latest SRCREV Change configure option that has been renamed, switch upstream check to git commits and refresh patch using devtool. Signed-off-by: Anuj Mittal --- .../libyami-utils/0001-Fix-build-with-clang.patch | 23 +++++++--------- recipes-multimedia/libyami/libyami-utils_1.3.0.bb | 31 ---------------------- recipes-multimedia/libyami/libyami-utils_git.bb | 31 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 recipes-multimedia/libyami/libyami-utils_1.3.0.bb create mode 100644 recipes-multimedia/libyami/libyami-utils_git.bb (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch b/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch index a4a4029c..f7de9d16 100644 --- a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch +++ b/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From b7e66182788cd925570bb4c310e21fbcd3185040 Mon Sep 17 00:00:00 2001 +From f2e6d2ecfea635ab952649156e31ca893d4b1a47 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Aug 2017 08:49:20 -0700 Subject: [PATCH] Fix build with clang @@ -11,9 +11,9 @@ and psnr.cpp:225:17: error: bool literal returned from 'main' [-Werror,-Wmain] Signed-off-by: Khem Raj ---- Upstream-Status: Pending +--- tests/decodehelp.cpp | 2 +- tests/encodehelp.h | 2 +- tests/vpp.cpp | 2 +- @@ -22,12 +22,12 @@ Upstream-Status: Pending 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/decodehelp.cpp b/tests/decodehelp.cpp -index a69eab6..2d96598 100644 +index b27b977..62cca63 100644 --- a/tests/decodehelp.cpp +++ b/tests/decodehelp.cpp -@@ -70,7 +70,7 @@ bool processCmdLine(int argc, char** argv, DecodeParameter* parameters) - {"capi", no_argument, NULL, 0}, - {NULL, no_argument, NULL, 0}}; +@@ -81,7 +81,7 @@ bool processCmdLine(int argc, char** argv, DecodeParameter* parameters) + { NULL, no_argument, NULL, 0 } + }; - char opt; + int opt; @@ -35,10 +35,10 @@ index a69eab6..2d96598 100644 switch (opt) { case 'h': diff --git a/tests/encodehelp.h b/tests/encodehelp.h -index 57ccd77..76df801 100644 +index 63580a4..651ec08 100644 --- a/tests/encodehelp.h +++ b/tests/encodehelp.h -@@ -107,7 +107,7 @@ static VideoRateControl string_to_rc_mode(char *str) +@@ -109,7 +109,7 @@ static VideoRateControl string_to_rc_mode(char *str) static bool process_cmdline(int argc, char *argv[]) { @@ -61,10 +61,10 @@ index 5a60c0a..52da43b 100644 { "help", no_argument, NULL, 'h' }, { "sharpening", required_argument, NULL, 's' }, diff --git a/tests/yamitranscode.cpp b/tests/yamitranscode.cpp -index 4cb72aa..2fc6725 100755 +index 6207209..00164ce 100755 --- a/tests/yamitranscode.cpp +++ b/tests/yamitranscode.cpp -@@ -95,7 +95,7 @@ static VideoRateControl string_to_rc_mode(char *str) +@@ -100,7 +100,7 @@ static VideoRateControl string_to_rc_mode(char *str) static bool processCmdLine(int argc, char *argv[], TranscodeParams& para) { @@ -94,6 +94,3 @@ index 5cc24c9..68bd668 100644 case 'i': filename1 = optarg; break; --- -2.14.1 - diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.0.bb b/recipes-multimedia/libyami/libyami-utils_1.3.0.bb deleted file mode 100644 index 00f14398..00000000 --- a/recipes-multimedia/libyami/libyami-utils_1.3.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Applications and Scripts for libyami." -DESCRIPTION = "Applications and Scripts for libyami." - -HOMEPAGE = "https://github.com/intel/libyami-utils" -BUGTRACKER = "https://github.com/intel/libyami-utils/issues/new" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "git://github.com/intel/libyami-utils.git \ - file://0001-Fix-build-with-clang.patch \ - " -SRCREV = "d9c62f6a0653aa2e59cd2af9a3c80d82122d2149" -S = "${WORKDIR}/git" - -DEPENDS = "libva libyami" - -EXTRA_OECONF = "--enable-tests-gles --disable-md5" - -inherit autotools pkgconfig distro_features_check - -REQUIRED_DISTRO_FEATURES = "opengl" - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -# --enable-x11 needs libva-x11 -# gles-tests fail to build without x11: see https://github.com/intel/libyami-utils/issues/91 -PACKAGECONFIG[x11] = "--enable-x11 --enable-tests-gles,--disable-x11 --disable-tests-gles, virtual/libx11" - -UPSTREAM_CHECK_URI = "http://github.com/intel/libyami-utils/releases" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" diff --git a/recipes-multimedia/libyami/libyami-utils_git.bb b/recipes-multimedia/libyami/libyami-utils_git.bb new file mode 100644 index 00000000..505d4f65 --- /dev/null +++ b/recipes-multimedia/libyami/libyami-utils_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "Applications and Scripts for libyami." +DESCRIPTION = "Applications and Scripts for libyami." + +HOMEPAGE = "https://github.com/intel/libyami-utils" +BUGTRACKER = "https://github.com/intel/libyami-utils/issues/new" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +SRC_URI = "git://github.com/intel/libyami-utils.git \ + file://0001-Fix-build-with-clang.patch \ + " +SRCREV = "06f0e45a34d85fa4f4858ec369adc0c7ed333469" +S = "${WORKDIR}/git" +PV = "1.3.0+git${SRCPV}" + +DEPENDS = "libva libyami" + +EXTRA_OECONF = "--disable-md5" + +inherit autotools pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +# --enable-x11 needs libva-x11 +# gles-tests fail to build without x11: see https://github.com/intel/libyami-utils/issues/91 +PACKAGECONFIG[x11] = "--enable-x11 --enable-egl,--disable-x11 --disable-egl, virtual/libx11" + +UPSTREAM_CHECK_COMMITS = "1" -- cgit v1.2.3-54-g00ecf