diff options
| -rw-r--r-- | ports/taglib/CONTROL | 5 | ||||
| -rw-r--r-- | ports/taglib/msvc-disable-deprecated-warnings.patch | 26 | ||||
| -rw-r--r-- | ports/taglib/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/taglib/vcpkg.json | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/taglib.json | 5 |
6 files changed, 50 insertions, 13 deletions
diff --git a/ports/taglib/CONTROL b/ports/taglib/CONTROL deleted file mode 100644 index 96b68ecfe..000000000 --- a/ports/taglib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: taglib -Version: 1.12.0-20210123 -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 000000000..4d99bb8bc --- /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 88b7c4158..bce8b1f86 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -1,21 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib - REF 4c14571647e3391dd8f59473903abc44707b4f1b - SHA512 2619013e38de4afce58d2c8a8fcb2fc34aeb4006c0657a942cb035a5b79ac1438609f89c31bc631b299eb270ac90f2d222c0ddeeb8151803cf7cda15ab3282b4 + REF v1.12 + SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6 HEAD_REF master + PATCHES msvc-disable-deprecated-warnings.patch ) -if(VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(BUILD_SHARED_LIBS OFF) -else() +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(BUILD_SHARED_LIBS ON) endif() if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /wd4996") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4996") endif() vcpkg_configure_cmake( @@ -26,6 +25,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + # remove the debug/include files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -39,4 +40,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 000000000..f3f7239ce --- /dev/null +++ b/ports/taglib/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "taglib", + "version-semver": "1.12.0", + "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 e4dc0c794..70bddfb25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5713,7 +5713,7 @@ "port-version": 0 }, "taglib": { - "baseline": "1.12.0-20210123", + "baseline": "1.12.0", "port-version": 0 }, "taocpp-json": { diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index cdaf70e74..205aae2a5 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c4559ad74a4b1757cc6f7b11abce3b6c4cab66c7", + "version-semver": "1.12.0", + "port-version": 0 + }, + { "git-tree": "e9d856fb23e6cf5ad4b86f2098549ba88098a0cb", "version-string": "1.12.0-20210123", "port-version": 0 |