mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 16:39:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[baresip-libre] update to 3.4.0 (#34225)

Browse Source 
* [baresip-libre] update to 3.4.0

* bump version

* rename patch

* bump version

* rename patch

* bump version

* rename patch

* bump version
This commit is contained in:
Alfred E. Heggestad 2023-10-23 20:18:23 +02:00 committed by GitHub
parent 22453caae7
commit a0b6a284ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ports/baresip-libre/wip.patch → ports/baresip-libre/fix-static-library-build.patch
View File

@ -1,6 +1,6 @@
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
diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.txt
--- re-3.4.0-orig/CMakeLists.txt 2023-08-09 09:53:10.000000000 +0200
+++ re-3.4.0/CMakeLists.txt 2023-10-04 08:48:23.000000000 +0200
@@ -93,7 +93,7 @@
endif()
@ -9,14 +9,17 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake")
list(APPEND RE_DEFINITIONS
-DVERSION="${PROJECT_VERSION_FULL}"
@@ -696,11 +696,14 @@
-DRE_VERSION="${PROJECT_VERSION_FULL}"
@@ -694,7 +694,7 @@
if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
- target_link_libraries(re PUBLIC ${LINKLIBS})
+ target_link_libraries(re PRIVATE ${LINKLIBS})
add_library(libre::re ALIAS re)
target_include_directories(re PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
@@ -702,6 +702,9 @@
if(MSVC)
set_target_properties(re PROPERTIES OUTPUT_NAME "re-static")
@ -26,7 +29,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
endif()
endif()
@@ -713,6 +716,28 @@
@@ -714,6 +717,28 @@
add_subdirectory(packaging)
endif()
@ -55,7 +58,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
configure_file(packaging/libre.pc.in libre.pc @ONLY)
@@ -724,6 +749,9 @@
@@ -725,6 +750,9 @@
install(TARGETS ${RE_INSTALL_TARGETS}
EXPORT libre
@ -65,7 +68,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Libraries
@@ -742,7 +770,9 @@
@@ -743,7 +771,9 @@
install(EXPORT libre
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
@ -75,7 +78,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
)
if(LIBRE_BUILD_SHARED)
@@ -754,12 +784,8 @@
@@ -755,12 +785,8 @@
)
endif()
@ -90,9 +93,9 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
COMPONENT Development
)
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
diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cmake/libre-config.cmake
--- re-3.4.0-orig/cmake/libre-config.cmake 2023-08-09 09:53:10.000000000 +0200
+++ re-3.4.0/cmake/libre-config.cmake 2023-10-03 10:01:11.000000000 +0200
@@ -1 +1,23 @@
-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake")
+if("@LIBRE_BUILD_STATIC@")
@ -118,9 +121,9 @@ diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cm
+ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re)
+ endif()
+endif()
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
diff -Naur --exclude='*.rej' re-3.4.0-orig/packaging/libre.pc.in re-3.4.0/packaging/libre.pc.in
--- re-3.4.0-orig/packaging/libre.pc.in 2023-08-09 09:53:10.000000000 +0200
+++ re-3.4.0/packaging/libre.pc.in 2023-10-03 10:01:11.000000000 +0200
@@ -7,6 +7,7 @@
Description: @CMAKE_PROJECT_DESCRIPTION@
Version: @PROJECT_VERSION@

4
ports/baresip-libre/portfile.cmake
View File

@ -6,10 +6,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO baresip/re
REF "v${VERSION}"
SHA512 9813f66e73df80e00f1947c8c2af0f9dc6afe8d197a453b622458f80d522edd5b420bfc783161d311b36936947764a7a1733038c121210ab65f8621a3502d372
SHA512 97ea35e4d4f36a9b3e47bb942497d495247e01106bcceef98fba4ab8e36061acaca88d12568990f9c8014b1061941ea5e2c6e8c0287e6dcd83a60a70400b083d
HEAD_REF main
PATCHES
wip.patch
fix-static-library-build.patch
use-c11.patch
)

2
ports/baresip-libre/vcpkg.json
View File

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

5
versions/b-/baresip-libre.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "db0ceb9ad55c2c774fac30663522efc247a1ce04",
"version": "3.4.0",
"port-version": 0
},
{
"git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a",
"version": "3.3.0",

2
versions/baseline.json
View File

@ -517,7 +517,7 @@
"port-version": 1
},
"baresip-libre": {
"baseline": "3.3.0",
"baseline": "3.4.0",
"port-version": 0
},
"basisu": {