aws4embeddedlinux · thomas-roos · Jun 17, 2025 · Jun 17, 2025
@@ -17,8 +17,8 @@ UPSTREAM_VERSION_UNKNOWN = "1"
 # set to match only git_invalid_tag_regex because UPSTREAM_VERSION_UNKNOWN seems to be broken for git
 UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
 # this SRCREV commit id should not different than this:
-# https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/80c74ac9200b58427a8fcb7782a03b1774020983/CMake/Dependencies/libkvspic-CMakeLists.txt#L10
-SRCREV = "d08be2e16303507d21b4cb376aecda98271687ad"
+# https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/master/CMake/Dependencies/libkvspic-CMakeLists.txt
+SRCREV = "65e38dac9b30523d43a57bc009d679e627b58d9a"
 
 S = "${WORKDIR}/git"
 
@@ -66,7 +66,7 @@ RDEPENDS:${PN}-ptest += "\
 do_install_ptest () {
    install -d ${D}${PTEST_PATH}/tests
    install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
-   cp -r ${B}/kvspic_test ${D}${PTEST_PATH}/tests/
+   cp -r ${B}/tst/kvspic_test ${D}${PTEST_PATH}/tests/
 }
 
 BBCLASSEXTEND = "native nativesdk"
@@ -23,13 +23,11 @@ SRC_URI = "\
 UPSTREAM_VERSION_UNKNOWN = "1"
 # set to match only git_invalid_tag_regex because UPSTREAM_VERSION_UNKNOWN seems to be broken for git
 UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
-# this SRCREV commit id should not different to this specified here:
-# https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp/blob/70f74f14cf27b09f71dc1889f36eb6e04cdd90a8/CMake/Dependencies/libkvscproducer-CMakeLists.txt#L10
-SRCREV = "7d1b76f53680c1e23afb6f35f0cca97ccdb35e3f"
+SRCREV = "3e519b7670e39031375d227f983ad2cde888078e"
 
 S = "${WORKDIR}/git"
 
-inherit cmake pkgconfig 
+inherit cmake pkgconfig
 
 # ptest are disabled, cause running tests require a certificate
 
@@ -43,11 +41,15 @@ PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON -DBUILD_
 PACKAGECONFIG[with-tests] = "-DBUILD_TEST=ON,-DBUILD_TEST=OFF,gtest"
 
 FILES:${PN} += "\
-    ${libdir}/libcproducer.so \
     ${libdir}/pkgconfig/*.pc \
     "
 
-FILES:${PN}-dev += "${includedir}/com/amazonaws/kinesis/video/*"
+FILES:${PN}-dev += "\
+    ${includedir}/com/amazonaws/kinesis/video/* \
+    ${libdir}/libkvsCommonLws.so \
+    ${libdir}/libkvsCommonCurl.so \
+    ${libdir}/libcproducer.so \
+    "
 
 RDEPENDS:${PN} = ""
 CFLAGS:append = " -Wl,-Bsymbolic"

@@ -1,16 +1,15 @@
-From 29f76d9358e39561e35f12687efd7f96310c48ef Mon Sep 17 00:00:00 2001
+From 7b608679a6885820ba29037a60aca19bb685bb05 Mon Sep 17 00:00:00 2001
 From: rpcme <rich@richelberger.com>
 Date: Sun, 16 Jan 2022 06:00:06 -0500
 Subject: [PATCH] add support for amazon kvs producer sdk cpp
 
-Upstream-Status: Unknown
-
+Upstream-Status: Submitted [author]
 ---
  CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec001a7..470e069 100644
