[baresip-libre] update to 3.8.0 (#35927)

This commit is contained in:
Alfred E. Heggestad 2024-01-04 02:39:45 +01:00 коммит произвёл GitHub
Родитель fb9cd249f4
Коммит d8d41e0403
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 30 добавлений и 22 удалений

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

@ -1,7 +1,8 @@
diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
--- re-3.4.0-orig/CMakeLists.txt 2023-08-09 09:53:10.000000000 +0200 index 03c82fb..cce8694 100644
+++ re-3.4.0/CMakeLists.txt 2023-10-04 08:48:23.000000000 +0200 --- a/CMakeLists.txt
@@ -93,7 +93,7 @@ +++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
endif() endif()
set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake) set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
@ -10,16 +11,16 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
list(APPEND RE_DEFINITIONS list(APPEND RE_DEFINITIONS
-DRE_VERSION="${PROJECT_VERSION_FULL}" -DRE_VERSION="${PROJECT_VERSION_FULL}"
@@ -694,7 +694,7 @@ @@ -648,7 +648,7 @@ endif()
if(LIBRE_BUILD_STATIC) if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re) list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>) add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
- target_link_libraries(re PUBLIC ${LINKLIBS}) - target_link_libraries(re PUBLIC ${RE_LIBS})
+ target_link_libraries(re PRIVATE ${LINKLIBS}) + target_link_libraries(re PRIVATE ${RE_LIBS})
target_include_directories(re PUBLIC target_include_directories(re PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
) )
@@ -702,6 +702,9 @@ @@ -656,6 +656,9 @@ if(LIBRE_BUILD_STATIC)
if(MSVC) if(MSVC)
set_target_properties(re PROPERTIES OUTPUT_NAME "re-static") set_target_properties(re PROPERTIES OUTPUT_NAME "re-static")
@ -29,7 +30,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
endif() endif()
endif() endif()
@@ -714,6 +717,28 @@ @@ -668,6 +671,28 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
add_subdirectory(packaging) add_subdirectory(packaging)
endif() endif()
@ -58,7 +59,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
configure_file(packaging/libre.pc.in libre.pc @ONLY) configure_file(packaging/libre.pc.in libre.pc @ONLY)
@@ -725,6 +750,9 @@ @@ -679,6 +704,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY)
install(TARGETS ${RE_INSTALL_TARGETS} install(TARGETS ${RE_INSTALL_TARGETS}
EXPORT libre EXPORT libre
@ -68,7 +69,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
LIBRARY LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Libraries COMPONENT Libraries
@@ -743,7 +771,9 @@ @@ -697,7 +725,9 @@ install(FILES ${HEADERS}
install(EXPORT libre install(EXPORT libre
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
@ -78,7 +79,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
) )
if(LIBRE_BUILD_SHARED) if(LIBRE_BUILD_SHARED)
@@ -755,12 +785,8 @@ @@ -709,12 +739,8 @@ if(LIBRE_BUILD_SHARED)
) )
endif() endif()
@ -93,9 +94,10 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
COMPONENT Development COMPONENT Development
) )
diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cmake/libre-config.cmake diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake
--- re-3.4.0-orig/cmake/libre-config.cmake 2023-08-09 09:53:10.000000000 +0200 index 0965b84..e8548a0 100644
+++ re-3.4.0/cmake/libre-config.cmake 2023-10-03 10:01:11.000000000 +0200 --- a/cmake/libre-config.cmake
+++ b/cmake/libre-config.cmake
@@ -1 +1,23 @@ @@ -1 +1,23 @@
-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake")
+if("@LIBRE_BUILD_STATIC@") +if("@LIBRE_BUILD_STATIC@")
@ -121,10 +123,11 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cma
+ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) + set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re)
+ endif() + endif()
+endif() +endif()
diff -Naur --exclude='*.rej' re-3.4.0-orig/packaging/libre.pc.in re-3.4.0/packaging/libre.pc.in diff --git a/packaging/libre.pc.in b/packaging/libre.pc.in
--- re-3.4.0-orig/packaging/libre.pc.in 2023-08-09 09:53:10.000000000 +0200 index 5817066..2df8f6c 100644
+++ re-3.4.0/packaging/libre.pc.in 2023-10-03 10:01:11.000000000 +0200 --- a/packaging/libre.pc.in
@@ -7,6 +7,7 @@ +++ b/packaging/libre.pc.in
@@ -7,6 +7,7 @@ Name: libre
Description: @CMAKE_PROJECT_DESCRIPTION@ Description: @CMAKE_PROJECT_DESCRIPTION@
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@

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

@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO baresip/re REPO baresip/re
REF "v${VERSION}" REF "v${VERSION}"
SHA512 95bfc11d73e8eda76ece51b0e91550e3cb45fc91927d01d024318e74bb0c3893b5bb0716582672490e0131be0314abd1bf2dfd815960b00741e78a55b2a0bbd4 SHA512 7c03502aae0424bb05e03320c2497de0ec534d872334fe16ec0a688efbc1cc493ad1774e9802e0dc58bb396b4b8a065f3e338deeff4dd1ddd87cb76793e82306
HEAD_REF main HEAD_REF main
PATCHES PATCHES
fix-static-library-build.patch fix-static-library-build.patch

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

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

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

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "eac42649337bc140a827e4ae83eb7ec1ccac3917",
"version": "3.8.0",
"port-version": 0
},
{ {
"git-tree": "e34b5bc2855e62826520ee68fb21d063d42b53d4", "git-tree": "e34b5bc2855e62826520ee68fb21d063d42b53d4",
"version": "3.7.0", "version": "3.7.0",

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

@ -517,7 +517,7 @@
"port-version": 0 "port-version": 0
}, },
"baresip-libre": { "baresip-libre": {
"baseline": "3.7.0", "baseline": "3.8.0",
"port-version": 0 "port-version": 0
}, },
"basisu": { "basisu": {