-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[taglib] Upgrade from 1.12-beta-2 to 1.12 #16649
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0c3c016
[taglib] Upgrade from 1.12-beta-2 to 1.12
uklotzde a541ca0
[taglib] Disable depcrecated warnings for MSVC
uklotzde 9e421d3
[taglib] Use VCPKG_LIBRARY_LINKAGE instead of VCPKG_CRT_LINKAGE
uklotzde c9aac52
[taglib] vcpkg x-add-version
uklotzde File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
| + 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JonLiu1993 is
port-version: 1needed?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the docs 1.12.0-yyyymmdd precedes 1.12.0. But someone else should confirm this.
https://vcpkg.readthedocs.io/en/latest/specifications/versioning/#2-specifying-package-versions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Be-ing ,If we update the version, we will delete the port-version. If we modify the BUG or other changes, we will add the port-version: 1. If the port-version already exists, we will increment it by 1 each time we modify it.