diff --git a/ports/opus/fix-arm64-windows-compile.diff b/ports/opus/fix-arm64-windows-compile.diff new file mode 100644 index 0000000000..f9b0956576 --- /dev/null +++ b/ports/opus/fix-arm64-windows-compile.diff @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -563,7 +563,9 @@ + target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD) + add_sources_group(opus celt ${celt_sources_arm_rtcd}) + add_sources_group(opus silk ${silk_sources_arm_rtcd}) +- add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd}) ++ if (OPUS_DNN) ++ add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd}) ++ endif() + else() + message(ERROR "Runtime cpu capability detection needed for MAY_HAVE_NEON") + endif() diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index 166b32569f..3d8f37cd0e 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -2,9 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus REF "v${VERSION}" - SHA512 4ffefd9c035671024f9720c5129bfe395dea04f0d6b730041c2804e89b1db6e4d19633ad1ae58855afc355034233537361e707f26dc53adac916554830038fab + SHA512 b9a504f8576c977df57caee808412ab95e7424e9a64e3dd4045f05616c3ed58706bc3549195b61e25721e299547509d15206d246d96f1a307b82562b703b412c HEAD_REF main - PATCHES fix-pkgconfig-version.patch + PATCHES + fix-pkgconfig-version.patch + fix-arm64-windows-compile.diff # https://github.com/xiph/opus/pull/471 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json index 1afe66a92e..071dda5f80 100644 --- a/ports/opus/vcpkg.json +++ b/ports/opus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opus", - "version": "1.5.2", - "port-version": 1, + "version": "1.6.1", "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index aa7795a462..ffd64eee72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7581,8 +7581,8 @@ "port-version": 0 }, "opus": { - "baseline": "1.5.2", - "port-version": 1 + "baseline": "1.6.1", + "port-version": 0 }, "opusfile": { "baseline": "0.12+20221121", diff --git a/versions/o-/opus.json b/versions/o-/opus.json index 72ff15472f..ba51c6ced3 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d615e768adfa3b03dc58d1f1fe3712b90de5f6", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "2235818841e936376b19642c7a94fc7f17b2c2c2", "version": "1.5.2",