diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-06-16 01:27:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 10:27:52 -0700 |
| commit | 315d0a112994c73cf9248d7005414189a867b7b7 (patch) | |
| tree | 2af3e7f27df85bf6e20b2e69052ca198354c2b4a | |
| parent | 16ecf1ba14c47e7a792946560b4afd68ad83b4b7 (diff) | |
| download | vcpkg-315d0a112994c73cf9248d7005414189a867b7b7.tar.gz vcpkg-315d0a112994c73cf9248d7005414189a867b7b7.zip | |
[aubio] Add ws2_32 to linkage (#18385)
* [aubio] Add ws2_32 to linkage
* Update version files
| -rw-r--r-- | ports/aubio/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/aubio/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/aubio/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/a-/aubio.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index 1b59d4d8a..e352acb34 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -55,6 +55,10 @@ if(WITH_DEPENDENCIES) ) endif() +if(WIN32) + target_link_libraries(aubio PUBLIC ws2_32) +endif() + if(BUILD_TOOLS AND WITH_DEPENDENCIES) set(EXAMPLE_EXECS aubiomfcc aubionotes aubioonset aubiopitch aubioquiet aubiotrack) foreach(EXAMPLE_EXEC ${EXAMPLE_EXECS}) @@ -62,6 +66,7 @@ if(BUILD_TOOLS AND WITH_DEPENDENCIES) target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio) if(WIN32) target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1) + target_link_libraries(${EXAMPLE_EXEC} PUBLIC ws2_32) else() target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_UNISTD_H=1) endif() diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index c1cab5379..4cb7f7f6c 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -12,7 +12,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools WITH_DEPENDENCIES + tools WITH_DEPENDENCIES ) vcpkg_configure_cmake( @@ -35,8 +35,8 @@ file(COPY ${SOURCE_PATH}/ChangeLog ${SOURCE_PATH}/README.md DESTINATION - ${CURRENT_PACKAGES_DIR}/share/aubio) + ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/aubio) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/aubio/COPYING ${CURRENT_PACKAGES_DIR}/share/aubio/copyright) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index ac34c872d..bb9e7eda5 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 5, + "port-version": 6, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "default-features": [ diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 7e9810d14..488d8b81f 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0abf18908332cd2ccfe8e298f8fd90c0db42dcd9", + "version-semver": "0.4.9", + "port-version": 6 + }, + { "git-tree": "229c53eddabe48fa718f95c3dd3094a694770a19", "version-semver": "0.4.9", "port-version": 5 diff --git a/versions/baseline.json b/versions/baseline.json index 982e4650d..16e22897d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 5 + "port-version": 6 }, "audiofile": { "baseline": "1.0.7", |