[baresip-libre] baresip-libre version 3.12.0 (#38732)

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [ ] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
This commit is contained in:
Alfred E. Heggestad 2024-05-15 23:56:58 +02:00 коммит произвёл GitHub
Родитель bd2b54836b
Коммит ae7862896b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
5 изменённых файлов: 8 добавлений и 90 удалений

Просмотреть файл

@ -1,86 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84a507f..d400e3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
endif()
set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
-find_package(re CONFIG REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake")
list(APPEND RE_DEFINITIONS
-DRE_VERSION="${PROJECT_VERSION_FULL}"
@@ -648,7 +648,7 @@ endif()
if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
- target_link_libraries(re PUBLIC ${RE_LIBS})
+ target_link_libraries(re PRIVATE ${RE_LIBS})
target_include_directories(re PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
@@ -704,6 +704,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY)
install(TARGETS ${RE_INSTALL_TARGETS}
EXPORT libre
+ RUNTIME
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT Libraries
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Libraries
@@ -722,7 +725,9 @@ install(FILES ${HEADERS}
install(EXPORT libre
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
+ FILE libre-targets.cmake
NAMESPACE libre::
+ COMPONENT Development
)
if(LIBRE_BUILD_SHARED)
@@ -734,12 +739,8 @@ if(LIBRE_BUILD_SHARED)
)
endif()
-install(FILES cmake/re-config.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re
- COMPONENT Development
-)
-
-install(FILES cmake/libre-config.cmake
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/libre-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
COMPONENT Development
)
diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake
index 0965b84..e8548a0 100644
--- a/cmake/libre-config.cmake
+++ b/cmake/libre-config.cmake
@@ -1 +1,23 @@
-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake")
+if("@LIBRE_BUILD_STATIC@")
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+ if("@USE_OPENSSL@")
+ find_dependency(OpenSSL)
+ endif()
+ if("@ZLIB_FOUND@")
+ find_dependency(ZLIB)
+ endif()
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/libre-targets.cmake")
+
+# convenience target libre::libre for uniform usage
+if(NOT TARGET libre::libre)
+ if(TARGET libre::re_shared AND (BUILD_SHARED_LIBS OR NOT TARGET libre::re))
+ add_library(libre::libre INTERFACE IMPORTED)
+ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re_shared)
+ elseif(TARGET libre::re AND (NOT BUILD_SHARED_LIBS OR NOT TARGET libre::re_shared))
+ add_library(libre::libre INTERFACE IMPORTED)
+ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re)
+ endif()
+endif()

Просмотреть файл

@ -6,10 +6,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO baresip/re
REF "v${VERSION}"
SHA512 2050773f1c0d3ae36845601b25fdc6733f5945b0930fd39cb43cb2b11be59dd979027e1a03b2ba188348291fbaec78daab640c28d0c9d842be8ef300b2571fa0
SHA512 e911da81cca288d0e9f92273c4a8bbd89ceac7e46777483d143cc93f4d58e604976946d944a173ae823edb38f344b2c6cc6949611dacfeb7a97ede31e2089328
HEAD_REF main
PATCHES
fix-static-library-build.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED)

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "baresip-libre",
"version": "3.11.0",
"version": "3.12.0",
"description": "Generic library for real-time communications with async IO support",
"homepage": "https://github.com/baresip/re",
"license": "BSD-3-Clause",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c2a2994ce70f17e325c61f73c602191630ee7425",
"version": "3.12.0",
"port-version": 0
},
{
"git-tree": "c28c9b9b416b816320a2576f4537554a6a4e3a9a",
"version": "3.11.0",

Просмотреть файл

@ -541,7 +541,7 @@
"port-version": 1
},
"baresip-libre": {
"baseline": "3.11.0",
"baseline": "3.12.0",
"port-version": 0
},
"basisu": {