From 09be456e7eddf109cd82ceb6c7573489e3037ae7 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:24:59 +0100 Subject: [PATCH] [taglib ] Update to version 2.0.2 (#42701) --- .../disable-wchar-t-check-emscripten.patch | 30 ------------------- ports/taglib/portfile.cmake | 4 +-- ports/taglib/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/t-/taglib.json | 5 ++++ 5 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 ports/taglib/disable-wchar-t-check-emscripten.patch diff --git a/ports/taglib/disable-wchar-t-check-emscripten.patch b/ports/taglib/disable-wchar-t-check-emscripten.patch deleted file mode 100644 index a6163e1092..0000000000 --- a/ports/taglib/disable-wchar-t-check-emscripten.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 477e4cee4389b4b692734b7dc1669d9cfae62f61 Mon Sep 17 00:00:00 2001 -Date: Sat, 2 Mar 2024 23:38:50 +0100 -Subject: [PATCH] Disable wchar_t check when targeting Emscripten - ---- - ConfigureChecks.cmake | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index 7d2ff95..2dc1891 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -19,9 +19,11 @@ if(NOT ${SIZEOF_LONGLONG} EQUAL 8) - message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.") - endif() - --check_type_size("wchar_t" SIZEOF_WCHAR_T) --if(${SIZEOF_WCHAR_T} LESS 2) -- message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.") -+if(NOT EMSCRIPTEN) -+ check_type_size("wchar_t" SIZEOF_WCHAR_T) -+ if(${SIZEOF_WCHAR_T} LESS 2) -+ message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.") -+ endif() - endif() - - check_type_size("float" SIZEOF_FLOAT) --- -2.43.0 - diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index 27ce378528..7ce843b991 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib REF "v${VERSION}" - SHA512 099d02b2eab033f5702a8cb03e70752d7523c6f8c2f3eebdd0bcd939eafbdca3f2a6c82452983904b5822cfa45f2707ed866c3419508df9d43bf5c0b3a476f6c + SHA512 79f333dbe8ed44076010e33803e3418410516df4b70203962bbefea81ce0a6989a54a9791022488e64f1876573580cbe93920da4b2a7277d6a3f48c946e518fc HEAD_REF master - PATCHES - disable-wchar-t-check-emscripten.patch ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index 9e673be4e8..61367dfd05 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "taglib", - "version": "2.0", - "port-version": 2, + "version": "2.0.2", "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1-only OR MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index f4f23cba9f..1e750333b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8817,8 +8817,8 @@ "port-version": 6 }, "taglib": { - "baseline": "2.0", - "port-version": 2 + "baseline": "2.0.2", + "port-version": 0 }, "talib": { "baseline": "0.4.0", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 237b8224d2..a78a2f0be3 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e00ac8989e0d8ecc37cc52d00f075a8244eec44e", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "30f4f32ed1370c9c6f8249c1f3d40573c9c20c33", "version": "2.0",