Skip to content

Commit 86df17f

Browse files
thomas-roosthomas-roos
committed
amazon-kvs-* upgrade
amazon-kvs-producer-pic: git -> 1.1.0 amazon-kvs-producer-sdk-c: 1.5.0 -> 1.5.2 amazon-kvs-producer-sdk-cpp: 3.4.1 -> 3.4.2 amazon-kvs-webrtc-sdk: 1.9.1 -> 1.12.1
1 parent 3cb37fe commit 86df17f

File tree

7 files changed

+61
-21
lines changed

7 files changed

+61
-21
lines changed

recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_git.bb renamed to recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ UPSTREAM_VERSION_UNKNOWN = "1"
1717
# set to match only git_invalid_tag_regex because UPSTREAM_VERSION_UNKNOWN seems to be broken for git
1818
UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
1919
# this SRCREV commit id should not different than this:
20-
# https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/80c74ac9200b58427a8fcb7782a03b1774020983/CMake/Dependencies/libkvspic-CMakeLists.txt#L10
21-
SRCREV = "d08be2e16303507d21b4cb376aecda98271687ad"
20+
# https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/master/CMake/Dependencies/libkvspic-CMakeLists.txt
21+
SRCREV = "65e38dac9b30523d43a57bc009d679e627b58d9a"
2222

2323
S = "${WORKDIR}/git"
2424

@@ -66,7 +66,7 @@ RDEPENDS:${PN}-ptest += "\
6666
do_install_ptest () {
6767
install -d ${D}${PTEST_PATH}/tests
6868
install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
69-
cp -r ${B}/kvspic_test ${D}${PTEST_PATH}/tests/
69+
cp -r ${B}/tst/kvspic_test ${D}${PTEST_PATH}/tests/
7070
}
7171

7272
BBCLASSEXTEND = "native nativesdk"

recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.0.bb renamed to recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ SRC_URI = "\
2323
UPSTREAM_VERSION_UNKNOWN = "1"
2424
# set to match only git_invalid_tag_regex because UPSTREAM_VERSION_UNKNOWN seems to be broken for git
2525
UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
26-
# this SRCREV commit id should not different to this specified here:
27-
# https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp/blob/70f74f14cf27b09f71dc1889f36eb6e04cdd90a8/CMake/Dependencies/libkvscproducer-CMakeLists.txt#L10
28-
SRCREV = "7d1b76f53680c1e23afb6f35f0cca97ccdb35e3f"
26+
SRCREV = "3e519b7670e39031375d227f983ad2cde888078e"
2927

3028
S = "${WORKDIR}/git"
3129

32-
inherit cmake pkgconfig
30+
inherit cmake pkgconfig
3331

3432
# ptest are disabled, cause running tests require a certificate
3533

@@ -43,11 +41,15 @@ PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON -DBUILD_
4341
PACKAGECONFIG[with-tests] = "-DBUILD_TEST=ON,-DBUILD_TEST=OFF,gtest"
4442

