diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index 1b59d4d8a8..e352acb34b 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 c1cab53794..4cb7f7f6c9 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 ac34c872d6..bb9e7eda59 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 7e9810d14f..488d8b81fe 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0abf18908332cd2ccfe8e298f8fd90c0db42dcd9", + "version-semver": "0.4.9", + "port-version": 6 + }, { "git-tree": "229c53eddabe48fa718f95c3dd3094a694770a19", "version-semver": "0.4.9", diff --git a/versions/baseline.json b/versions/baseline.json index 982e4650d2..16e22897d7 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",