diff --git a/ports/libmodplug/005-fix-install-paths.patch b/ports/libmodplug/005-fix-install-paths.patch new file mode 100644 index 0000000000..a41acf0b53 --- /dev/null +++ b/ports/libmodplug/005-fix-install-paths.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 468f1a3..b58b11e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,10 @@ add_library(modplug ${LIB_TYPE} + ) + + # install the library: +-install(TARGETS modplug DESTINATION lib) ++install(TARGETS modplug ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # incstall the headers: + install(FILES diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 5df9355794..a7af038161 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github(ARCHIVE 002-detect_sinf.patch 003-use-static-cast-for-ctype.patch 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 + 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) @@ -22,18 +23,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_IS_MINGW) - set(BIN_NAME libmodplug.dll) - else() - set(BIN_NAME modplug.dll) - endif() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/bin/${BIN_NAME}) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/debug/bin/${BIN_NAME}) - vcpkg_copy_pdbs() -endif() +vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index 854e034e18..d5c8419554 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 8, + "port-version": 9, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 671b3e9d4d..84e33d858d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3646,7 +3646,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 8 + "port-version": 9 }, "libmorton": { "baseline": "0.2.8", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index e32694d51a..a342cd4762 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", + "version-string": "0.8.9.0", + "port-version": 9 + }, { "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", "version-string": "0.8.9.0",