From 9b03a00ed9e3bd6c0fb997d53007d11091e9ca9a Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Mon, 18 Mar 2024 08:42:19 +0000 Subject: [PATCH] amazon-kvs-webrtc-sdk: upgrade 1.9.1 -> 1.10.0 depending recipes: amazon-kvs-producer-sdk-c: upgrade 1.5.0 -> 1.5.2 amazon-kvs-producer-pic: upgrade git -> 1.1.0 --- ...c_git.bb => amazon-kvs-producer-pic_1.1.0.bb} | 6 +++--- ...5.0.bb => amazon-kvs-producer-sdk-c_1.5.2.bb} | 16 +++++++++------- ..._1.9.1.bb => amazon-kvs-webrtc-sdk_1.10.0.bb} | 10 ++++++++-- 3 files changed, 20 insertions(+), 12 deletions(-) rename recipes-sdk/amazon-kvs-producer-sdk/{amazon-kvs-producer-pic_git.bb => amazon-kvs-producer-pic_1.1.0.bb} (91%) rename recipes-sdk/amazon-kvs-producer-sdk/{amazon-kvs-producer-sdk-c_1.5.0.bb => amazon-kvs-producer-sdk-c_1.5.2.bb} (85%) rename recipes-sdk/amazon-kvs-webrtc-sdk/{amazon-kvs-webrtc-sdk_1.9.1.bb => amazon-kvs-webrtc-sdk_1.10.0.bb} (92%) diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_git.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb similarity index 91% rename from recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_git.bb rename to recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb index 77677ffae1..7211f32c2a 100644 --- a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_git.bb +++ b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb @@ -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" @@ -67,7 +67,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" diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.0.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb similarity index 85% rename from recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.0.bb rename to recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb index 0415f46b89..c3f0590b5b 100644 --- a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.0.bb +++ b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb @@ -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" @@ -55,6 +57,7 @@ CFLAGS:append = " -Wl,-Bsymbolic" EXTRA_OECMAKE += "\ -DBUILD_DEPENDENCIES=OFF \ -DCODE_COVERAGE=OFF \ + -DBUILD_COMMON_LWS=ON \ -DCOMPILER_WARNINGS=OFF \ -DADDRESS_SANITIZER=OFF \ -DMEMORY_SANITIZER=OFF \ @@ -63,7 +66,6 @@ EXTRA_OECMAKE += "\ -DDEBUG_HEAP=OFF \ -DALIGNED_MEMORY_MODEL=OFF \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$D/usr \ " # Notify that libraries are not versioned diff --git a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.9.1.bb b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.0.bb similarity index 92% rename from recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.9.1.bb rename to recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.0.bb index e418fd6ef4..aa200bb2d2 100644 --- a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.9.1.bb +++ b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.0.bb @@ -25,7 +25,7 @@ SRC_URI = "\ file://ptest_result.py \ " -SRCREV = "bfa6667e2f2eeb800a0edd6e6e4745b4faf34536" +SRCREV = "1eaede838bc42e5ecb4ac6e6ea060a2e3e4e0076" S = "${WORKDIR}/git" @@ -44,7 +44,13 @@ PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON," do_configure[network] = "1" -FILES:${PN} += "${libdir}" +do_install:append () { + install ${B}/libkvsWebRtcThreadpool.so ${D}${libdir} +} + +FILES:${PN} += "\ + ${libdir} \ + " CFLAGS:append = " -Wl,-Bsymbolic"