4543
FILES:${PN} += "\
46-
${libdir}/libcproducer.so \
4744
${libdir}/pkgconfig/*.pc \
4845
"
4946

50-
FILES:${PN}-dev += "${includedir}/com/amazonaws/kinesis/video/*"
47+
FILES:${PN}-dev += "\
48+
${includedir}/com/amazonaws/kinesis/video/* \
49+
${libdir}/libkvsCommonLws.so \
50+
${libdir}/libkvsCommonCurl.so \
51+
${libdir}/libcproducer.so \
52+
"
5153

5254
RDEPENDS:${PN} = ""
5355
CFLAGS:append = " -Wl,-Bsymbolic"

‎recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp/amazon-kvs-producer-sdk-cpp-deps.patch‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
From 29f76d9358e39561e35f12687efd7f96310c48ef Mon Sep 17 00:00:00 2001
1+
From 7b608679a6885820ba29037a60aca19bb685bb05 Mon Sep 17 00:00:00 2001
22
From: rpcme <[email protected]>
33
Date: Sun, 16 Jan 2022 06:00:06 -0500
44
Subject: [PATCH] add support for amazon kvs producer sdk cpp
55

6-
Upstream-Status: Unknown
7-
6+
Upstream-Status: Submitted [author]
87
---
98
CMakeLists.txt | 3 +++
109
1 file changed, 3 insertions(+)
1110

1211
diff --git a/CMakeLists.txt b/CMakeLists.txt
13-
index ec001a7..470e069 100644
12+
index 7f1e1c1..b302086 100644
1413
--- a/CMakeLists.txt
1514
+++ b/CMakeLists.txt
1615
@@ -94,6 +94,7 @@ set(BUILD_COMMON_LWS

‎recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp/global-thread-sleep-linkerror.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 8623532eb98a093785661366b151cf98e472f0d3 Mon Sep 17 00:00:00 2001
2+
From: Thomas Roos <[email protected]>
3+
Date: Fri, 26 Jul 2024 06:19:24 +0000
4+
Subject: [PATCH] amazon-kvs-producer-sdk-cpp: fix globalThreadSleep link error
5+
6+
Upstream-Status: Submitted [https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp/issues/1197]
7+
---
8+
CMakeLists.txt | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/CMakeLists.txt b/CMakeLists.txt
12+
index b302086..9529fed 100644
13+
--- a/CMakeLists.txt
14+
+++ b/CMakeLists.txt
15+
@@ -225,7 +225,7 @@ if(BUILD_GSTREAMER_PLUGIN)
16+
target_link_libraries(gstkvssink PRIVATE ${GST_APP_LIBRARIES} KinesisVideoProducer)
17+
18+
add_executable(kvssink_gstreamer_sample samples/kvssink_gstreamer_sample.cpp)
19+
- target_link_libraries(kvssink_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer)
20+
+ target_link_libraries(kvssink_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)
21+
22+
add_executable(kvs_gstreamer_sample samples/kvs_gstreamer_sample.cpp)
23+
target_link_libraries(kvs_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)

recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp_3.4.1.bb renamed to recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp_3.4.2.bb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ BRANCH ?= "master"
1616
# nooelint: oelint.file.patchsignedoff
1717
SRC_URI = "git://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git;protocol=https;branch=${BRANCH} \
1818
file://amazon-kvs-producer-sdk-cpp-deps.patch \
19+
file://global-thread-sleep-linkerror.patch \
1920
"
2021

21-
SRCREV = "8e59b313950d4dbb1ecfb88e2108df87e3331c4e"
22+
SRCREV = "7acf272672ced72bbbad85fe39d366deca57280e"
2223

2324
S = "${WORKDIR}/git"
2425

2526
inherit cmake pkgconfig
2627

27-
PACKAGECONFIG ??= "\
28-
${@bb.utils.contains('PTEST_ENABLED', '1', 'gstreamer', '', d)} \
29-
"
28+
PACKAGECONFIG ??= "gstreamer"
3029

3130
PACKAGECONFIG[gstreamer] = "-DBUILD_GSTREAMER_PLUGIN=ON,-DBUILD_GSTREAMER_PLUGIN=OFF,curl log4cplus openssl gstreamer1.0 gstreamer1.0-plugins-base"
3231

recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.9.1.bb renamed to recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.12.1.bb

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ DEPENDS += "\
1818

1919
PROVIDES += "aws/amazon-kvs-webrtc-sdk"
2020

21-
BRANCH = "master"
21+
BRANCH = "main"
2222
SRC_URI = "\
2323
git://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c.git;protocol=https;branch=${BRANCH} \
2424
file://run-ptest \
2525
file://ptest_result.py \
2626
"
2727

28-
SRCREV = "bfa6667e2f2eeb800a0edd6e6e4745b4faf34536"
28+
SRCREV = "cf817bc5d18f3e4bd499c6b0f9a68c6f4d7e01de"
2929

3030
S = "${WORKDIR}/git"
3131

@@ -44,7 +44,10 @@ PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON,"
4444

4545
do_configure[network] = "1"
4646

47-
FILES:${PN} += "${libdir}"
47+
FILES:${PN} += "\
48+
${@bb.utils.contains('PACKAGECONFIG', 'with-samples', '/samples/*', '', d)} \
49+
${libdir} \
50+
"
4851

4952
CFLAGS:append = " -Wl,-Bsymbolic"
5053

@@ -76,10 +79,22 @@ LDFLAGS += "-Wl,--copy-dt-needed-entries"
7679
# fix package neo-ai-tvm contains bad RPATH
7780
EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=1"
7881

82+
do_install:append () {
83+
if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'with-samples', '1', '', d)}" ]; then
84+
install -d ${D}/samples/
85+
cp -r ${S}/samples/h264SampleFrames ${D}/samples/
86+
cp -r ${S}/samples/h265SampleFrames ${D}/samples/
87+
cp -r ${S}/samples/opusSampleFrames ${D}/samples/
88+
fi
89+
}
90+
7991
do_install_ptest () {
8092
cp -r ${B}/tst/webrtc_client_test ${D}${PTEST_PATH}/
8193
install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
8294
}
8395

8496
# nooelint: oelint.vars.insaneskip:INSANE_SKIP
85-
INSANE_SKIP:${PN}-ptest += "expanded-d"
97+
INSANE_SKIP:${PN}-ptest += "buildpaths"
98+
99+
# nooelint: oelint.vars.insaneskip:INSANE_SKIP
100+
INSANE_SKIP:${PN} += "buildpaths"

‎recipes-sdk/amazon-kvs-webrtc-sdk/files/run-ptest‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
export LD_PRELOAD=$(find /usr/lib /lib -type f -name "libasan.so*")
4+
35
./webrtc_client_test --gtest_filter=DataChannelApiTest* --gtest_output=json:result.json
46

57
python3 ptest_result.py result.json

0 commit comments

Comments
 (0)