From 4912fbd4c12a48fd1693cadb48e1fff07c459f01 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 19 Apr 2024 19:55:28 +0800 Subject: [PATCH] [opus] update to v1.5.1 (#38124) Fixes https://github.com/microsoft/vcpkg/issues/38111 Modified the feature name and corresponding option as `avx2` because the upstream change: https://github.com/xiph/opus/commit/84484a679009fc703d80cedfafebb50d42b97cd4. Tested all feature and usage on the following triplets: ``` x64-windows x64-windows-static x86-windows ``` - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --- ports/opus/portfile.cmake | 8 ++++---- ports/opus/vcpkg.json | 6 +++--- versions/baseline.json | 2 +- versions/o-/opus.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index 9638e34d5882f6..747daa355e9825 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -2,14 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus REF "v${VERSION}" - SHA512 86df35cd62ebf3551b2739effb8f818d635656d91d386d7d600a424a92c4c0d6bfbc3986f1ec6cf4950910ac87b28dc9640b9df3b9a6a5a75eb37ae71782b72e - HEAD_REF master + SHA512 ba79ad035993e7bc4c09b7d77964ba913eb0b2be33305e8a04a8c49aaab21c4d96ac828e31ae45484896105851fdfc8c305c63c8400e4481dd76c62a1c12286b + HEAD_REF main PATCHES fix-pkgconfig-version.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - avx AVX_SUPPORTED + avx2 AVX2_SUPPORTED ) set(ADDITIONAL_OPUS_OPTIONS "") @@ -52,4 +52,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json index 33c35ee47dbb77..4edeaa1e042c42 100644 --- a/ports/opus/vcpkg.json +++ b/ports/opus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opus", - "version": "1.4", + "version": "1.5.1", "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", "license": "BSD-3-Clause", @@ -15,8 +15,8 @@ } ], "features": { - "avx": { - "description": "Builds the library with avx instruction set" + "avx2": { + "description": "Builds the library with avx2 instruction set" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 7ab18b5113c0af..37e07707f7230f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6573,7 +6573,7 @@ "port-version": 0 }, "opus": { - "baseline": "1.4", + "baseline": "1.5.1", "port-version": 0 }, "opusfile": { diff --git a/versions/o-/opus.json b/versions/o-/opus.json index dd59293b65860e..b1f1de980f402a 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f51fa10fe5bff98d91195334aa9b6456bb43422", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "b1bf537b6144eb7899c56f1a9bda5de3fd4e2025", "version": "1.4",