From 03e2cd8913c37102db2ade00fc71465f015b7a8a Mon Sep 17 00:00:00 2001 From: "Antoine C." Date: Fri, 27 Feb 2026 20:01:36 +0000 Subject: [PATCH] Revert "Merge pull request #205 from acolombier/feat/taglib-beta" This reverts commit 900bf7e7fcfc69ba570039cda49dd1e89015aaeb, reversing changes made to 153d7bea58f40832ee834b2efd251209b46ae098. --- overlay/ports/taglib/portfile.cmake | 50 ----------------------------- overlay/ports/taglib/vcpkg.json | 19 ----------- versions/t-/taglib.json | 5 --- 3 files changed, 74 deletions(-) delete mode 100644 overlay/ports/taglib/portfile.cmake delete mode 100644 overlay/ports/taglib/vcpkg.json diff --git a/overlay/ports/taglib/portfile.cmake b/overlay/ports/taglib/portfile.cmake deleted file mode 100644 index 35b5c4129efee6..00000000000000 --- a/overlay/ports/taglib/portfile.cmake +++ /dev/null @@ -1,50 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO taglib/taglib - REF "v${VERSION}" - SHA512 92955d8ae13772dcdf8e3125069c1793a2e20e75f1dbb82ef4e380da501963384f94d11cec49978203668b0915a587cab1c4e3fbea677cb7a006313a3d009062 - HEAD_REF master -) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_EXAMPLES=OFF - ${WINRT_OPTIONS} -) -vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/taglib) - -set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc") -if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib" IGNORE_UNCHANGED) - vcpkg_replace_string("${pcfile}" " -lz" "") -endif() -set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/taglib.pc") -if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib" IGNORE_UNCHANGED) - vcpkg_replace_string("${pcfile}" " -lz" "") -endif() - -# remove the debug/include files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths - -# remove bin directory for static builds (taglib creates a cmake batch file there) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/taglib/taglib_export.h" "defined(TAGLIB_STATIC)" "1") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -vcpkg_copy_pdbs() - -# copyright file -file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") diff --git a/overlay/ports/taglib/vcpkg.json b/overlay/ports/taglib/vcpkg.json deleted file mode 100644 index 025eb2e7e528a6..00000000000000 --- a/overlay/ports/taglib/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "taglib", - "version-string": "2.2beta", - "description": "TagLib Audio Meta-Data Library", - "homepage": "https://taglib.org/", - "license": "LGPL-2.1-only OR MPL-1.1", - "dependencies": [ - "utfcpp", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ] -} diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 49123180c468ad..a78a2f0be38bdb 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "74d93db16634cc647501e5eadfab96792e6a13d1", - "version-string": "2.2beta", - "port-version": 0 - }, { "git-tree": "e00ac8989e0d8ecc37cc52d00f075a8244eec44e", "version": "2.0.2",