+index 7f1e1c1..b302086 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -94,6 +94,7 @@ set(BUILD_COMMON_LWS

@@ -0,0 +1,23 @@
+From 8623532eb98a093785661366b151cf98e472f0d3 Mon Sep 17 00:00:00 2001
+From: Thomas Roos <throos@amazon.de>
+Date: Fri, 26 Jul 2024 06:19:24 +0000
+Subject: [PATCH] amazon-kvs-producer-sdk-cpp: fix globalThreadSleep link error
+
+Upstream-Status: Submitted [https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp/issues/1197]
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b302086..9529fed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,7 +225,7 @@ if(BUILD_GSTREAMER_PLUGIN)
+   target_link_libraries(gstkvssink PRIVATE ${GST_APP_LIBRARIES} KinesisVideoProducer)
+
+   add_executable(kvssink_gstreamer_sample samples/kvssink_gstreamer_sample.cpp)
+-  target_link_libraries(kvssink_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer)
++  target_link_libraries(kvssink_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)
+
+   add_executable(kvs_gstreamer_sample samples/kvs_gstreamer_sample.cpp)
+   target_link_libraries(kvs_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)
@@ -16,17 +16,16 @@ BRANCH ?= "master"
 # nooelint: oelint.file.patchsignedoff
 SRC_URI = "git://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git;protocol=https;branch=${BRANCH} \
            file://amazon-kvs-producer-sdk-cpp-deps.patch \
+           file://global-thread-sleep-linkerror.patch \
            "
 
-SRCREV = "8e59b313950d4dbb1ecfb88e2108df87e3331c4e"
+SRCREV = "7acf272672ced72bbbad85fe39d366deca57280e"
 
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
-PACKAGECONFIG ??= "\
-    ${@bb.utils.contains('PTEST_ENABLED', '1', 'gstreamer', '', d)} \
-"
+PACKAGECONFIG ??= "gstreamer"
 
 PACKAGECONFIG[gstreamer] = "-DBUILD_GSTREAMER_PLUGIN=ON,-DBUILD_GSTREAMER_PLUGIN=OFF,curl log4cplus openssl gstreamer1.0 gstreamer1.0-plugins-base"
 

@@ -18,14 +18,14 @@ DEPENDS += "\
 
 PROVIDES += "aws/amazon-kvs-webrtc-sdk"
 
-BRANCH = "master"
+BRANCH = "main"
 SRC_URI = "\
     git://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c.git;protocol=https;branch=${BRANCH} \
     file://run-ptest \
     file://ptest_result.py \
 "
 
-SRCREV = "bfa6667e2f2eeb800a0edd6e6e4745b4faf34536"
+SRCREV = "cf817bc5d18f3e4bd499c6b0f9a68c6f4d7e01de"
 
 S = "${WORKDIR}/git"
 
@@ -44,7 +44,10 @@ PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON,"
 
 do_configure[network] = "1"
 
-FILES:${PN} += "${libdir}"
+FILES:${PN} += "\
+    ${@bb.utils.contains('PACKAGECONFIG', 'with-samples', '/samples/*', '', d)} \
+    ${libdir} \
+    "
 
 CFLAGS:append = " -Wl,-Bsymbolic"
 
@@ -76,10 +79,22 @@ LDFLAGS += "-Wl,--copy-dt-needed-entries"
 # fix package neo-ai-tvm contains bad RPATH
 EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=1"
 
+do_install:append () {
+    if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'with-samples', '1', '', d)}" ]; then
+        install -d ${D}/samples/
+        cp -r ${S}/samples/h264SampleFrames ${D}/samples/
+        cp -r ${S}/samples/h265SampleFrames ${D}/samples/
+        cp -r ${S}/samples/opusSampleFrames ${D}/samples/
+    fi
+}
+
 do_install_ptest () {
     cp -r ${B}/tst/webrtc_client_test ${D}${PTEST_PATH}/
     install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
 }
 
 # nooelint: oelint.vars.insaneskip:INSANE_SKIP
-INSANE_SKIP:${PN}-ptest += "expanded-d"
+INSANE_SKIP:${PN}-ptest += "buildpaths"
+
+# nooelint: oelint.vars.insaneskip:INSANE_SKIP
+INSANE_SKIP:${PN} += "buildpaths"
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export LD_PRELOAD=$(find /usr/lib /lib -type f -name "libasan.so*")
+
 ./webrtc_client_test --gtest_filter=DataChannelApiTest* --gtest_output=json:result.json
 
 python3 ptest_result.py result.json