From dca6aca3b9c888cc07820c43d1093dc0871e8817 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 1 Jul 2024 23:04:11 +0200 Subject: [PATCH] bctoolbox: update to 5.3.74. --- srcpkgs/bctoolbox/patches/cmake.patch | 11 +++++++++++ srcpkgs/bctoolbox/patches/map-use-after-free.patch | 4 ++-- srcpkgs/bctoolbox/template | 10 +++++----- 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/bctoolbox/patches/cmake.patch diff --git a/srcpkgs/bctoolbox/patches/cmake.patch b/srcpkgs/bctoolbox/patches/cmake.patch new file mode 100644 index 00000000000..6c0c74a8534 --- /dev/null +++ b/srcpkgs/bctoolbox/patches/cmake.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-06-18 17:42:46.000000000 +0200 ++++ - 2024-07-03 16:54:59.332394665 +0200 +@@ -145,7 +145,7 @@ + endif() + + include(CMakePackageConfigHelpers) +-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake") ++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/") + configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}" + PATH_VARS CMAKE_MODULES_INSTALL_DIR diff --git a/srcpkgs/bctoolbox/patches/map-use-after-free.patch b/srcpkgs/bctoolbox/patches/map-use-after-free.patch index e8a513d71e3..742fdd0f499 100644 --- a/srcpkgs/bctoolbox/patches/map-use-after-free.patch +++ b/srcpkgs/bctoolbox/patches/map-use-after-free.patch @@ -10,14 +10,14 @@ Index: bctoolbox-5.1.17/src/containers/map.cc } extern "C" bctbx_iterator_t *bctbx_iterator_ullong_get_next_and_delete(bctbx_iterator_t *it) { + typedef mmap_ullong_t::iterator iterator; - bctbx_iterator_t * next = bctbx_iterator_ullong_get_next(it); + bctbx_iterator_t *next = bctbx_iterator_ullong_get_next(it); + next = (bctbx_iterator_t *)(new iterator(*((iterator *)(next)))); bctbx_iterator_ullong_delete(it); return next; } extern "C" bctbx_iterator_t *bctbx_iterator_cchar_get_next_and_delete(bctbx_iterator_t *it) { + typedef mmap_cchar_t::iterator iterator; - bctbx_iterator_t * next = bctbx_iterator_cchar_get_next(it); + bctbx_iterator_t *next = bctbx_iterator_cchar_get_next(it); + next = (bctbx_iterator_t *)(new iterator(*((iterator *)(next)))); bctbx_iterator_cchar_delete(it); return next; diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template index 1819e487d08..4c7f1238dde 100644 --- a/srcpkgs/bctoolbox/template +++ b/srcpkgs/bctoolbox/template @@ -1,17 +1,18 @@ # Template file for 'bctoolbox' pkgname=bctoolbox -version=5.2.111 +version=5.3.74 revision=1 build_style=cmake configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE - -DENABLE_STRICT=FALSE -DCMAKE_MODULE_PATH=/usr/lib/cmake" + -DENABLE_STRICT=FALSE -DCMAKE_MODULE_PATH=/usr/lib/cmake + -DBUILD_SHARED_LIBS=ON" makedepends="bcunit-devel mbedtls-devel" short_desc="Library to create and run audio and video streams" maintainer="John " license="GPL-2.0-only" homepage="https://gitlab.linphone.org/BC/public/bctoolbox" distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz" -checksum=cf2cd3e54aad1fe7674ef6ab3aaa339bcbc112127ec77c61b91335ed2fffb1b5 +checksum=1249d795f6013dd69791768dacb5c14620dca1707dc5faf290ed062cffc2027c bctoolbox-devel_package() { depends="bctoolbox-${version}_${revision}" @@ -19,8 +20,7 @@ bctoolbox-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/bctoolbox/cmake + vmove usr/lib/cmake vmove "usr/lib/*.so" - vmove "usr/lib/*.a" } }