From a5220272cf08374ea78ed2ba2f0689d8dcdaed30 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 12 Jul 2022 19:46:38 -0700 Subject: [PATCH 1/2] [WavPack] update to 5.5.0 --- ports/wavpack/OpenSSL.patch | 13 ------------- ports/wavpack/fix-symbol-exports.patch | 22 ---------------------- ports/wavpack/portfile.cmake | 9 +++------ ports/wavpack/vcpkg.json | 3 +-- 4 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 ports/wavpack/OpenSSL.patch delete mode 100644 ports/wavpack/fix-symbol-exports.patch diff --git a/ports/wavpack/OpenSSL.patch b/ports/wavpack/OpenSSL.patch deleted file mode 100644 index 6d8e956ade5a58..00000000000000 --- a/ports/wavpack/OpenSSL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ target_include_directories(wavpack - target_link_libraries(wavpack - PRIVATE - $<$:m> -- $<$:${OPENSSL_CRYPTO_LIBRARY}> -+ $<$:OpenSSL::Crypto> - ) - target_compile_definitions(wavpack - PRIVATE diff --git a/ports/wavpack/fix-symbol-exports.patch b/ports/wavpack/fix-symbol-exports.patch deleted file mode 100644 index 999a05417cfeb7..00000000000000 --- a/ports/wavpack/fix-symbol-exports.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -328,7 +328,7 @@ foreach(EXPORT_SYMBOL ${WAVPACK_EXPORT_SYMBOLS}) - list(APPEND FILE_CONTENTS "_${EXPORT_SYMBOL}\n") - endforeach() - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") - else() - set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym\;\n\n};\n\nVERS_2 {\n global: sym;\n} VERS_1\;") - file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") -@@ -340,7 +340,7 @@ list(APPEND FILE_CONTENTS "${EXPORT_SYMBOL}\;\n") - endforeach() - list(APPEND FILE_CONTENTS "local: *\; }\;") - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") - endif() - endif() - diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 6b3d4a5c47a7c9..0b0f85a40c7fe6 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack - REF 5.4.0 - SHA512 4DD6C484032FDFB1BC0E9A95881677FADE39A5E07CB98713A6B29DF0E9A570D6D27856FCAF412A714A5D7708C9CC2ADACE03A06970B06C4C5B2987E7EB2E643D + REF 89ef99e84333534d9d43093a5264a398b5f1e14a #5.5.0 + SHA512 6d8a46461ea1a9fab129d705dda6167332e98da27b24323cbfba1827339222956e288ca3947b9a1f513d7eb6f957548cfcef717aa5ba5c3d3e43d29f98de3879 HEAD_REF master - PATCHES - OpenSSL.patch - fix-symbol-exports.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWAVPACK_INSTALL_DOCS=OFF -DWAVPACK_BUILD_PROGRAMS=OFF diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index dff83543e0e642..ad40d851e78a1e 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wavpack", - "version": "5.4.0", - "port-version": 2, + "version": "5.5.0", "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "license": "BSD-3-Clause", From 5c467c1ae178c4da92fe60a01eb398a696a53761 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 12 Jul 2022 19:47:07 -0700 Subject: [PATCH 2/2] update version --- versions/baseline.json | 4 ++-- versions/w-/wavpack.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 90019a7b2b832e..ae7973314c5a06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7541,8 +7541,8 @@ "port-version": 0 }, "wavpack": { - "baseline": "5.4.0", - "port-version": 2 + "baseline": "5.5.0", + "port-version": 0 }, "websocketpp": { "baseline": "0.8.2", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 9a826a33033f6c..c61aee9d82d147 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36c8b50ac4693a68a3ecceea8e96bb1abe852089", + "version": "5.5.0", + "port-version": 0 + }, { "git-tree": "39c514f313b4bc2fc7af0f3a889425bb78aca9e3", "version": "5.4.0",