From eb63780b6d1351a6eeca9b871e1223d8f59990a9 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 02:57:53 +1100 Subject: [PATCH 01/33] [ffmpeg] Update to 7.0. --- ports/ffmpeg/0007-fix-lib-naming.patch | 2 +- ports/ffmpeg/0009-Fix-fdk-detection.patch | 6 +++--- ports/ffmpeg/0011-Fix-x265-detection.patch | 4 ++-- ports/ffmpeg/portfile.cmake | 8 ++++---- ports/ffmpeg/vcpkg.json | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ports/ffmpeg/0007-fix-lib-naming.patch b/ports/ffmpeg/0007-fix-lib-naming.patch index ef9d74614e1ec1..f660f96be7c0fc 100644 --- a/ports/ffmpeg/0007-fix-lib-naming.patch +++ b/ports/ffmpeg/0007-fix-lib-naming.patch @@ -3,7 +3,7 @@ index d6c4388..75b96c3 100644 --- a/configure +++ b/configure @@ -4378,6 +4378,11 @@ msvc_common_flags(){ - -march=*) ;; + -mfp16-format=*) ;; -lz) echo zlib.lib ;; -lx264) echo libx264.lib ;; + -lx265) echo libx265.lib ;; diff --git a/ports/ffmpeg/0009-Fix-fdk-detection.patch b/ports/ffmpeg/0009-Fix-fdk-detection.patch index 3d280fd2b33aa5..771adeea535953 100644 --- a/ports/ffmpeg/0009-Fix-fdk-detection.patch +++ b/ports/ffmpeg/0009-Fix-fdk-detection.patch @@ -2,9 +2,9 @@ diff --git a/configure b/configure index b137669dd3..34c92230f4 100755 --- a/configure +++ b/configure -@@ -6331,7 +6331,7 @@ enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2. - enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new - enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion +@@ -6331,7 +6331,7 @@ enabled libdrm && check_pkg_config libdrm libdrm xf86drm.h drmGetVersion + enabled libdvdnav && require_pkg_config libdvdnav "dvdnav >= 6.1.1" dvdnav/dvdnav.h dvdnav_open2 + enabled libdvdread && require_pkg_config libdvdread "dvdread >= 6.1.2" dvdread/dvd_reader.h DVDOpen2 enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || - { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && + { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac -lm -lstdc++ && diff --git a/ports/ffmpeg/0011-Fix-x265-detection.patch b/ports/ffmpeg/0011-Fix-x265-detection.patch index 8c3e10d951ed2a..e61ff3b5fdd1c7 100644 --- a/ports/ffmpeg/0011-Fix-x265-detection.patch +++ b/ports/ffmpeg/0011-Fix-x265-detection.patch @@ -1,9 +1,9 @@ diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -6730,7 +6730,10 @@ - [ "$toolchain" != "msvc" ] || +@@ -6730,7 +6730,10 @@ [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && + check_cpp_condition libx264_hdr10 x264.h "X264_BUILD >= 163" && check_cpp_condition libx262 x264.h "X264_MPEG2" -enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && +enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 3d64bf64a80c97..ac8abc075c0b3e 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -2,14 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg REF "n${VERSION}" - SHA512 a84209fe36a2a0262ebc34b727e7600b12d4739991a95599d7b4df533791b12e2e43586ccc6ff26aab2f935a3049866204e322ec0c5e49e378fc175ded34e183 + SHA512 ac147e52557b71cab0a38c0fee5f710a70d7e99107d1cb881e733c489a6b16f99d2c15e00e359ab48353bd710ead13399ee31840e6c5844a11d042eda71a0aa0 HEAD_REF master PATCHES 0001-create-lib-libraries.patch - 0002-fix-msvc-link.patch #upstreamed in future version + 0002-fix-msvc-link.patch 0003-fix-windowsinclude.patch 0004-fix-debug-build.patch - 0005-fix-nasm.patch #upstreamed in future version + 0005-fix-nasm.patch 0006-fix-StaticFeatures.patch 0007-fix-lib-naming.patch 0009-Fix-fdk-detection.patch @@ -93,7 +93,7 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER) get_filename_component(CC_filename "${VCPKG_DETECTED_CMAKE_C_COMPILER}" NAME) set(ENV{CC} "${CC_filename}") string(APPEND OPTIONS " --cc=${CC_filename}") - #string(APPEND OPTIONS " --host_cc=${CC_filename}") ffmpeg not yet setup for cross builds? + string(APPEND OPTIONS " --host_cc=${CC_filename}") list(APPEND prog_env "${CC_path}") endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 2d1525dacd82cf..105ce03a23ce2c 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "6.1.1", - "port-version": 2, + "version": "7.0", "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." From 2f09d0543962dbf454a18a9bb13e036e3b724280 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 02:00:46 +1000 Subject: [PATCH 02/33] Update versions. --- versions/baseline.json | 4 ++-- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5db40a273ec268..f2a876d0b4e04d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2661,8 +2661,8 @@ "port-version": 7 }, "ffmpeg": { - "baseline": "6.1.1", - "port-version": 2 + "baseline": "7.0", + "port-version": 0 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 2a87d2bf1746ae..06b5445ce1c120 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfba9a4256fa8f3d2a2faefdfe057f4aa3ee90f4", + "version": "7.0", + "port-version": 0 + }, { "git-tree": "2b85222da88d04c67c9b83d24a278c5821f5f0b0", "version": "6.1.1", From 994ee1e3291eb73be2af519767911673ade14399 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 15:44:00 +1000 Subject: [PATCH 03/33] [ffmpeg] Fix x86 nasm compile. --- ports/ffmpeg/0005-fix-nasm.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ports/ffmpeg/0005-fix-nasm.patch b/ports/ffmpeg/0005-fix-nasm.patch index 9308e714a6bbaa..ea551ec9a83f2a 100644 --- a/ports/ffmpeg/0005-fix-nasm.patch +++ b/ports/ffmpeg/0005-fix-nasm.patch @@ -53,3 +53,16 @@ diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile X86ASM-OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay.o X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o +diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile +--- a/libavcodec/x86/vvc/Makefile ++++ b/libavcodec/x86/vvc/Makefile +@@ -3,5 +3,7 @@ clean:: + + OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvcdsp_init.o \ + x86/h26x/h2656dsp.o +-X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvc_mc.o \ +- x86/h26x/h2656_inter.o ++ifdef ARCH_X86_64 ++X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvc_mc.o ++endif ++X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/h26x/h2656_inter.o From b806e243612a401b53a2b2682acceb25a71aab3f Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 16:07:04 +1000 Subject: [PATCH 04/33] [ffmpeg] Fix OSX cross compilation. --- ports/ffmpeg/0024-fix-osx-host-c11.patch | 16 ++++++++++++++++ ports/ffmpeg/portfile.cmake | 1 + 2 files changed, 17 insertions(+) create mode 100644 ports/ffmpeg/0024-fix-osx-host-c11.patch diff --git a/ports/ffmpeg/0024-fix-osx-host-c11.patch b/ports/ffmpeg/0024-fix-osx-host-c11.patch new file mode 100644 index 00000000000000..934fbec6353353 --- /dev/null +++ b/ports/ffmpeg/0024-fix-osx-host-c11.patch @@ -0,0 +1,16 @@ +diff --git a/configure b/configure +index 4f5353f84b..dd9147c677 100755 +--- a/configure ++++ b/configure +@@ -5607,8 +5607,8 @@ check_cppflags -D_FILE_OFFSET_BITS=64 + check_cppflags -D_LARGEFILE_SOURCE + + add_host_cppflags -D_ISOC11_SOURCE +-check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || +- check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support" ++check_host_cflags_cc -std=$stdc stdio.h "__STDC_VERSION__ >= 201112L" || ++ check_host_cflags_cc -std=c11 stdio.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support" + + check_host_cflags -Wall + check_host_cflags $host_cflags_speed + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index ac8abc075c0b3e..629c3131667512 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( 0015-Fix-xml2-detection.patch 0020-fix-aarch64-libswscale.patch 0022-fix-iconv.patch + 0024-fix-osx-host-c11.patch ) if(SOURCE_PATH MATCHES " ") From ecd27c258ee3b8853ea3e1768281b4c354c68a1f Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 16:07:49 +1000 Subject: [PATCH 05/33] [ffmpeg] Bump version. --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 06b5445ce1c120..e4d9e72d95afd5 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dfba9a4256fa8f3d2a2faefdfe057f4aa3ee90f4", + "git-tree": "839d6d27f1cad22558c9ebef25b90abf93773397", "version": "7.0", "port-version": 0 }, From 71dfa2fcd148179deacc693d7dd850e96ff0152b Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 17:10:36 +1000 Subject: [PATCH 06/33] fixup --- ports/ffmpeg/0024-fix-osx-host-c11.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/0024-fix-osx-host-c11.patch b/ports/ffmpeg/0024-fix-osx-host-c11.patch index 934fbec6353353..5cb31517f906a7 100644 --- a/ports/ffmpeg/0024-fix-osx-host-c11.patch +++ b/ports/ffmpeg/0024-fix-osx-host-c11.patch @@ -8,8 +8,8 @@ index 4f5353f84b..dd9147c677 100755 add_host_cppflags -D_ISOC11_SOURCE -check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || - check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support" -+check_host_cflags_cc -std=$stdc stdio.h "__STDC_VERSION__ >= 201112L" || -+ check_host_cflags_cc -std=c11 stdio.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support" ++check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || ++ check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" check_host_cflags -Wall check_host_cflags $host_cflags_speed From f36fda963ee37dd48f3b7aedadb63b293325ed63 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 7 Apr 2024 17:10:55 +1000 Subject: [PATCH 07/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index e4d9e72d95afd5..a305e275e9e9da 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "839d6d27f1cad22558c9ebef25b90abf93773397", + "git-tree": "e9fecce1cfe7838a08e2f7ed6487c8af047082fe", "version": "7.0", "port-version": 0 }, From bbc4155084a548362c3c8051b71e29cfeaad006b Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 1 Jun 2024 17:58:09 +1000 Subject: [PATCH 08/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 6e9c7eae244011..9772f78e78b81c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e9fecce1cfe7838a08e2f7ed6487c8af047082fe", + "git-tree": "3b66a024d3fc322d5b55d9683b80bcc08be708ff", "version": "7.0", "port-version": 0 }, From d5a8237f078cc872428d7452c824f2a3920efd54 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 1 Jun 2024 18:58:51 +1000 Subject: [PATCH 09/33] [ffmpeg] fix chromium patch --- ...dd-av_stream_get_first_dts-for-chromium.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/ffmpeg/0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch b/ports/ffmpeg/0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch index 0ac28ab0b315d1..c2e1d8ff0d7b8a 100644 --- a/ports/ffmpeg/0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch +++ b/ports/ffmpeg/0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch @@ -2,10 +2,10 @@ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index cd7b0d941c..b4a6dce885 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h -@@ -1010,7 +1010,11 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); - attribute_deprecated - int64_t av_stream_get_end_pts(const AVStream *st); - #endif +@@ -1169,7 +1169,11 @@ typedef struct AVStreamGroup { + } AVStreamGroup; + + struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); +// Chromium: We use the internal field first_dts vvv +int64_t av_stream_get_first_dts(const AVStream *st); @@ -18,10 +18,10 @@ diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index de7580c32d..0ef0fe530e 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c -@@ -33,7 +33,14 @@ int64_t av_stream_get_end_pts(const AVStream *st) - return AV_NOPTS_VALUE; - } - #endif +@@ -29,7 +29,14 @@ #include "avformat.h" + #include "avio.h" + #include "internal.h" + #include "mux.h" +// Chromium: We use the internal field first_dts vvv +int64_t av_stream_get_first_dts(const AVStream *st) From 8cde7cb7f49e0f961f2c4bea39e9caa236940c45 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 1 Jun 2024 18:59:15 +1000 Subject: [PATCH 10/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 9772f78e78b81c..8cdd3bcc0aa55d 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3b66a024d3fc322d5b55d9683b80bcc08be708ff", + "git-tree": "b5ed6dcc15dc713aa7311a5851eba57faa159189", "version": "7.0", "port-version": 0 }, From 8a79791b1ed5a25f8f81212b71266017ec0dc288 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 2 Jun 2024 04:39:15 +1000 Subject: [PATCH 11/33] [aubio] Update to latest. --- ports/aubio/ffmpeg7.patch | 15 +++++++++++++++ ports/aubio/portfile.cmake | 6 ++++-- ports/aubio/vcpkg.json | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 ports/aubio/ffmpeg7.patch diff --git a/ports/aubio/ffmpeg7.patch b/ports/aubio/ffmpeg7.patch new file mode 100644 index 00000000000000..cf0fe6ed68c405 --- /dev/null +++ b/ports/aubio/ffmpeg7.patch @@ -0,0 +1,15 @@ +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index 71ea8b5f..ad91f5eb 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -345,8 +345,8 @@ void aubio_source_avcodec_reset_resampler(aubio_source_avcodec_t * s) + av_channel_layout_default(&input_layout, s->input_channels); + av_channel_layout_default(&output_layout, s->input_channels); + +- av_opt_set_chlayout(avr, "in_channel_layout", &input_layout, 0); +- av_opt_set_chlayout(avr, "out_channel_layout", &output_layout, 0); ++ av_opt_set_chlayout(avr, "in_chlayout", &input_layout, 0); ++ av_opt_set_chlayout(avr, "out_chlayout", &output_layout, 0); + #else + int64_t input_layout = av_get_default_channel_layout(s->input_channels); + int64_t output_layout = av_get_default_channel_layout(s->input_channels); diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 26d4fa9bf7b21d..59128ae7909fe6 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aubio/aubio - REF 8a05420e5dd8c7b8b2447f82dc919765876511b3 - SHA512 080775d7b972d31d88671b4a2917e926bc933b7bdc50fc56a4a8e3174b4544fd6fd416c06b064488cea777cbdd4eea63d0b35eca0025f53ab71da0ba8b64824f + REF 152d6819b360c2e7b379ee3f373d444ab3df0895 + SHA512 923529eb27e460293bd2b8b8c53d5eb96553e3e1ece7071904808d8f20f86b7af70bde97d271da9a07ee1898d0840190f265e326e67f48c6f5cadefa034abf0f HEAD_REF master + PATCHES + ffmpeg7.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index b03cc7149d0a8c..010c37beda416d 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aubio", - "version-date": "2022-01-26", + "version-date": "2024-01-03", "port-version": 1, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", From b9da0f3618a4cfb944898010b260f891c55dd7ec Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 2 Jun 2024 04:39:52 +1000 Subject: [PATCH 12/33] [aubio] update version. --- versions/a-/aubio.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index d8521908b2cd5d..eeb15eb6746023 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96c0a533cc0479331f46ced018737f08f356c655", + "version-date": "2024-01-03", + "port-version": 1 + }, { "git-tree": "e51e332257e4b788828390a39d86109000d5b960", "version-date": "2022-01-26", diff --git a/versions/baseline.json b/versions/baseline.json index 7d52d04246cbc2..de4ef9ebf8f904 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -333,7 +333,7 @@ "port-version": 0 }, "aubio": { - "baseline": "2022-01-26", + "baseline": "2024-01-03", "port-version": 1 }, "audiofile": { From 1a7fad72bd8a91e87f0e0c660b763851ff2fe7ed Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 29 Jun 2024 20:51:41 +1000 Subject: [PATCH 13/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 8c33841ac5ca38..8ee795a027705d 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b5ed6dcc15dc713aa7311a5851eba57faa159189", + "git-tree": "7e3246a8b65f9c0eb72adcb5786d2410562dd1c8", "version": "7.0", "port-version": 0 }, From 0febba8562a93972e296231a37fa93f00b73e008 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 29 Jun 2024 20:57:02 +1000 Subject: [PATCH 14/33] [ffmpeg] Add d3d12va support. --- ports/ffmpeg/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 5fb9bdada11ff1..df811e0a79cad2 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -50,9 +50,9 @@ if(VCPKG_TARGET_IS_MINGW) elseif(VCPKG_TARGET_IS_LINUX) string(APPEND OPTIONS " --target-os=linux --enable-pthreads") elseif(VCPKG_TARGET_IS_UWP) - string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-mediafoundation") + string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-d3d12va --enable-mediafoundation") elseif(VCPKG_TARGET_IS_WINDOWS) - string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-dxva2 --enable-mediafoundation") + string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-d3d12va --enable-dxva2 --enable-mediafoundation") elseif(VCPKG_TARGET_IS_OSX) string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox") elseif(VCPKG_TARGET_IS_IOS) From 1574421edacc5e3224a1419cd0594ea815787aa0 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 29 Jun 2024 23:31:09 +1000 Subject: [PATCH 15/33] [ffpmpeg]: Fix patch. --- ports/ffmpeg/0007-fix-lib-naming.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ffmpeg/0007-fix-lib-naming.patch b/ports/ffmpeg/0007-fix-lib-naming.patch index e8f4cc7d654bfa..c22f9c1999d0c8 100644 --- a/ports/ffmpeg/0007-fix-lib-naming.patch +++ b/ports/ffmpeg/0007-fix-lib-naming.patch @@ -2,7 +2,7 @@ diff --git a/configure b/configure index d6c4388..75b96c3 100644 --- a/configure +++ b/configure -@@ -4378,6 +4378,11 @@ msvc_common_flags(){ +@@ -4781,6 +4781,7 @@ msvc_common_flags(){ -mfp16-format=*) ;; -lz) echo zlib.lib ;; -lx264) echo libx264.lib ;; From 593e0c4821551dd148a524806e4142e4323f39c2 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 02:19:09 +1000 Subject: [PATCH 16/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 8ee795a027705d..871b49f4d5dc84 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e3246a8b65f9c0eb72adcb5786d2410562dd1c8", + "git-tree": "4cb6ea015cbff5d5fc84b6c688582d7bfa5f4781", "version": "7.0", "port-version": 0 }, From 672dc039cc3ab596fd20e49abee20a2efcd737ba Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 02:45:09 +1000 Subject: [PATCH 17/33] [ffmpeg] Attempt to fix osx link errors. --- ports/ffmpeg/0004-dependencies.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/0004-dependencies.patch b/ports/ffmpeg/0004-dependencies.patch index e2d929a7a79de3..c1a2fd9107c9da 100644 --- a/ports/ffmpeg/0004-dependencies.patch +++ b/ports/ffmpeg/0004-dependencies.patch @@ -32,7 +32,8 @@ index 3243e23021..6d3f31fc95 100755 enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket @@ -6884,6 +6885,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h" enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || - check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || +- check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || ++ check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel "-Wl,-framework,OpenCL" || check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32|| + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl || From e93240ada2dae01261a9e2f4d763b44bf708a8e8 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 02:45:22 +1000 Subject: [PATCH 18/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 871b49f4d5dc84..a486121987592e 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4cb6ea015cbff5d5fc84b6c688582d7bfa5f4781", + "git-tree": "553365b9128ffcf60a024275c54729268b11c656", "version": "7.0", "port-version": 0 }, From 1b6901546034ea32a6c3e7cf3f226bf7903f0346 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 18:07:15 +1000 Subject: [PATCH 19/33] Revert "[ffmpeg] Attempt to fix osx link errors." This reverts commit 672dc039cc3ab596fd20e49abee20a2efcd737ba. --- ports/ffmpeg/0004-dependencies.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/ffmpeg/0004-dependencies.patch b/ports/ffmpeg/0004-dependencies.patch index c1a2fd9107c9da..e2d929a7a79de3 100644 --- a/ports/ffmpeg/0004-dependencies.patch +++ b/ports/ffmpeg/0004-dependencies.patch @@ -32,8 +32,7 @@ index 3243e23021..6d3f31fc95 100755 enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket @@ -6884,6 +6885,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h" enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || -- check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || -+ check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel "-Wl,-framework,OpenCL" || + check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32|| + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl || From 7a64773344409124b63a61145d09e3f8116df434 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 18:09:43 +1000 Subject: [PATCH 20/33] [ffmpeg] disable opencl on osx. --- ports/ffmpeg/vcpkg.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 105ce03a23ce2c..161d6d5382f5a3 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -107,14 +107,6 @@ ], "platform": "!uwp" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "opencl" - ], - "platform": "!uwp" - }, { "name": "ffmpeg", "default-features": false, @@ -155,6 +147,14 @@ ], "platform": "!osx & !uwp" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opencl" + ], + "platform": "!uwp & !osx" + }, { "name": "ffmpeg", "default-features": false, From 7a37c8dc2e1326c81dcdede27b72bc0c9a07a18a Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Jun 2024 18:09:54 +1000 Subject: [PATCH 21/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a486121987592e..087d810b97ab1e 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "553365b9128ffcf60a024275c54729268b11c656", + "git-tree": "c96523b541f5fa93c485062a99f68769fc3ef2d9", "version": "7.0", "port-version": 0 }, From 6d491545505a74e0b2b3ce20f0f33a88be49c041 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 6 Jul 2024 18:38:25 +1000 Subject: [PATCH 22/33] [aubio] disable on osx. --- ports/aubio/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index 010c37beda416d..0767feb7aba4b2 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -5,7 +5,7 @@ "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "license": "GPL-3.0-or-later", - "supports": "!xbox", + "supports": "!xbox & !osx", "dependencies": [ { "name": "vcpkg-cmake", From d99540652b95c6abebf140418330ee61d065ee18 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sat, 6 Jul 2024 18:38:37 +1000 Subject: [PATCH 23/33] Update aubio.json --- versions/a-/aubio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index eeb15eb6746023..64908b5604657d 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "96c0a533cc0479331f46ced018737f08f356c655", + "git-tree": "1ce82973552d5bb941f6a1348259ed23005cd095", "version-date": "2024-01-03", "port-version": 1 }, From cbc1c8be9d26cf4c62a66873f2665d3ef51289e7 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 16:48:50 +1000 Subject: [PATCH 24/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index e2ab74a3d375a8..8cf9ed7b0518ed 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c96523b541f5fa93c485062a99f68769fc3ef2d9", + "git-tree": "91cfe7b29c2805e3fca17a24b917ef921897f7e7", "version": "7.0", "port-version": 0 }, From 1145360d9865c73304de7ffa50ed30167aa04dd9 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 16:50:38 +1000 Subject: [PATCH 25/33] simplify osx patch. --- ports/ffmpeg/0024-fix-osx-host-c11.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/ffmpeg/0024-fix-osx-host-c11.patch b/ports/ffmpeg/0024-fix-osx-host-c11.patch index 5cb31517f906a7..dbce2f53b8e7df 100644 --- a/ports/ffmpeg/0024-fix-osx-host-c11.patch +++ b/ports/ffmpeg/0024-fix-osx-host-c11.patch @@ -6,9 +6,8 @@ index 4f5353f84b..dd9147c677 100755 check_cppflags -D_LARGEFILE_SOURCE add_host_cppflags -D_ISOC11_SOURCE --check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || + check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || - check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support" -+check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" || + check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" check_host_cflags -Wall From 30d85e4d439e447dad0b050fff51e85814b6d10d Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 16:50:46 +1000 Subject: [PATCH 26/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 8cf9ed7b0518ed..cf7e00598ddaf2 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "91cfe7b29c2805e3fca17a24b917ef921897f7e7", + "git-tree": "a8176227f530798e7382859a82e37b7c32ef168a", "version": "7.0", "port-version": 0 }, From 466fc07258886d6ca8dde9508548ce80c3142b1d Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 16:52:40 +1000 Subject: [PATCH 27/33] Revert "[aubio] disable on osx." This reverts commit 6d491545505a74e0b2b3ce20f0f33a88be49c041. --- ports/aubio/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index 0767feb7aba4b2..010c37beda416d 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -5,7 +5,7 @@ "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "license": "GPL-3.0-or-later", - "supports": "!xbox & !osx", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", From f89edc74f2ff84416733027f52d39838f058ce17 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 16:53:00 +1000 Subject: [PATCH 28/33] Update aubio.json --- versions/a-/aubio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 64908b5604657d..eeb15eb6746023 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ce82973552d5bb941f6a1348259ed23005cd095", + "git-tree": "96c0a533cc0479331f46ced018737f08f356c655", "version-date": "2024-01-03", "port-version": 1 }, From 6d8982314b175c4c6216e62a0c127e2074397e2e Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 17:20:59 +1000 Subject: [PATCH 29/33] fix patch --- ports/ffmpeg/0004-dependencies.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/0004-dependencies.patch b/ports/ffmpeg/0004-dependencies.patch index 1c404451390b83..bf91f88bda022c 100644 --- a/ports/ffmpeg/0004-dependencies.patch +++ b/ports/ffmpeg/0004-dependencies.patch @@ -21,10 +21,10 @@ index a8b74e0..c99f41c 100755 enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif || -@@ -6772,7 +6773,7 @@ enabled libopencv && { check_headers opencv2/core/core_c.h && - enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion +@@ -6772,7 +6773,7 @@ require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } + enabled libopenh264 && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version || - { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } + { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } -enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++" +enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create enabled libopenvino && { { check_pkg_config libopenvino openvino openvino/c/openvino.h ov_core_create && enable openvino2; } || From c6c57cbe0532d6f8e0973f1eb65e8881ebeb21be Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 28 Jul 2024 17:21:13 +1000 Subject: [PATCH 30/33] Update ffmpeg.json --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index cf7e00598ddaf2..1f372997354614 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a8176227f530798e7382859a82e37b7c32ef168a", + "git-tree": "6c14224b4a8c90efabd3640a98f76eaee8607f98", "version": "7.0", "port-version": 0 }, From 4e5b53135b4959f2aad54f78c4ab60ee9733fcf3 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 1 Aug 2024 19:13:52 -0700 Subject: [PATCH 31/33] remove port-version --- ports/aubio/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index 010c37beda416d..04188776c1fa1f 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aubio", "version-date": "2024-01-03", - "port-version": 1, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "license": "GPL-3.0-or-later", From c2f3437bbc510f2df86da2275234daf0f65d49e4 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 1 Aug 2024 19:14:16 -0700 Subject: [PATCH 32/33] update git-tree --- versions/a-/aubio.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index eeb15eb6746023..7578db683163ac 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31db883042c73ae81e74c010dca29c7fc4e273f9", + "version-date": "2024-01-03", + "port-version": 0 + }, { "git-tree": "96c0a533cc0479331f46ced018737f08f356c655", "version-date": "2024-01-03", diff --git a/versions/baseline.json b/versions/baseline.json index f8302d137d97fa..200556292a54fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -338,7 +338,7 @@ }, "aubio": { "baseline": "2024-01-03", - "port-version": 1 + "port-version": 0 }, "audiofile": { "baseline": "1.1.1", From 0ea67f8c3d852f4a01c948ecc1360d7010d1c751 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 1 Aug 2024 23:52:40 -0700 Subject: [PATCH 33/33] format --- versions/a-/aubio.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 7578db683163ac..18ffdd57fba6a2 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -5,11 +5,6 @@ "version-date": "2024-01-03", "port-version": 0 }, - { - "git-tree": "96c0a533cc0479331f46ced018737f08f356c655", - "version-date": "2024-01-03", - "port-version": 1 - }, { "git-tree": "e51e332257e4b788828390a39d86109000d5b960", "version-date": "2022-01-26",