2 files changed, 1 insertions, 135 deletions

diff --git a/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch b/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch
deleted file mode 100644
index e77e85f7..00000000
--- a/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 3748cf904089878971cfcf66abf14c4d74f8241a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:03:07 -0700
-Subject: [PATCH 5/9] move c++ definitions out of extern "C" block
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- decoder/vaapidecoder_host.cpp    | 2 +-
- encoder/vaapiencoder_host.cpp    | 3 ++-
- interface/VideoDecoderHost.h     | 8 ++++----
- interface/VideoEncoderHost.h     | 8 ++++----
- interface/VideoPostProcessHost.h | 8 ++++----
- vpp/vaapipostprocess_host.cpp    | 3 +--
- 6 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/decoder/vaapidecoder_host.cpp b/decoder/vaapidecoder_host.cpp
-index bcc9165..d9129f3 100644
---- a/decoder/vaapidecoder_host.cpp
-+++ b/decoder/vaapidecoder_host.cpp
-@@ -100,9 +100,9 @@ void releaseVideoDecoder(IVideoDecoder * p)
- {
-     delete p;
- }
-+} // extern "C"
- 
- std::vector<std::string> getVideoDecoderMimeTypes()
- {
-     return VaapiDecoderFactory::keys();
- }
--} // extern "C"
-diff --git a/encoder/vaapiencoder_host.cpp b/encoder/vaapiencoder_host.cpp
-index 49e903a..3ee9354 100644
---- a/encoder/vaapiencoder_host.cpp
-+++ b/encoder/vaapiencoder_host.cpp
-@@ -78,9 +78,10 @@ void releaseVideoEncoder(IVideoEncoder* p) {
-     delete p;
- }
- 
-+} // extern "C"
-+
- std::vector<std::string> getVideoEncoderMimeTypes()
- {
-     return VaapiEncoderFactory::keys();
- }
- 
--} // extern "C"
-diff --git a/interface/VideoDecoderHost.h b/interface/VideoDecoderHost.h
-index 86210fe..fd2ba7b 100644
---- a/interface/VideoDecoderHost.h
-+++ b/interface/VideoDecoderHost.h
-@@ -32,12 +32,12 @@ extern "C" { // for dlsym usage
- YamiMediaCodec::IVideoDecoder *createVideoDecoder(const char *mimeType);
- /// \brief destroy the decoder
- void releaseVideoDecoder(YamiMediaCodec::IVideoDecoder * p);
--/** \fn void getVideoDecoderMimeTypes()
-- * \brief return the MimeTypes enabled in the current build
--*/
--std::vector<std::string> getVideoDecoderMimeTypes();
- 
- typedef YamiMediaCodec::IVideoDecoder *(*YamiCreateVideoDecoderFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoDecoderFuncPtr)(YamiMediaCodec::IVideoDecoder * p);
- }
-+// \fn void getVideoDecoderMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoDecoderMimeTypes();
- #endif                          /* VIDEO_DECODER_HOST_H_ */
-diff --git a/interface/VideoEncoderHost.h b/interface/VideoEncoderHost.h
-index fb80335..5fb5ab3 100644
---- a/interface/VideoEncoderHost.h
-+++ b/interface/VideoEncoderHost.h
-@@ -32,12 +32,12 @@ extern "C" { // for dlsym usage
- YamiMediaCodec::IVideoEncoder *createVideoEncoder(const char *mimeType);
- ///brief destroy encoder
- void releaseVideoEncoder(YamiMediaCodec::IVideoEncoder * p);
--/** \fn void getVideoEncoderMimeTypes()
-- * \brief return the MimeTypes enabled in the current build
--*/
--std::vector<std::string> getVideoEncoderMimeTypes();
- 
- typedef YamiMediaCodec::IVideoEncoder *(*YamiCreateVideoEncoderFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoEncoderFuncPtr)(YamiMediaCodec::IVideoEncoder * p);
- }
- #endif                          /* VIDEO_ENCODER_HOST_H_ */
-+// \fn void getVideoEncoderMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoEncoderMimeTypes();
-diff --git a/interface/VideoPostProcessHost.h b/interface/VideoPostProcessHost.h
-index de046cd..f1c5ce5 100644
---- a/interface/VideoPostProcessHost.h
-+++ b/interface/VideoPostProcessHost.h
-@@ -34,12 +34,12 @@ YamiMediaCodec::IVideoPostProcess *createVideoPostProcess(const char *mimeType);
-  * \brief destroy encoder
- */
- void releaseVideoPostProcess(YamiMediaCodec::IVideoPostProcess * p);
--/** \fn void getVideoPostProcessMimeTypes()
-- * \brief return the MimeTypes enabled in the current build
--*/
--std::vector<std::string> getVideoPostProcessMimeTypes();
- 
- typedef YamiMediaCodec::IVideoPostProcess *(*YamiCreateVideoPostProcessFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoPostProcessFuncPtr)(YamiMediaCodec::IVideoPostProcess * p);
- }
- #endif                          /* VIDEO_POST_PROCESS_HOST_H_ */
-+// \fn void getVideoPostProcessMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoPostProcessMimeTypes();
-diff --git a/vpp/vaapipostprocess_host.cpp b/vpp/vaapipostprocess_host.cpp
-index cd40dea..bc06b38 100644
---- a/vpp/vaapipostprocess_host.cpp
-+++ b/vpp/vaapipostprocess_host.cpp
-@@ -75,10 +75,9 @@ void releaseVideoPostProcess(IVideoPostProcess * p)
- {
-     delete p;
- }
-+} // extern "C"
- 
- std::vector<std::string> getVideoPostProcessMimeTypes()
- {
-     return VaapiPostProcessFactory::keys();
- }
--
--} // extern "C"
--- 
-2.14.1
-
diff --git a/recipes-multimedia/libyami/libyami_git.bb b/recipes-multimedia/libyami/libyami_1.3.1.bb
index 7ff9effd..58895c81 100644
--- a/recipes-multimedia/libyami/libyami_git.bb
+++ b/recipes-multimedia/libyami/libyami_1.3.1.bb
@@ -13,15 +13,13 @@ SRC_URI = "git://github.com/intel/libyami.git;branch=apache \
            file://0002-typecast-index-from-size_t-to-int.patch \
            file://0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch \
            file://0004-Typecast-POWER32SUB2-to-uint8_t.patch \
-           file://0005-move-c-definitions-out-of-extern-C-block.patch \
            file://0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch \
            file://0007-Delete-unused-variables.patch \
            file://0008-NalUnit-is-declared-in-different-namespace.patch \
            file://0009-Fix-clang-warnings.patch \
 "
-SRCREV = "49f32de0e537577927b98deb551e16a7fa89d892"
+SRCREV = "fb48083de91f837ddbf599dd4b5ad1eb1239e1cf"
 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"
@@ -30,5 +28,3 @@ DEPENDS = "libva"
 inherit autotools pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-
-UPSTREAM_CHECK_COMMITS = "1"