Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[baresip-libre] update to 3.3.0 #34207

Merged
merged 2 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/baresip-libre/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO baresip/re
REF "v${VERSION}"
SHA512 fce61b96fd4a330c82045c470486e90e1128e242b7c311e9c6002d9752b775bbc430bf256de85f63841172c60630be3aa91e11bfa1501c71599d213701c6b459
SHA512 9813f66e73df80e00f1947c8c2af0f9dc6afe8d197a453b622458f80d522edd5b420bfc783161d311b36936947764a7a1733038c121210ab65f8621a3502d372
HEAD_REF main
PATCHES
wip.patch
Expand Down
3 changes: 1 addition & 2 deletions ports/baresip-libre/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "baresip-libre",
"version": "3.2.0",
"port-version": 2,
"version": "3.3.0",
"description": "Generic library for real-time communications with async IO support",
"homepage": "https://github.com/baresip/re",
"license": "BSD-3-Clause",
Expand Down
53 changes: 16 additions & 37 deletions ports/baresip-libre/wip.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f85cb1e..b364219 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
--- re-3.3.0-orig/CMakeLists.txt 2023-07-05 08:55:20.000000000 +0200
+++ re-3.3.0/CMakeLists.txt 2023-10-02 13:08:47.000000000 +0200
@@ -93,7 +93,7 @@
endif()

set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
Expand All @@ -11,25 +10,7 @@ index f85cb1e..b364219 100644

list(APPEND RE_DEFINITIONS
-DVERSION="${PROJECT_VERSION_FULL}"
@@ -642,7 +642,7 @@ if(WIN32)
dbghelp
)
else()
- list(APPEND LINKLIBS -lm)
+ list(APPEND LINKLIBS m)
endif()

if(UNIX)
@@ -668,7 +668,7 @@ target_include_directories(re-objs PRIVATE
${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
target_include_directories(re-objs PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>
+ $<INSTALL_INTERFACE:include> # pointless, object libs don't get installed.
)


@@ -697,11 +697,14 @@ endif()
@@ -696,11 +696,14 @@
if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
Expand All @@ -45,7 +26,7 @@ index f85cb1e..b364219 100644
endif()
endif()

@@ -714,6 +717,28 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -713,6 +716,28 @@
add_subdirectory(packaging)
endif()

Expand Down Expand Up @@ -74,7 +55,7 @@ index f85cb1e..b364219 100644
configure_file(packaging/libre.pc.in libre.pc @ONLY)


@@ -725,6 +750,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY)
@@ -724,6 +749,9 @@

install(TARGETS ${RE_INSTALL_TARGETS}
EXPORT libre
Expand All @@ -84,7 +65,7 @@ index f85cb1e..b364219 100644
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Libraries
@@ -743,7 +771,9 @@ install(FILES ${HEADERS}
@@ -742,7 +770,9 @@

install(EXPORT libre
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
Expand All @@ -94,7 +75,7 @@ index f85cb1e..b364219 100644
)

if(LIBRE_BUILD_SHARED)
@@ -755,12 +785,8 @@ if(LIBRE_BUILD_SHARED)
@@ -754,12 +784,8 @@
)
endif()

Expand All @@ -109,10 +90,9 @@ index f85cb1e..b364219 100644
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
COMPONENT Development
)
diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake
index 0965b84..af7f2de 100644
--- a/cmake/libre-config.cmake
+++ b/cmake/libre-config.cmake
diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cmake
--- re-3.3.0-orig/cmake/libre-config.cmake 2023-07-05 08:55:20.000000000 +0200
+++ re-3.3.0/cmake/libre-config.cmake 2023-10-02 13:08:47.000000000 +0200
@@ -1 +1,23 @@
-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake")
+if("@LIBRE_BUILD_STATIC@")
Expand All @@ -138,11 +118,10 @@ index 0965b84..af7f2de 100644
+ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re)
+ endif()
+endif()
diff --git a/packaging/libre.pc.in b/packaging/libre.pc.in
index 5817066..2df8f6c 100644
--- a/packaging/libre.pc.in
+++ b/packaging/libre.pc.in
@@ -7,6 +7,7 @@ Name: libre
diff -Naur re-3.3.0-orig/packaging/libre.pc.in re-3.3.0/packaging/libre.pc.in
--- re-3.3.0-orig/packaging/libre.pc.in 2023-07-05 08:55:20.000000000 +0200
+++ re-3.3.0/packaging/libre.pc.in 2023-10-02 13:08:47.000000000 +0200
@@ -7,6 +7,7 @@
Description: @CMAKE_PROJECT_DESCRIPTION@
Version: @PROJECT_VERSION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/baresip-libre.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a",
"version": "3.3.0",
"port-version": 0
},
{
"git-tree": "8eba692c2b454a491269fec62a993c0b08b24d34",
"version": "3.2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,8 @@
"port-version": 1
},
"baresip-libre": {
"baseline": "3.2.0",
"port-version": 2
"baseline": "3.3.0",
"port-version": 0
},
"basisu": {
"baseline": "1.11",
Expand Down