Commit 00de59dd authored by Martin Jansa's avatar Martin Jansa Committed by Herb Kuta
Browse files

Add amazon-kinesis-video-streams-producer-sdk-cpp-*_1.7.8.bb


* Do this instead of building own version with ExternalProject in
  kinesis-manager.

* amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic:
  remove empty /usr/src directory: sometimes it's created and causing QA
  issue about unpackaged files
Signed-off-by: default avatarMartin Jansa <martin.jansa@lge.com>
Showing with 518 additions and 0 deletions
+518 -0
Amazon Software License 1.0
This Amazon Software License ("License") governs your use, reproduction, and
distribution of the accompanying software as specified below.
1. Definitions
"Licensor" means any person or entity that distributes its Work.
"Software" means the original work of authorship made available under this
License.
"Work" means the Software and any additions to or derivative works of the
Software that are made available under this License.
The terms "reproduce," "reproduction," "derivative works," and
"distribution" have the meaning as provided under U.S. copyright law;
provided, however, that for the purposes of this License, derivative works
shall not include works that remain separable from, or merely link (or bind
by name) to the interfaces of, the Work.
Works, including the Software, are "made available" under this License by
including in or with the Work either (a) a copyright notice referencing the
applicability of this License to the Work, or (b) a copy of this License.
2. License Grants
2.1 Copyright Grant. Subject to the terms and conditions of this License,
each Licensor grants to you a perpetual, worldwide, non-exclusive,
royalty-free, copyright license to reproduce, prepare derivative works of,
publicly display, publicly perform, sublicense and distribute its Work and
any resulting derivative works in any form.
2.2 Patent Grant. Subject to the terms and conditions of this License, each
Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free
patent license to make, have made, use, sell, offer for sale, import, and
otherwise transfer its Work, in whole or in part. The foregoing license
applies only to the patent claims licensable by Licensor that would be
infringed by Licensor's Work (or portion thereof) individually and
excluding any combinations with any other materials or technology.
3. Limitations
3.1 Redistribution. You may reproduce or distribute the Work only if
(a) you do so under this License, (b) you include a complete copy of this
License with your distribution, and (c) you retain without modification
any copyright, patent, trademark, or attribution notices that are present
in the Work.
3.2 Derivative Works. You may specify that additional or different terms
apply to the use, reproduction, and distribution of your derivative works
of the Work ("Your Terms") only if (a) Your Terms provide that the use
limitation in Section 3.3 applies to your derivative works, and (b) you
identify the specific derivative works that are subject to Your Terms.
Notwithstanding Your Terms, this License (including the redistribution
requirements in Section 3.1) will continue to apply to the Work itself.
3.3 Use Limitation. The Work and any derivative works thereof only may be
used or intended for use with the web services, computing platforms or
applications provided by Amazon.com, Inc. or its affiliates, including
Amazon Web Services, Inc.
3.4 Patent Claims. If you bring or threaten to bring a patent claim against
any Licensor (including any claim, cross-claim or counterclaim in a
lawsuit) to enforce any patents that you allege are infringed by any Work,
then your rights under this License from such Licensor (including the
grants in Sections 2.1 and 2.2) will terminate immediately.
3.5 Trademarks. This License does not grant any rights to use any
Licensor's or its affiliates' names, logos, or trademarks, except as
necessary to reproduce the notices described in this License.
3.6 Termination. If you violate any term of this License, then your rights
under this License (including the grants in Sections 2.1 and 2.2) will
terminate immediately.
4. Disclaimer of Warranty.
THE WORK IS PROVIDED "AS IS" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
EITHER EXPRESS OR IMPLIED, INCLUDING WARRANTIES OR CONDITIONS OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR
NON-INFRINGEMENT. YOU BEAR THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER
THIS LICENSE. SOME STATES' CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN
IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.
5. Limitation of Liability.
EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT AND UNDER NO LEGAL
THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE
SHALL ANY LICENSOR BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT,
INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
RELATED TO THIS LICENSE, THE USE OR INABILITY TO USE THE WORK (INCLUDING
BUT NOT LIMITED TO LOSS OF GOODWILL, BUSINESS INTERRUPTION, LOST PROFITS
OR DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY OTHER COMM ERCIAL DAMAGES
OR LOSSES), EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
# Copyright (c) 2019 LG Electronics, Inc.
SECTION = "devel"
LICENSE = "ASL-1.0"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=79ba3a8bc4e89e76f90b0dadbf304749"
SRCREV = "5888464631094bb99ca211c8afb8e7f5b8235cbb"
SRC_URI = "git://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git;protocol=https"
S = "${WORKDIR}/git/${KVSSDK_PROJECT}"
inherit cmake
# Copyright (c) 2019 LG Electronics, Inc.
require amazon-kinesis-video-streams-producer-sdk-cpp-${PV}.inc
KVSSDK_PROJECT = "kinesis-video-native-build"
DEPENDS = "log4cplus openssl curl"
# There is no install target in CMake, only scripts like install-script, install-script-ami, install-script-common.sh, min-install-script
# kinesis-manager uses ExternalProject with min-install-script call, but needs only the libproducer.so, lets install just that
do_install() {
install -Dm 0644 ${B}/libproducer.so ${D}${libdir}/libproducer.so
}
# ERROR: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-native-build-1.7.8-r0 do_package_qa: QA Issue: -dev package contains non-symlink .so: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-native-build-dev path '/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-native-build/1.7.8-r0/packages-split/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-native-build-dev/usr/lib/libproducer.so' [dev-elf]
inherit faulty-solibs
# Copyright (c) 2019 LG Electronics, Inc.
require amazon-kinesis-video-streams-producer-sdk-cpp-${PV}.inc
KVSSDK_PROJECT = "kinesis-video-pic"
DEPENDS += "gtest"
# WARNING: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic-1.7.8-r0 do_package: QA Issue: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic: Files/directories were installed but not shipped in any package:
# /usr/tst
# /usr/tst/samples
# Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
# amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic: 2 installed and not shipped files. [installed-vs-shipped]
# and
# WARNING: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic-1.7.8-r0 do_package: QA Issue: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic: Files/directories were installed but not shipped in any package:
# /usr/src
# Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
# amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic: 1 installed and not shipped files. [installed-vs-shipped]
do_install_append() {
rm -rfv ${D}${prefix}/tst
rm -rfv ${D}${prefix}/src
}
From 29515a91caec6d995c5e34dab50204fb29b5f64d Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Mon, 30 Dec 2019 11:58:01 -0800
Subject: [PATCH] kinesis-video-producer: fix include paths
* fixes:
FAILED: src/CMakeFiles/KinesisVideoProducer.dir/common/PutFrameHelper.cpp.o
/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/i586-oe-linux-g++ -DKinesisVideoProducer_EXPORTS -I/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0=/usr/src/debug/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0 -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot= -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -fPIC -std=c++14 -ldl -lrt -lpthread -fPIC -std=c++14 -MD -MT src/CMakeFiles/KinesisVideoProducer.dir/common/PutFrameHelper.cpp.o -MF src/CMakeFiles/KinesisVideoProducer.dir/common/PutFrameHelper.cpp.o.d -o src/CMakeFiles/KinesisVideoProducer.dir/common/PutFrameHelper.cpp.o -c /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/common/PutFrameHelper.cpp
In file included from /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/common/PutFrameHelper.cpp:1:
/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/common/PutFrameHelper.h:4:10: fatal error: KinesisVideoProducer.h: No such file or directory
#include "KinesisVideoProducer.h"
^~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[2/30] /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/i586-oe-linux-g++ -DKinesisVideoProducer_EXPORTS -I/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0=/usr/src/debug/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0 -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot= -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -fPIC -std=c++14 -ldl -lrt -lpthread -fPIC -std=c++14 -MD -MT src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o -MF src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o.d -o src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o -c /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/credential-providers/CredentialProviderUtil.cpp
FAILED: src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o
/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/i586-oe-linux-g++ -DKinesisVideoProducer_EXPORTS -I/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0=/usr/src/debug/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0 -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot= -fdebug-prefix-map=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m32 -march=i586 --sysroot=/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/recipe-sysroot -fPIC -std=c++14 -ldl -lrt -lpthread -fPIC -std=c++14 -MD -MT src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o -MF src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o.d -o src/CMakeFiles/KinesisVideoProducer.dir/credential-providers/CredentialProviderUtil.cpp.o -c /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/credential-providers/CredentialProviderUtil.cpp
In file included from /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/credential-providers/CredentialProviderUtil.cpp:1:
/jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/git/kinesis-video-producer/src/credential-providers/CredentialProviderUtil.h:7:10: fatal error: Logger.h: No such file or directory
#include <Logger.h>
^~~~~~~~~~
compilation terminated.
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
kinesis-video-producer/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kinesis-video-producer/CMakeLists.txt b/kinesis-video-producer/CMakeLists.txt
index 9a92f75..968d94f 100644
--- a/kinesis-video-producer/CMakeLists.txt
+++ b/kinesis-video-producer/CMakeLists.txt
@@ -25,6 +25,10 @@ get_filename_component(ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
# Include source base directory to allow absolute header paths
include_directories(${CMAKE_SOURCE_DIR})
+# Include also src subdirectory where the header files actually are
+# tst/CMakeLists.txt already does that, but it's used even outside tst
+include_directories(${CMAKE_SOURCE_DIR}/src)
+
enable_testing()
add_subdirectory(src)
# Copyright (c) 2019 LG Electronics, Inc.
require amazon-kinesis-video-streams-producer-sdk-cpp-${PV}.inc
KVSSDK_PROJECT = "kinesis-video-producer"
DEPENDS = "curl jsoncpp log4cplus openssl amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-pic"
SRC_URI += "file://0001-kinesis-video-producer-fix-include-paths.patch;patchdir=.. \
file://0001-kinesis-video-producer-don-t-build-tst-subdirectory-.patch;patchdir=.. \
"
# kinesis-manager expects kinesis-video-producer header files to be in kinesis-video-producer subdirectory
# | /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/kinesis-manager/2.0.1-1-r0/git/src/kinesis_stream_manager.cpp:19:10: fatal error: kinesis-video-producer/ClientCallbackProvider.h: No such file or directory
# | #include <kinesis-video-producer/ClientCallbackProvider.h>
do_install_append() {
install -d ${D}${includedir}/kinesis-video-producer
mv ${D}${includedir}/*.h ${D}${includedir}/kinesis-video-producer/
}
# ERROR: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer-1.7.8-r0 do_package_qa: QA Issue: -dev package contains non-symlink .so: amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer-dev path '/work/i586-oe-linux/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer/1.7.8-r0/packages-split/amazon-kinesis-video-streams-producer-sdk-cpp-kinesis-video-producer-dev/usr/lib/libKinesisVideoProducer.so' [dev-elf]
inherit faulty-solibs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment