Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ports/taglib/CONTROL

This file was deleted.

26 changes: 26 additions & 0 deletions ports/taglib/msvc-disable-deprecated-warnings.patch
Original file line number Diff line number Diff line change
@@ -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)
Comment on lines +14 to +17
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this modify is correct, can you please open a new PR to fix that?
See my comment.

Thanks.

+ 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
9 changes: 6 additions & 3 deletions ports/taglib/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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)

Expand All @@ -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()
vcpkg_copy_pdbs()
10 changes: 10 additions & 0 deletions ports/taglib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5685,7 +5685,7 @@
"port-version": 0
},
"taglib": {
"baseline": "1.11.1-20190531",
"baseline": "1.12",
"port-version": 0
},
"taocpp-json": {
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/taglib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a8855c21b8e75b485552ff17d8d77ee5477143f9",
"version-string": "1.12",
"port-version": 0
},
{
"git-tree": "8aee2b399d4cd5af999057cbbe5e9476272b5a24",
"version-string": "1.11.1-20190531",
Expand Down