diff --git a/ports/taglib/CONTROL b/ports/taglib/CONTROL deleted file mode 100644 index 9756e8e8c9dcf3..00000000000000 --- a/ports/taglib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: taglib -Version: 1.11.1-20190531 -Description: TagLib Audio Meta-Data Library -Homepage: https://github.com/taglib/taglib -Build-Depends: zlib diff --git a/ports/taglib/msvc-disable-deprecated-warnings.patch b/ports/taglib/msvc-disable-deprecated-warnings.patch new file mode 100644 index 00000000000000..4d99bb8bc730aa --- /dev/null +++ b/ports/taglib/msvc-disable-deprecated-warnings.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5fc91cc6..6f57e4ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,10 +58,17 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + endif() + +-if(MSVC AND ENABLE_STATIC_RUNTIME) +- foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) +- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") +- endforeach(flag_var) ++if(MSVC) ++ if(ENABLE_STATIC_RUNTIME) ++ foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) ++ string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") ++ endforeach(flag_var) ++ endif() ++ # Disable warnings for internal invocations of API functions ++ # that have been marked with TAGLIB_DEPRECATED ++ # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996 ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") + endif() + + # Read version information from file taglib/toolkit/taglib.h into variables diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index c6e57352646270..259bb665a856e1 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib - REF ba7adc2bc261ed634c2a964185bcffb9365ad2f4 - SHA512 faf516f40f12031a37414ce9246ec409e64e570faebe2d604afdefbb7d665e0a0c9c68bec0e6dcb1c5ceb8fa8e1c3477f5ac75029f17beedd679fa3ea735ce6d + REF v1.12 + SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6 HEAD_REF master + PATCHES msvc-disable-deprecated-warnings.patch ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -18,6 +19,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + # remove the debug/include files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -31,4 +34,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json new file mode 100644 index 00000000000000..94965e3563e203 --- /dev/null +++ b/ports/taglib/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "taglib", + "version-string": "1.12", + "description": "TagLib Audio Meta-Data Library", + "homepage": "https://taglib.org/", + "license": "LGPL-2.1 OR MPL-1.1", + "dependencies": [ + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7aa24c167910ba..2834c3b13c7d12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5685,7 +5685,7 @@ "port-version": 0 }, "taglib": { - "baseline": "1.11.1-20190531", + "baseline": "1.12", "port-version": 0 }, "taocpp-json": { diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index ed661250233474..e7e65014e87fc3 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8855c21b8e75b485552ff17d8d77ee5477143f9", + "version-string": "1.12", + "port-version": 0 + }, { "git-tree": "8aee2b399d4cd5af999057cbbe5e9476272b5a24", "version-string": "1.11.1-20190531",