From f2b47cb5391d146ddfd29040a591b296818117d5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 2 Mar 2022 16:35:12 +0100 Subject: [PATCH 01/90] mlt: update to 6.26.1. --- srcpkgs/mlt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 857a88d3a3ce..8933eb4e7bb9 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,7 +1,7 @@ # Template file for 'mlt' pkgname=mlt -version=6.22.1 -revision=3 +version=6.26.1 +revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE --enable-gpl --enable-gpl3 --disable-swfdec --without-kde @@ -14,11 +14,11 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libvidstab-devel libatomic-devel" depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins" short_desc="Multimedia framework, designed for television broadcasting" -maintainer="Diogo Leal " +maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=a3debdf0b8811f0d20c902cc3df3d05dad7d3ff36d1db16c0a7338d0d5989998 +checksum=8a484bbbf51f33e25312757531f3ad2ce20607149d20fcfcb40a3c1e60b20b4e CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" From c22f899741c0ded8fe51768e7fb6b6b14ada2687 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 21:50:38 +0100 Subject: [PATCH 02/90] New package: robin-hood-hashing-3.11.5 --- srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/robin-hood-hashing/template diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template new file mode 100644 index 000000000000..63a9db6c3f89 --- /dev/null +++ b/srcpkgs/robin-hood-hashing/template @@ -0,0 +1,16 @@ +# Template file for 'robin-hood-hashing' +pkgname=robin-hood-hashing +version=3.11.5 +revision=1 +build_style=cmake +configure_args=" -DRH_STANDALONE_PROJECT=OFF" +short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++" +maintainer="tibequadorian " +license="MIT" +homepage="https://github.com/martinus/robin-hood-hashing" +distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz" +checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0 + +post_install() { + vlicense LICENSE +} From d3030139e76fd1b824dafa2ae1fd7a49228448f4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:15 +0100 Subject: [PATCH 03/90] SPIRV-Tools: update to 2022.1. --- srcpkgs/SPIRV-Tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index 70d13dfb6da5..7a0e2e6d2646 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-Tools' pkgname=SPIRV-Tools -version=2020.6 +version=2022.1 revision=1 build_style=cmake configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF @@ -12,7 +12,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/KhronosGroup/SPIRV-Tools" distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz" -checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 +checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58 SPIRV-Tools-devel_package() { depends="SPIRV-Tools-${version}_${revision}" From 5ed224a8e93aa1b334c13d89575a934ec4e150b0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:22 +0100 Subject: [PATCH 04/90] SPIRV-Headers: update to 1.3.204.1. --- srcpkgs/SPIRV-Headers/template | 8 +++++--- srcpkgs/SPIRV-Headers/update | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/SPIRV-Headers/update diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 5dcf457c04c7..c67315ceb63f 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -1,11 +1,13 @@ # Template file for 'SPIRV-Headers' pkgname=SPIRV-Headers -version=1.5.4.raytracing.fixed +reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1" +version=1.3.204.1 revision=1 +wrksrc="SPIRV-Headers-sdk-${version}" build_style=cmake short_desc="Machine-readable files for the SPIR-V Registry" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/KhronosGroup/SPIRV-Headers" -distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz" -checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 +distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz" +checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update new file mode 100644 index 000000000000..2fa65238787a --- /dev/null +++ b/srcpkgs/SPIRV-Headers/update @@ -0,0 +1 @@ +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From fb6ba64ae0a02e8ae19efc2153997eb05613fb91 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:32 +0100 Subject: [PATCH 05/90] Vulkan-Headers: update to 1.3.204.1. --- srcpkgs/Vulkan-Headers/template | 9 +++++---- srcpkgs/Vulkan-Headers/update | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template index d619f96e2362..f26d72798a03 100644 --- a/srcpkgs/Vulkan-Headers/template +++ b/srcpkgs/Vulkan-Headers/template @@ -1,11 +1,12 @@ # Template file for 'Vulkan-Headers' pkgname=Vulkan-Headers -version=1.2.182 +version=1.3.204.1 revision=1 +wrksrc="Vulkan-Headers-sdk-${version}" build_style=cmake short_desc="Vulkan header files" -maintainer="Arvin Ignaci " +maintainer="Orphaned " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz" -checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8 +distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz" +checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update index 995551ef357b..2fa65238787a 100644 --- a/srcpkgs/Vulkan-Headers/update +++ b/srcpkgs/Vulkan-Headers/update @@ -1,2 +1 @@ -pkgname=sdk -pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)" +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From 66d931300396fcd22379fbd81ae795cdf4acf1ba Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:35 +0100 Subject: [PATCH 06/90] Vulkan-Tools: update to 1.3.204.1. --- srcpkgs/Vulkan-Tools/template | 12 ++++++------ srcpkgs/Vulkan-Tools/update | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template index 8d5c74629cb8..b577e832c73e 100644 --- a/srcpkgs/Vulkan-Tools/template +++ b/srcpkgs/Vulkan-Tools/template @@ -1,20 +1,20 @@ # Template file for 'Vulkan-Tools' pkgname=Vulkan-Tools -version=1.2.182 +version=1.3.204.1 revision=1 -wrksrc="${pkgname}-${version}" +wrksrc="Vulkan-Tools-sdk-${version}" build_style=cmake configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF) -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev" hostmakedepends="python3 pkg-config $(vopt_if cube glslang)" makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel - wayland-devel libXrandr-devel" + wayland-devel wayland-protocols libXrandr-devel" short_desc="Official Vulkan tools and utilities" -maintainer="Arvin Ignaci " +maintainer="Orphaned " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz" -checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e +distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz" +checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49 build_options="cube" desc_option_cube="Build cube vulkan demo" diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update index 75a4ad43aa6d..2fa65238787a 100644 --- a/srcpkgs/Vulkan-Tools/update +++ b/srcpkgs/Vulkan-Tools/update @@ -1,2 +1 @@ -site=https://github.com/KhronosGroup/Vulkan-Tools/releases -pkgname=sdk +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From ee58a21e0b48b2f1cbff67f70d714a4efb187f28 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:41 +0100 Subject: [PATCH 07/90] Vulkan-ValidationLayers: update to 1.3.204.1. --- srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++------- srcpkgs/Vulkan-ValidationLayers/update | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/Vulkan-ValidationLayers/update diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template index d89eb414b126..9a2d58434d24 100644 --- a/srcpkgs/Vulkan-ValidationLayers/template +++ b/srcpkgs/Vulkan-ValidationLayers/template @@ -1,16 +1,16 @@ # Template file for 'Vulkan-ValidationLayers' pkgname=Vulkan-ValidationLayers -version=1.2.162 +version=1.3.204.1 revision=1 +wrksrc="Vulkan-ValidationLayers-sdk-${version}" build_style=cmake -configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr - -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON" +configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON" hostmakedepends="pkg-config" makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel - SPIRV-Tools-devel SPIRV-Headers" + SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing" short_desc="Khronos official Vulkan validation layers" -maintainer="Colin Gillespie " +maintainer="Orphaned " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz" -checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917 +distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz" +checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341 diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update new file mode 100644 index 000000000000..2fa65238787a --- /dev/null +++ b/srcpkgs/Vulkan-ValidationLayers/update @@ -0,0 +1 @@ +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From a8d7c218ad0bf087273f6288d77128b78933d40d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:46 +0100 Subject: [PATCH 08/90] vulkan-loader: update to 1.3.204.1. --- srcpkgs/vulkan-loader/template | 10 +++++----- srcpkgs/vulkan-loader/update | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template index 383d90ddd350..5b4f5366fe72 100644 --- a/srcpkgs/vulkan-loader/template +++ b/srcpkgs/vulkan-loader/template @@ -1,8 +1,8 @@ # Template file for 'vulkan-loader' pkgname=vulkan-loader -version=1.2.182 +version=1.3.204.1 revision=1 -wrksrc="Vulkan-Loader-${version}" +wrksrc="Vulkan-Loader-sdk-${version}" build_style=cmake configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_TESTS=OFF" @@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config" makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel libXrandr-devel" short_desc="Vulkan Installable Client Driver (ICD) loader" -maintainer="Arvin Ignaci " +maintainer="Orphaned " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz" -checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90 +distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz" +checksum=5dcd42b564804f4c01891ddd429a4a5028113c4cf39b44256689e8f543773134 diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update index 46acb07cbe81..c21c479d0e53 100644 --- a/srcpkgs/vulkan-loader/update +++ b/srcpkgs/vulkan-loader/update @@ -1,3 +1,3 @@ _pkgname=Vulkan-Loader -site="https://github.com/KhronosGroup/${_pkgname}/releases" +site="https://github.com/KhronosGroup/${_pkgname}/tags" pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)" From 3a9bc89fc6cb5a3519ad510ee30f38c79fc80bc6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 6 Feb 2022 04:02:50 +0100 Subject: [PATCH 09/90] ffmpeg: update to 5.0. --- common/shlibs | 17 ++++++++--------- srcpkgs/ffmpeg/template | 19 ++++++------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/common/shlibs b/common/shlibs index 11328b15a9cc..5cd03500a921 100644 --- a/common/shlibs +++ b/common/shlibs @@ -387,15 +387,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1 libgif.so.7 giflib-5.1.0_1 libImlib2.so.1 imlib2-1.4.2_1 libmp3lame.so.0 lame-3.98.2_1 -libavdevice.so.58 libavdevice-4.0_1 -libavformat.so.58 libavformat-4.0_1 -libswscale.so.5 libswscale-4.0_1 -libswresample.so.3 libswresample-4.0_1 -libavresample.so.4 libavresample-4.0_1 -libpostproc.so.55 libpostproc-4.0_1 -libavcodec.so.58 libavcodec-4.0_1 -libavutil.so.56 libavutil-4.0_1 -libavfilter.so.7 libavfilter-4.0_1 +libavdevice.so.59 libavdevice-5.0_1 +libavformat.so.59 libavformat-5.0_1 +libswscale.so.6 libswscale-5.0_1 +libswresample.so.4 libswresample-5.0_1 +libpostproc.so.56 libpostproc-5.0_1 +libavcodec.so.59 libavcodec-5.0_1 +libavutil.so.57 libavutil-5.0_1 +libavfilter.so.8 libavfilter-5.0_1 libSDL-1.2.so.0 SDL-1.2.14_1 libSDL_image-1.2.so.0 SDL_image-1.2.10_1 libx264.so.157 x264-20190507.2245_1 diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 213aae8bbfa0..d319619deeaf 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,15 +1,15 @@ # Template file for 'ffmpeg' # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg -version=4.4.1 -revision=2 +version=5.0 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 +checksum=51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -24,7 +24,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel) $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel) $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel) - $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if vulkan 'vulkan-loader Vulkan-Headers Vulkan-Tools Vulkan-ValidationLayers') $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel)" depends="ffplay>=${version}_${revision}" @@ -109,7 +109,7 @@ do_configure() { $(vopt_enable x265 libx265) \ $(vopt_enable v4l2 libv4l2) \ $(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \ - --enable-libbs2b --enable-avresample --enable-libvidstab \ + --enable-libbs2b --enable-libvidstab \ $(vopt_enable dav1d libdav1d) \ $(vopt_enable zimg libzimg) \ $(vopt_enable webp libwebp) \ @@ -138,12 +138,6 @@ libavdevice_package() { vmove "usr/lib/libavdevice.so.*" } } -libavresample_package() { - short_desc="FFmpeg audio resampling library" - pkg_install() { - vmove "usr/lib/libavresample.so.*" - } -} libavformat_package() { short_desc="FFmpeg file format library" pkg_install() { @@ -189,8 +183,7 @@ ffmpeg-devel_package() { libavfilter>=${version}_${revision} libpostproc>=${version}_${revision} libswscale>=${version}_${revision} - libswresample>=${version}_${revision} - libavresample>=${version}_${revision}" + libswresample>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 10e7cd63c8071b515bc699e264e755c9545ae0e5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 6 Feb 2022 04:35:01 +0100 Subject: [PATCH 10/90] libavresample: remove --- srcpkgs/libavresample | 1 - srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 srcpkgs/libavresample diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample deleted file mode 120000 index a9f1eea092d5..000000000000 --- a/srcpkgs/libavresample +++ /dev/null @@ -1 +0,0 @@ -ffmpeg \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0923c53cfc05..63d7625925f5 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -213,6 +213,7 @@ replaces=" key-mon<=1.17_5 laditools<=1.1.0_3 libapp<=20140527_2 + libavresample<=4.4.1_1 libco-devel<=20_1 libco<=20_1 libdbusmenu-qt<=0.9.2_4 From b6a015f899b06cd3fe31b8af68d18ebf7503de8e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 11/90] QMPlay2: rebuild against ffmpeg-5.0 --- srcpkgs/QMPlay2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 1c8571de2591..335c130656d6 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,7 +1,7 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 version=22.03.19 -revision=1 +revision=2 wrksrc="${pkgname}-src-${version}" build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" From 6ba36c6dd3f5fb23f232cb6ae1a26f8b6d0b3c31 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 12/90] alsa-plugins: rebuild against ffmpeg-5.0 --- srcpkgs/alsa-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 0a03eaf9d8f0..60066091b803 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template file for 'alsa-plugins' pkgname=alsa-plugins version=1.2.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-maemo-plugin" hostmakedepends="pkg-config" From f67c9a9d59734ae5914c4cccb5c98974d9a9f02c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 13/90] arcan: rebuild against ffmpeg-5.0 --- srcpkgs/arcan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index f33db1fadeb8..e78d9dc76e2d 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,7 +1,7 @@ # Template file for 'arcan' pkgname=arcan version=0.6.1 -revision=1 +revision=2 build_wrksrc=src build_style=cmake make_cmd=make From 3cdd30f85c4442cb5be472ea2e10da8dd0ad145e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 14/90] attract: rebuild against ffmpeg-5.0 --- srcpkgs/attract/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template index ceff4287193d..dc471aea1968 100644 --- a/srcpkgs/attract/template +++ b/srcpkgs/attract/template @@ -1,7 +1,7 @@ # Template file for 'attract' pkgname=attract version=2.6.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="VERBOSE=1" hostmakedepends="pkg-config" From 5f457c5924b864223b3c1424c68e5a446692083d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 15/90] aubio: rebuild against ffmpeg-5.0 --- srcpkgs/aubio/patches/ffmpeg-5.0.patch | 25 +++++++++++++++++++++++++ srcpkgs/aubio/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/aubio/patches/ffmpeg-5.0.patch diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch new file mode 100644 index 000000000000..aace41a6e6d9 --- /dev/null +++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch @@ -0,0 +1,25 @@ +From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001 +From: Paul Brossier +Date: Tue, 25 Jan 2022 18:30:27 +0100 +Subject: [PATCH] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec > + 59, thx @berolinux (closes gh-353) + +--- + src/io/source_avcodec.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index e0ae93b5..1421bd9a 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -68,6 +68,10 @@ + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE + #endif + ++#if LIBAVCODEC_VERSION_MAJOR >= 59 ++#define FF_API_LAVF_AVCTX 1 ++#endif ++ + struct _aubio_source_avcodec_t { + uint_t hop_size; + uint_t samplerate; diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template index eaab3e9fdb72..1697eb83541b 100644 --- a/srcpkgs/aubio/template +++ b/srcpkgs/aubio/template @@ -1,7 +1,7 @@ # Template file for 'aubio' pkgname=aubio version=0.4.9 -revision=1 +revision=2 build_style=waf3 # XXX lash, pure and swig support. hostmakedepends="pkg-config txt2man" From a13f5d0649d2972db1a03a19bca525e95808057d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 16/90] audacious-plugins: rebuild against ffmpeg-5.0 --- .../patches/ffmpeg-5.0.patch | 31 +++++++++++++++++++ srcpkgs/audacious-plugins/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch new file mode 100644 index 000000000000..617c11215b90 --- /dev/null +++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch @@ -0,0 +1,31 @@ +From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001 +From: John Lindgren +Date: Sat, 5 Mar 2022 12:05:34 -0500 +Subject: [PATCH] Fix build with FFmpeg 5.0 + +--- + src/ffaudio/ffaudio-core.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc +index 16dc63e3a..a2b95fd6c 100644 +--- a/src/ffaudio/ffaudio-core.cc ++++ b/src/ffaudio/ffaudio-core.cc +@@ -274,7 +274,7 @@ static AVInputFormat * get_format_by_content (const char * name, VFSFile & file) + AVProbeData d = {name, buf, filled}; + score = target; + +- f = av_probe_input_format2 (& d, true, & score); ++ f = (AVInputFormat *) av_probe_input_format2 (& d, true, & score); + if (f) + break; + +@@ -347,7 +347,7 @@ static bool find_codec (AVFormatContext * c, CodecInfo * cinfo) + #endif + if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + { +- AVCodec * codec = avcodec_find_decoder (stream->codecpar->codec_id); ++ AVCodec * codec = (AVCodec *) avcodec_find_decoder (stream->codecpar->codec_id); + + if (codec) + { diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index d0724c54b0ad..9c29e6b45d47 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -2,7 +2,7 @@ #Keep in sync with audacious! pkgname=audacious-plugins version=4.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="$(vopt_enable gtk) $(vopt_enable qt)" hostmakedepends="gettext pkg-config glib-devel" From f21b9c9877f04df83c14eaebe62bd205103a481f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 17/90] baresip: rebuild against ffmpeg-5.0 --- srcpkgs/baresip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index 203250ecebfe..2b375e17d197 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,7 +1,7 @@ # Template file for 'baresip' pkgname=baresip version=1.1.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re From f1f61ddf2a7354b035efb49f6b1211dadea61f9e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 18/90] blender: rebuild against ffmpeg-5.0 --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 91799f04fba5..28befed1faf8 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=3.0.0 -revision=4 +revision=5 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" From 7ee4def04563d657840b40ac5f9149efb34ae168 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 19/90] cantata: rebuild against ffmpeg-5.0 --- srcpkgs/cantata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 8ce1d756ace9..f685d5f985f7 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,7 +1,7 @@ # Template file for 'cantata' pkgname=cantata version=2.4.2 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel From c00db6434fdac356380897acae5b76a9cc769b65 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 20/90] ccextractor: rebuild against ffmpeg-5.0 --- srcpkgs/ccextractor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template index 9abcd82852b2..7fe2ba4f27b6 100644 --- a/srcpkgs/ccextractor/template +++ b/srcpkgs/ccextractor/template @@ -1,7 +1,7 @@ # Template file for 'ccextractor' pkgname=ccextractor version=0.93 -revision=1 +revision=2 build_wrksrc="linux" build_style=gnu-configure configure_args="--enable-ocr --enable-hardsubx" From b635a9cd4abf079b3c7adecaba83b7b19dbd40a0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 21/90] chromaprint: rebuild against ffmpeg-5.0 --- srcpkgs/chromaprint/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template index 7ef7838949f3..1f7bbc70a22c 100644 --- a/srcpkgs/chromaprint/template +++ b/srcpkgs/chromaprint/template @@ -1,7 +1,7 @@ # Template file for 'chromaprint' pkgname=chromaprint version=1.5.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TOOLS=ON" make_check_target="check" From 05bf882e3664d5f23247ed40625aa52b51c31ca2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 22/90] chromium: rebuild against ffmpeg-5.0 --- srcpkgs/chromium/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index f655d29f3ba0..956d42903d29 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -2,7 +2,7 @@ pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version version=100.0.4896.127 -revision=1 +revision=2 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Duncaen " From 4b936636ca0ffec6ef1f21b57ec0d8eed935097b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 23/90] cmus: rebuild against ffmpeg-5.0 --- srcpkgs/cmus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 6dc8d61b8652..81c867e53d38 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,7 +1,7 @@ # Template file for 'cmus' pkgname=cmus version=2.9.1 -revision=2 +revision=3 build_style=configure configure_args="prefix=/usr LD=$CC" hostmakedepends="pkg-config" From 30cc80706c96e4c167c9d278b9b313378fcd2a07 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 24/90] deadbeef: rebuild against ffmpeg-5.0 --- srcpkgs/deadbeef/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index 159ad1ce38bc..9a1589dbb1d9 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,7 +1,7 @@ # Template file for 'deadbeef' pkgname=deadbeef version=1.8.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2" hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config From b60e5bb62d62e58111344394b166e6920a94f008 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 25/90] dolphin-emu: rebuild against ffmpeg-5.0 --- srcpkgs/dolphin-emu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 2b3a783943b8..91b02229a382 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,7 +1,7 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu version=5.0.16101 -revision=1 +revision=2 _dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2 #Version/hash pair can be found at https://dolphin-emu.org/download/ From 40ffea4167e3e9c8bb959251d9919e5e3cb43ec5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 26/90] droidcam: rebuild against ffmpeg-5.0 --- srcpkgs/droidcam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template index 1357308432ef..2b2eec714633 100644 --- a/srcpkgs/droidcam/template +++ b/srcpkgs/droidcam/template @@ -1,7 +1,7 @@ # Template file for 'droidcam' pkgname=droidcam version=1.8.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg" hostmakedepends="pkg-config" From 880b32de06c01a182af03215fa33a77fba089e60 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 27/90] electron10: rebuild against ffmpeg-5.0 --- srcpkgs/electron10/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template index 05506dddcb37..986c96bf83f4 100644 --- a/srcpkgs/electron10/template +++ b/srcpkgs/electron10/template @@ -3,7 +3,7 @@ pkgname=electron10 version=10.4.7 _nodever=12.16.3 _chromiumver=85.0.4183.121 -revision=2 +revision=3 archs="x86_64* i686* aarch64*" build_wrksrc="src" create_wrksrc=yes From 0f5ce104209f12be7f2c1592ca731eedfcbd0fdc Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 28/90] electron13: rebuild against ffmpeg-5.0 --- srcpkgs/electron13/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template index 1ceb6f788a62..77c7d5306cd6 100644 --- a/srcpkgs/electron13/template +++ b/srcpkgs/electron13/template @@ -1,7 +1,7 @@ # Template file for 'electron13' pkgname=electron13 version=13.6.7 -revision=1 +revision=2 _nodever=14.16.0 _chromiumver=91.0.4472.164 archs="x86_64* i686* aarch64* ppc64le*" From e951d5a21f066b84bd3ac500fcd04790520968af Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 29/90] ffmpegthumbnailer: rebuild against ffmpeg-5.0 --- srcpkgs/ffmpegthumbnailer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template index 039eea7622b3..27bba7e685a0 100644 --- a/srcpkgs/ffmpegthumbnailer/template +++ b/srcpkgs/ffmpegthumbnailer/template @@ -1,7 +1,7 @@ # Template file for 'ffmpegthumbnailer' pkgname=ffmpegthumbnailer version=2.2.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel" From 3065b2dd7e0f8f64cdc3e362ea21e5a5889bb7e8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 30/90] ffmpegthumbs: rebuild against ffmpeg-5.0 --- srcpkgs/ffmpegthumbs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template index 72f6ccaeedd0..4e61fa2e51d7 100644 --- a/srcpkgs/ffmpegthumbs/template +++ b/srcpkgs/ffmpegthumbs/template @@ -1,7 +1,7 @@ # Template file for 'ffmpegthumbs' pkgname=ffmpegthumbs version=21.12.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config qt5-host-tools qt5-qmake gettext" From adbb5a731bdac6c9d404dcb7eb0fca2d22caaab1 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 31/90] ffms2: rebuild against ffmpeg-5.0 --- srcpkgs/ffms2/patches/ffmpeg-5.0.patch | 419 +++++++++++++++++++++++++ srcpkgs/ffms2/template | 2 +- 2 files changed, 420 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ffms2/patches/ffmpeg-5.0.patch diff --git a/srcpkgs/ffms2/patches/ffmpeg-5.0.patch b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch new file mode 100644 index 000000000000..86f1387d7f9d --- /dev/null +++ b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch @@ -0,0 +1,419 @@ +From 28fc493fda2fa2064afeeb0a5d85fdc42db05dcf Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis +Date: Tue, 4 May 2021 14:12:41 +0100 +Subject: [PATCH 1/3] all: Update AVPacket API usage + +AVPackets must all be on the heap now, since it is no longer +part of the libav* ABI. + +Signed-off-by: Derek Buitenhuis +--- + src/core/audiosource.cpp | 16 ++++++---- + src/core/indexing.cpp | 63 ++++++++++++++++++++++------------------ + src/core/indexing.h | 4 +-- + src/core/utils.cpp | 6 ---- + src/core/utils.h | 1 - + src/core/videosource.cpp | 30 ++++++++++--------- + 6 files changed, 64 insertions(+), 56 deletions(-) + +diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp +index 37cf9aeef..e4ce97cdb 100644 +--- a/src/core/audiosource.cpp ++++ b/src/core/audiosource.cpp +@@ -285,10 +285,15 @@ FFMS_AudioSource::AudioBlock *FFMS_AudioSource::CacheBlock(CacheIterator &pos) { + int FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) { + CurrentFrame = &Frames[PacketNumber]; + +- AVPacket Packet; +- if (!ReadPacket(&Packet)) ++ AVPacket *Packet = av_packet_alloc(); ++ if (!Packet) ++ throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_ALLOCATION_FAILED, ++ "Could not allocate packet."); ++ if (!ReadPacket(Packet)) { ++ av_packet_free(&Packet); + throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_UNKNOWN, + "ReadPacket unexpectedly failed to read a packet"); ++ } + + // ReadPacket may have changed the packet number + CurrentFrame = &Frames[PacketNumber]; +@@ -297,8 +302,9 @@ int FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) { + int NumberOfSamples = 0; + AudioBlock *CachedBlock = nullptr; + +- int Ret = avcodec_send_packet(CodecContext, &Packet); +- av_packet_unref(&Packet); ++ int Ret = avcodec_send_packet(CodecContext, Packet); ++ av_packet_unref(Packet); ++ av_packet_free(&Packet); + + av_frame_unref(DecodeFrame); + Ret = avcodec_receive_frame(CodecContext, DecodeFrame); +@@ -513,8 +519,6 @@ void FFMS_AudioSource::Seek() { + } + + bool FFMS_AudioSource::ReadPacket(AVPacket *Packet) { +- InitNullPacket(*Packet); +- + while (av_read_frame(FormatContext, Packet) >= 0) { + if (Packet->stream_index == TrackNumber) { + // Required because not all audio packets, especially in ogg, have a pts. Use the previous valid packet's pts instead. +diff --git a/src/core/indexing.cpp b/src/core/indexing.cpp +index 23fb95b12..e547c5abf 100644 +--- a/src/core/indexing.cpp ++++ b/src/core/indexing.cpp +@@ -320,7 +320,7 @@ void FFMS_Indexer::CheckAudioProperties(int Track, AVCodecContext *Context) { + } + } + +-void FFMS_Indexer::ParseVideoPacket(SharedAVContext &VideoContext, AVPacket &pkt, int *RepeatPict, ++void FFMS_Indexer::ParseVideoPacket(SharedAVContext &VideoContext, AVPacket *pkt, int *RepeatPict, + int *FrameType, bool *Invisible, enum AVPictureStructure *LastPicStruct) { + if (VideoContext.Parser) { + uint8_t *OB; +@@ -330,8 +330,8 @@ void FFMS_Indexer::ParseVideoPacket(SharedAVContext &VideoContext, AVPacket &pkt + av_parser_parse2(VideoContext.Parser, + VideoContext.CodecContext, + &OB, &OBSize, +- pkt.data, pkt.size, +- pkt.pts, pkt.dts, pkt.pos); ++ pkt->data, pkt->size, ++ pkt->pts, pkt->dts, pkt->pos); + + // H.264 (PAFF) and HEVC may have one field per packet, so we need to track + // when we have a full or half frame available, and mark one of them as +@@ -351,15 +351,15 @@ void FFMS_Indexer::ParseVideoPacket(SharedAVContext &VideoContext, AVPacket &pkt + + *RepeatPict = VideoContext.Parser->repeat_pict; + *FrameType = VideoContext.Parser->pict_type; +- *Invisible = (IncompleteFrame || VideoContext.Parser->repeat_pict < 0 || (pkt.flags & AV_PKT_FLAG_DISCARD)); ++ *Invisible = (IncompleteFrame || VideoContext.Parser->repeat_pict < 0 || (pkt->flags & AV_PKT_FLAG_DISCARD)); + } else { +- *Invisible = !!(pkt.flags & AV_PKT_FLAG_DISCARD); ++ *Invisible = !!(pkt->flags & AV_PKT_FLAG_DISCARD); + } + + if (VideoContext.CodecContext->codec_id == AV_CODEC_ID_VP8) +- ParseVP8(pkt.data[0], Invisible, FrameType); ++ ParseVP8(pkt->data[0], Invisible, FrameType); + else if (VideoContext.CodecContext->codec_id == AV_CODEC_ID_VP9) +- ParseVP9(pkt.data[0], Invisible, FrameType); ++ ParseVP9(pkt->data[0], Invisible, FrameType); + } + + void FFMS_Indexer::Free() { +@@ -458,32 +458,36 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + } + } + +- AVPacket Packet; +- InitNullPacket(Packet); ++ AVPacket *Packet = av_packet_alloc(); ++ if (!Packet) ++ throw FFMS_Exception(FFMS_ERROR_CODEC, FFMS_ERROR_ALLOCATION_FAILED, ++ "Could not allocate packet."); + std::vector LastValidTS(FormatContext->nb_streams, AV_NOPTS_VALUE); + + int64_t filesize = avio_size(FormatContext->pb); + enum AVPictureStructure LastPicStruct = AV_PICTURE_STRUCTURE_UNKNOWN; +- while (av_read_frame(FormatContext, &Packet) >= 0) { ++ while (av_read_frame(FormatContext, Packet) >= 0) { + // Update progress + // FormatContext->pb can apparently be NULL when opening images. + if (IC && FormatContext->pb) { +- if ((*IC)(FormatContext->pb->pos, filesize, ICPrivate)) ++ if ((*IC)(FormatContext->pb->pos, filesize, ICPrivate)) { ++ av_packet_free(&Packet); + throw FFMS_Exception(FFMS_ERROR_CANCELLED, FFMS_ERROR_USER, + "Cancelled by user"); ++ } + } +- if (!IndexMask.count(Packet.stream_index)) { +- av_packet_unref(&Packet); ++ if (!IndexMask.count(Packet->stream_index)) { ++ av_packet_unref(Packet); + continue; + } + +- int Track = Packet.stream_index; ++ int Track = Packet->stream_index; + FFMS_Track &TrackInfo = (*TrackIndices)[Track]; +- bool KeyFrame = !!(Packet.flags & AV_PKT_FLAG_KEY); ++ bool KeyFrame = !!(Packet->flags & AV_PKT_FLAG_KEY); + ReadTS(Packet, LastValidTS[Track], (*TrackIndices)[Track].UseDTS); + + if (FormatContext->streams[Track]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { +- int64_t PTS = TrackInfo.UseDTS ? Packet.dts : Packet.pts; ++ int64_t PTS = TrackInfo.UseDTS ? Packet->dts : Packet->pts; + if (PTS == AV_NOPTS_VALUE) { + // VPx alt-refs are output as packets which lack timestmps or durations, since + // they are invisible. Currently, the timestamp mangling code in libavformat +@@ -495,9 +499,11 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + // FFMS2 currently sorts packets by PTS, which will break decoding, otherwise. + bool HasAltRefs = (FormatContext->streams[Track]->codecpar->codec_id == AV_CODEC_ID_VP8 || + FormatContext->streams[Track]->codecpar->codec_id == AV_CODEC_ID_VP9); +- if (Packet.duration == 0 && !HasAltRefs) ++ if (Packet->duration == 0 && !HasAltRefs) { ++ av_packet_free(&Packet); + throw FFMS_Exception(FFMS_ERROR_INDEXING, FFMS_ERROR_PARSER, + "Invalid packet pts, dts, and duration"); ++ } + + if (TrackInfo.empty()) + PTS = 0; +@@ -513,7 +519,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + ParseVideoPacket(AVContexts[Track], Packet, &RepeatPict, &FrameType, &Invisible, &LastPicStruct); + + TrackInfo.AddVideoFrame(PTS, RepeatPict, KeyFrame, +- FrameType, Packet.pos, Invisible); ++ FrameType, Packet->pos, Invisible); + } else if (FormatContext->streams[Track]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { + // For video seeking timestamps are used only if all packets have + // timestamps, while for audio they're used if any have timestamps, +@@ -522,28 +528,29 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + TrackInfo.HasTS = true; + + int64_t StartSample = AVContexts[Track].CurrentSample; +- uint32_t SampleCount = IndexAudioPacket(Track, &Packet, AVContexts[Track], *TrackIndices); ++ uint32_t SampleCount = IndexAudioPacket(Track, Packet, AVContexts[Track], *TrackIndices); + TrackInfo.SampleRate = AVContexts[Track].CodecContext->sample_rate; + + TrackInfo.AddAudioFrame(LastValidTS[Track], +- StartSample, SampleCount, KeyFrame, Packet.pos, Packet.flags & AV_PKT_FLAG_DISCARD); ++ StartSample, SampleCount, KeyFrame, Packet->pos, Packet->flags & AV_PKT_FLAG_DISCARD); + } + +- if (!(Packet.flags & AV_PKT_FLAG_DISCARD)) +- TrackInfo.LastDuration = Packet.duration; ++ if (!(Packet->flags & AV_PKT_FLAG_DISCARD)) ++ TrackInfo.LastDuration = Packet->duration; + +- av_packet_unref(&Packet); ++ av_packet_unref(Packet); + } ++ av_packet_free(&Packet); + + TrackIndices->Finalize(AVContexts, FormatContext->iformat->name); + return TrackIndices.release(); + } + +-void FFMS_Indexer::ReadTS(const AVPacket &Packet, int64_t &TS, bool &UseDTS) { +- if (!UseDTS && Packet.pts != AV_NOPTS_VALUE) +- TS = Packet.pts; ++void FFMS_Indexer::ReadTS(const AVPacket *Packet, int64_t &TS, bool &UseDTS) { ++ if (!UseDTS && Packet->pts != AV_NOPTS_VALUE) ++ TS = Packet->pts; + if (TS == AV_NOPTS_VALUE) + UseDTS = true; +- if (UseDTS && Packet.dts != AV_NOPTS_VALUE) +- TS = Packet.dts; ++ if (UseDTS && Packet->dts != AV_NOPTS_VALUE) ++ TS = Packet->dts; + } +diff --git a/src/core/indexing.h b/src/core/indexing.h +index 3cfc3c30b..5c0686889 100644 +--- a/src/core/indexing.h ++++ b/src/core/indexing.h +@@ -80,10 +80,10 @@ struct FFMS_Indexer { + int64_t Filesize; + uint8_t Digest[20]; + +- void ReadTS(const AVPacket &Packet, int64_t &TS, bool &UseDTS); ++ void ReadTS(const AVPacket *Packet, int64_t &TS, bool &UseDTS); + void CheckAudioProperties(int Track, AVCodecContext *Context); + uint32_t IndexAudioPacket(int Track, AVPacket *Packet, SharedAVContext &Context, FFMS_Index &TrackIndices); +- void ParseVideoPacket(SharedAVContext &VideoContext, AVPacket &pkt, int *RepeatPict, int *FrameType, bool *Invisible, enum AVPictureStructure *LastPicStruct); ++ void ParseVideoPacket(SharedAVContext &VideoContext, AVPacket *pkt, int *RepeatPict, int *FrameType, bool *Invisible, enum AVPictureStructure *LastPicStruct); + void Free(); + public: + FFMS_Indexer(const char *Filename); +diff --git a/src/core/utils.cpp b/src/core/utils.cpp +index ce67533fd..8a2e99710 100644 +--- a/src/core/utils.cpp ++++ b/src/core/utils.cpp +@@ -62,12 +62,6 @@ void ClearErrorInfo(FFMS_ErrorInfo *ErrorInfo) { + } + } + +-void InitNullPacket(AVPacket &pkt) { +- av_init_packet(&pkt); +- pkt.data = nullptr; +- pkt.size = 0; +-} +- + void FillAP(FFMS_AudioProperties &AP, AVCodecContext *CTX, FFMS_Track &Frames) { + AP.SampleFormat = static_cast(av_get_packed_sample_fmt(CTX->sample_fmt)); + AP.BitsPerSample = av_get_bytes_per_sample(CTX->sample_fmt) * 8; +diff --git a/src/core/utils.h b/src/core/utils.h +index 9819dc7c9..003ab794e 100644 +--- a/src/core/utils.h ++++ b/src/core/utils.h +@@ -58,7 +58,6 @@ std::unique_ptr make_unique(Args&&... args) { + } + + void ClearErrorInfo(FFMS_ErrorInfo *ErrorInfo); +-void InitNullPacket(AVPacket &pkt); + void FillAP(FFMS_AudioProperties &AP, AVCodecContext *CTX, FFMS_Track &Frames); + + void LAVFOpenFile(const char *SourceFile, AVFormatContext *&FormatContext, int Track); +diff --git a/src/core/videosource.cpp b/src/core/videosource.cpp +index 06bd1610e..b889970e2 100644 +--- a/src/core/videosource.cpp ++++ b/src/core/videosource.cpp +@@ -673,30 +673,34 @@ void FFMS_VideoSource::DecodeNextFrame(int64_t &AStartTime, int64_t &Pos) { + if (HasPendingDelayedFrames()) + return; + +- AVPacket Packet; +- InitNullPacket(Packet); +- +- while (ReadFrame(&Packet) >= 0) { +- if (Packet.stream_index != VideoTrack) { +- av_packet_unref(&Packet); ++ AVPacket *Packet = av_packet_alloc(); ++ if (!Packet) ++ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_ALLOCATION_FAILED, ++ "Could not allocate packet."); ++ ++ while (ReadFrame(Packet) >= 0) { ++ if (Packet->stream_index != VideoTrack) { ++ av_packet_unref(Packet); + continue; + } + + if (AStartTime < 0) +- AStartTime = Frames.UseDTS ? Packet.dts : Packet.pts; ++ AStartTime = Frames.UseDTS ? Packet->dts : Packet->pts; + + if (Pos < 0) +- Pos = Packet.pos; ++ Pos = Packet->pos; + +- bool FrameFinished = DecodePacket(&Packet); +- av_packet_unref(&Packet); +- if (FrameFinished) ++ bool FrameFinished = DecodePacket(Packet); ++ av_packet_unref(Packet); ++ if (FrameFinished) { ++ av_packet_free(&Packet); + return; ++ } + } + + // Flush final frames +- InitNullPacket(Packet); +- DecodePacket(&Packet); ++ DecodePacket(Packet); ++ av_packet_free(&Packet); + } + + bool FFMS_VideoSource::SeekTo(int n, int SeekOffset) { + +From bf9e03e9e08534c024e5a744a6437c4aac160201 Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis +Date: Tue, 4 May 2021 14:20:47 +0100 +Subject: [PATCH 2/3] configure: Remove deprecated API use + +Signed-off-by: Derek Buitenhuis +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b35ef80bc..d19714d0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,10 +102,10 @@ CFLAGS="$_CFLAGS $FFMPEG_CFLAGS" + + AC_DEFUN([TEST_FFMPEG], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +- #include ++ #include + #include + ]],[[ +- avcodec_register_all(); ++ avformat_network_init(); + swscale_version(); + ]])], [eval $1=yes], [eval $1=no]) + ]) + +From a18c8296687e267b20ec90ef81671b77d393a36e Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis +Date: Tue, 4 May 2021 14:41:21 +0100 +Subject: [PATCH 3/3] Use auto for AVCodec + +The geniuses over at FFmpeg decided to constify this API, so old +versions of the library will return AVCodec *, while new versions +of the libary will return const AVCodec *, which, in C++, are not +OK to convert between. + +Rather than use some macro hell in ffmscompat.h, we can work around +this by using auto. + +Gross. + +Signed-off-by: Derek Buitenhuis +--- + src/core/audiosource.cpp | 2 +- + src/core/indexing.cpp | 6 +++--- + src/core/videosource.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp +index e4ce97cdb..ac0966636 100644 +--- a/src/core/audiosource.cpp ++++ b/src/core/audiosource.cpp +@@ -469,7 +469,7 @@ void FFMS_AudioSource::OpenFile() { + + LAVFOpenFile(SourceFile.c_str(), FormatContext, TrackNumber); + +- AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id); ++ auto *Codec = avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id); + if (Codec == nullptr) + throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC, + "Audio codec not found"); +diff --git a/src/core/indexing.cpp b/src/core/indexing.cpp +index e547c5abf..59fb4e8ea 100644 +--- a/src/core/indexing.cpp ++++ b/src/core/indexing.cpp +@@ -384,7 +384,7 @@ FFMS_TrackType FFMS_Indexer::GetTrackType(int Track) { + } + + const char *FFMS_Indexer::GetTrackCodec(int Track) { +- AVCodec *codec = avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id); ++ auto *codec = avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id); + return codec ? codec->name : nullptr; + } + +@@ -402,7 +402,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + UseDTS); + + if (IndexMask.count(i) && FormatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { +- AVCodec *VideoCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); ++ auto *VideoCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); + if (!VideoCodec) { + FormatContext->streams[i]->discard = AVDISCARD_ALL; + IndexMask.erase(i); +@@ -433,7 +433,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() { + IndexMask.insert(i); + } + } else if (IndexMask.count(i) && FormatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { +- AVCodec *AudioCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); ++ auto *AudioCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); + if (AudioCodec == nullptr) + throw FFMS_Exception(FFMS_ERROR_CODEC, FFMS_ERROR_UNSUPPORTED, + "Audio codec not found"); +diff --git a/src/core/videosource.cpp b/src/core/videosource.cpp +index b889970e2..8956c2256 100644 +--- a/src/core/videosource.cpp ++++ b/src/core/videosource.cpp +@@ -171,7 +171,7 @@ FFMS_VideoSource::FFMS_VideoSource(const char *SourceFile, FFMS_Index &Index, in + + LAVFOpenFile(SourceFile, FormatContext, VideoTrack); + +- AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[VideoTrack]->codecpar->codec_id); ++ auto *Codec = avcodec_find_decoder(FormatContext->streams[VideoTrack]->codecpar->codec_id); + if (Codec == nullptr) + throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC, + "Video codec not found"); diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template index 68e8a0c14bce..2acfadac44b3 100644 --- a/srcpkgs/ffms2/template +++ b/srcpkgs/ffms2/template @@ -1,7 +1,7 @@ # Template file for 'ffms2' pkgname=ffms2 version=2.40 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-shared --disable-static" hostmakedepends="pkg-config autoconf automake libtool" From 27ec208934a286c7da07d42dbabfbf99d122eced Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 32/90] freerdp: rebuild against ffmpeg-5.0 --- srcpkgs/freerdp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index da6703547a83..c1393dbd59ba 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=2.6.1 -revision=1 +revision=2 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON From 7aded20f13401f50e6b5e1873324a912cce896a1 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 33/90] gerbera: rebuild against ffmpeg-5.0 --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 7ae7950c72fb..4e0e2a94a9fb 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.6.4 -revision=4 +revision=5 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From dac7e05d36c3d58c2e3b3715ac18a25be59602cc Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 34/90] goldendict: rebuild against ffmpeg-5.0 --- srcpkgs/goldendict/patches/ffmpeg4.patch | 21 --- srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++ srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++ srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++ srcpkgs/goldendict/template | 2 +- 5 files changed, 225 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch deleted file mode 100644 index f045fa27f54b..000000000000 --- a/srcpkgs/goldendict/patches/ffmpeg4.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200 -+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200 -@@ -143,7 +143,7 @@ - return false; - } - -- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE ); -+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE ); - if ( !avioBuffer ) - { - errorString = QObject::tr( "av_malloc() failed." ); -@@ -380,7 +380,7 @@ - } - - if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) && -- codecContext_->codec->capabilities & CODEC_CAP_DELAY ) -+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY ) - { - av_init_packet( &packet ); - int gotFrame = 0; - diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch new file mode 100644 index 000000000000..fdcd7c69be5a --- /dev/null +++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch @@ -0,0 +1,167 @@ +From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001 +From: Abs62 +Date: Fri, 30 Mar 2018 22:53:24 +0300 +Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978) + +--- + ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 62 insertions(+), 6 deletions(-) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index ed1172bdd..56e8f788e 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -91,6 +91,7 @@ struct DecoderContext + QByteArray audioData_; + QDataStream audioDataStream_; + AVFormatContext * formatContext_; ++ AVCodec * codec_; + AVCodecContext * codecContext_; + AVIOContext * avioContext_; + AVStream * audioStream_; +@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan + audioData_( audioData ), + audioDataStream_( audioData_ ), + formatContext_( NULL ), ++ codec_( NULL ), + codecContext_( NULL ), + avioContext_( NULL ), + audioStream_( NULL ), +@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString ) + return false; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 ) + unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE ); ++#else ++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE ); ++#endif + if ( !avioBuffer ) + { + errorString = QObject::tr( "av_malloc() failed." ); +@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString ) + // Find audio stream, use the first audio stream if available + for ( unsigned i = 0; i < formatContext_->nb_streams; i++ ) + { ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) + if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO ) ++#else ++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) ++#endif + { + audioStream_ = formatContext_->streams[i]; + break; +@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString ) + return false; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) + codecContext_ = audioStream_->codec; +- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id ); +- if ( !codec ) ++ codec_ = avcodec_find_decoder( codecContext_->codec_id ); ++ if ( !codec_ ) + { + errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id ); + return false; + } ++#else ++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id ); ++ if ( !codec_ ) ++ { ++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id ); ++ return false; ++ } ++ codecContext_ = avcodec_alloc_context3( codec_ ); ++ if ( !codecContext_ ) ++ { ++ errorString = QObject::tr( "avcodec_alloc_context3() failed." ); ++ return false; ++ } ++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar ); ++#endif + +- ret = avcodec_open2( codecContext_, codec, NULL ); ++ ret = avcodec_open2( codecContext_, codec_, NULL ); + if ( ret < 0 ) + { + errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) ); + return false; + } + +- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name, ++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, + codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); + return true; + } +@@ -252,10 +278,13 @@ void DecoderContext::closeCodec() + + // Closing a codec context without prior avcodec_open2() will result in + // a crash in ffmpeg +- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec ) ++ if ( audioStream_ && codecContext_ && codec_ ) + { + audioStream_->discard = AVDISCARD_ALL; +- avcodec_close( audioStream_->codec ); ++ avcodec_close( codecContext_ ); ++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 ) ++ avcodec_free_context( &codecContext_ ); ++#endif + } + + avformat_close_input( &formatContext_ ); +@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString ) + if ( packet.stream_index == audioStream_->index ) + { + AVPacket pack = packet; ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) + int gotFrame = 0; + do + { +@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString ) + pack.data += len; + } + while( pack.size > 0 ); ++#else ++ int ret = avcodec_send_packet( codecContext_, &pack ); ++ /* read all the output frames (in general there may be any number of them) */ ++ while( ret >= 0 ) ++ { ++ ret = avcodec_receive_frame( codecContext_, frame); ++ ++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) ++ break; ++ ++ playFrame( frame ); ++ } ++#endif + } + // av_free_packet() must be called after each call to av_read_frame() + #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 ) +@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString ) + #endif + } + ++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) + if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) && + codecContext_->codec->capabilities & CODEC_CAP_DELAY ) + { +@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString ) + playFrame( frame ); + } + } ++#else ++ /* flush the decoder */ ++ av_init_packet( &packet ); ++ int ret = avcodec_send_packet(codecContext_, &packet ); ++ while( ret >= 0 ) ++ { ++ ret = avcodec_receive_frame(codecContext_, frame); ++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) ++ break; ++ playFrame( frame ); ++ } ++#endif + + #if LIBAVCODEC_VERSION_MAJOR < 54 + av_free( frame ); diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch new file mode 100644 index 000000000000..fc6da3bee00e --- /dev/null +++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch @@ -0,0 +1,32 @@ +From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001 +From: Abs62 +Date: Fri, 27 Sep 2019 17:00:52 +0300 +Subject: [PATCH] FFmpeg player: Fix some crashes on broken files + +--- + ffmpegaudio.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index 56e8f788e..415fc79cb 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -51,7 +51,9 @@ AudioService & AudioService::instance() + + AudioService::AudioService() + { ++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 ) + av_register_all(); ++#endif + ao_initialize(); + } + +@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString ) + #else + /* flush the decoder */ + av_init_packet( &packet ); ++ packet.data = NULL; ++ packet.size = 0; + int ret = avcodec_send_packet(codecContext_, &packet ); + while( ret >= 0 ) + { diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch new file mode 100644 index 000000000000..72101903d1d1 --- /dev/null +++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch @@ -0,0 +1,25 @@ +From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001 +From: Liao Junxuan +Date: Sun, 20 Feb 2022 12:28:05 +0800 +Subject: [PATCH] add support for ffmpeg 5.0 + +--- + ffmpegaudio.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index d550f4a77..7948d2187 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -94,7 +94,11 @@ struct DecoderContext + QByteArray audioData_; + QDataStream audioDataStream_; + AVFormatContext * formatContext_; ++#if LIBAVCODEC_VERSION_MAJOR < 59 + AVCodec * codec_; ++#else ++ const AVCodec * codec_; ++#endif + AVCodecContext * codecContext_; + AVIOContext * avioContext_; + AVStream * audioStream_; diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template index 7553e408d1a7..edb56dc72aa6 100644 --- a/srcpkgs/goldendict/template +++ b/srcpkgs/goldendict/template @@ -1,7 +1,7 @@ # Template file for 'goldendict' pkgname=goldendict version=1.5.0RC2 -revision=5 +revision=6 wrksrc="${pkgname}-${version/RC/-RC}" build_style=qmake configure_args="CONFIG+=zim_support" From 09800fbee8ea6bbfa71aa90bb4b1d8aee3d44926 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 35/90] gst-libav: rebuild against ffmpeg-5.0 --- srcpkgs/gst-libav/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index 333636d0657a..3333c957fab0 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,7 +1,7 @@ # Template file for 'gst-libav' pkgname=gst-libav version=1.20.1 -revision=1 +revision=2 wrksrc="${pkgname}-${version}" build_style=meson hostmakedepends="pkg-config yasm" From 39b7df8712edb320150c2115e72834e0a17f5322 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 36/90] guvcview: rebuild against ffmpeg-5.0 --- srcpkgs/guvcview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index 345cf6006f24..d42fd38fa4ad 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -1,7 +1,7 @@ # Template file for 'guvcview' pkgname=guvcview version=2.0.7 -revision=1 +revision=2 create_wrksrc=yes build_style=gnu-configure configure_args="--disable-static --disable-debian-menu" From 0390ccb35fc12f2ad252bb930092ad57ec4f4e25 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 37/90] handbrake: rebuild against ffmpeg-5.0 --- srcpkgs/handbrake/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index 6ad7bd3ea798..7bff9580c310 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -1,7 +1,7 @@ # Template file for 'handbrake' pkgname=handbrake version=1.5.1 -revision=1 +revision=2 wrksrc="HandBrake-${version}" build_style=gnu-configure configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden From 7bf4007b36b3cc74dde289aa3d16ae85ed73f3fb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 38/90] hedgewars: rebuild against ffmpeg-5.0 --- srcpkgs/hedgewars/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template index 7060dbc37d95..36ca62d4fbbd 100644 --- a/srcpkgs/hedgewars/template +++ b/srcpkgs/hedgewars/template @@ -1,7 +1,7 @@ # Template file for 'hedgewars' pkgname=hedgewars version=1.0.0 -revision=3 +revision=4 wrksrc="${pkgname}-src-${version}" build_style=cmake configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname} From 0b58697284838d2b944b4bb67fbd19d6056d211b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 39/90] idjc: rebuild against ffmpeg-5.0 --- srcpkgs/idjc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index ddabff2a4e74..df60318b3db9 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -1,7 +1,7 @@ # Template file for 'idjc' pkgname=idjc version=0.9.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config git python3 automake gettext-devel libtool" makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel From 8c453d47a6113333eb3c0d8ac59237efb46b95be Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 40/90] k3b: rebuild against ffmpeg-5.0 --- srcpkgs/k3b/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index 1994bc5ccec9..900f312e9338 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,7 +1,7 @@ # Template file for 'k3b' pkgname=k3b version=21.12.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext qt5-host-tools kauth kdoctools kcoreaddons" From d4387405f886091e4129c0a8ad8931ded0a846f6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 41/90] kfilemetadata5: rebuild against ffmpeg-5.0 --- srcpkgs/kfilemetadata5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index eb162fdff6d0..9e36331f50c4 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,7 +1,7 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 version=5.93.0 -revision=1 +revision=2 wrksrc="${pkgname%5}-${version}" build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake From f811d0021f7d4ff5d129e632ce56607ab8a8d328 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 42/90] kid3: rebuild against ffmpeg-5.0 --- srcpkgs/kid3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template index 81633262dc03..456206d90e16 100644 --- a/srcpkgs/kid3/template +++ b/srcpkgs/kid3/template @@ -1,7 +1,7 @@ # Template file for 'kid3' pkgname=kid3 version=3.9.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)' -DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF) From fb7b8e9653c698b113743fb3b2ae1193a36749d5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 43/90] kodi: rebuild against ffmpeg-5.0 --- srcpkgs/kodi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index da81c7e2d0a5..fa671eb181ff 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.4 -revision=1 +revision=2 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake From 4ee19ba5188da784032fbb9a416bb6d7877a6059 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 44/90] libextractor: rebuild against ffmpeg-5.0 --- srcpkgs/libextractor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index 29d5b8df01f8..ddd4790f93e8 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,7 +1,7 @@ # Template file for 'libextractor' pkgname=libextractor version=1.11 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" From ad30ecda97b1a0e8617a2b76cb01c9db5be4f394 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 45/90] libopenshot: rebuild against ffmpeg-5.0 --- srcpkgs/libopenshot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 71dff12b5d61..662a54758232 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.2.7 -revision=1 +revision=2 build_style=cmake # Builds fail with Ruby-2.4.1 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" From 90e4121ea8d909deb35903182e208bb9a379909f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 46/90] loudgain: rebuild against ffmpeg-5.0 --- srcpkgs/loudgain/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template index da4f2d56e94c..4d6bf29efb4f 100644 --- a/srcpkgs/loudgain/template +++ b/srcpkgs/loudgain/template @@ -1,7 +1,7 @@ # Template file for 'loudgain' pkgname=loudgain version=0.6.8 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="libebur128-devel taglib-devel ffmpeg-devel" From 889bc2b943f4eba8376da4648766bd9910d57bc3 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 47/90] mediastreamer: rebuild against ffmpeg-5.0 --- srcpkgs/mediastreamer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template index 42f7cf4824ea..40e6dcf95a99 100644 --- a/srcpkgs/mediastreamer/template +++ b/srcpkgs/mediastreamer/template @@ -1,7 +1,7 @@ # Template file for 'mediastreamer' pkgname=mediastreamer version=5.1.20 -revision=1 +revision=2 wrksrc="mediastreamer2-${version}" build_style=cmake configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0" From 876426eff335259a80ddc3a26ab9816f5ba19abb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 48/90] mgba: rebuild against ffmpeg-5.0 --- srcpkgs/mgba/patches/ffmpeg-5.0.patch | 117 ++++++++++++++++++++++++++ srcpkgs/mgba/template | 2 +- 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mgba/patches/ffmpeg-5.0.patch diff --git a/srcpkgs/mgba/patches/ffmpeg-5.0.patch b/srcpkgs/mgba/patches/ffmpeg-5.0.patch new file mode 100644 index 000000000000..cf4f6f56a2d4 --- /dev/null +++ b/srcpkgs/mgba/patches/ffmpeg-5.0.patch @@ -0,0 +1,117 @@ +From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001 +From: Ryan Tandy +Date: Thu, 3 Feb 2022 19:02:52 -0800 +Subject: [PATCH] FFmpeg: Support FFmpeg 5.0 + +--- + src/feature/ffmpeg/ffmpeg-decoder.c | 3 ++- + src/feature/ffmpeg/ffmpeg-encoder.c | 25 ++++++++++++++----------- + 2 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/src/feature/ffmpeg/ffmpeg-decoder.c b/src/feature/ffmpeg/ffmpeg-decoder.c +index c3bb6d1c5c..daa47fbf2c 100644 +--- a/src/feature/ffmpeg/ffmpeg-decoder.c ++++ b/src/feature/ffmpeg/ffmpeg-decoder.c +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #include "ffmpeg-decoder.h" + ++#include + #include + + void FFmpegDecoderInit(struct FFmpegDecoder* decoder) { +@@ -38,7 +39,7 @@ bool FFmpegDecoderOpen(struct FFmpegDecoder* decoder, const char* infile) { + #else + enum AVMediaType type = decoder->context->streams[i]->codec->codec_type; + #endif +- struct AVCodec* codec; ++ const struct AVCodec* codec; + struct AVCodecContext* context = NULL; + if (type == AVMEDIA_TYPE_VIDEO && decoder->videoStream < 0) { + decoder->video = avcodec_alloc_context3(NULL); +diff --git a/src/feature/ffmpeg/ffmpeg-encoder.c b/src/feature/ffmpeg/ffmpeg-encoder.c +index ad76ca57b2..be6bd3af5e 100644 +--- a/src/feature/ffmpeg/ffmpeg-encoder.c ++++ b/src/feature/ffmpeg/ffmpeg-encoder.c +@@ -12,6 +12,9 @@ + + #include + #include ++#if LIBAVCODEC_VERSION_MAJOR >= 58 ++#include ++#endif + + #include + #include +@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un + return true; + } + +- AVCodec* codec = avcodec_find_encoder_by_name(acodec); ++ const AVCodec* codec = avcodec_find_encoder_by_name(acodec); + if (!codec) { + return false; + } +@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in + return true; + } + +- AVCodec* codec = avcodec_find_encoder_by_name(vcodec); ++ const AVCodec* codec = avcodec_find_encoder_by_name(vcodec); + if (!codec) { + return false; + } +@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in + if (encoder->pixFormat == AV_PIX_FMT_NONE) { + return false; + } +- if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) { ++ if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) { + return false; + } + encoder->videoCodec = vcodec; +@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in + } + + bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) { +- AVOutputFormat* oformat = av_guess_format(container, 0, 0); ++ const AVOutputFormat* oformat = av_guess_format(container, 0, 0); + if (!oformat) { + return false; + } +@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) { + } + + bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) { +- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0); +- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec); +- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec); ++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0); ++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec); ++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec); + if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) { + return false; + } +@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) { + } + + bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) { +- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec); +- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec); ++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec); ++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec); + if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) { + return false; + } +@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) { + encoder->currentVideoFrame = 0; + encoder->skipResidue = 0; + +- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0); ++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0); + #ifndef USE_LIBAV +- avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile); ++ avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile); + #else + encoder->context = avformat_alloc_context(); + strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1); diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template index a9babfe5f8e0..a6dddada2602 100644 --- a/srcpkgs/mgba/template +++ b/srcpkgs/mgba/template @@ -1,7 +1,7 @@ # Template file for 'mgba' pkgname=mgba version=0.9.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake desktop-file-utils" makedepends="SDL2-devel ffmpeg-devel libedit-devel libepoxy-devel libmagick-devel From ed20c0a5ee1b5bc9f855531cf08c4affda86ff82 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 49/90] minidlna: rebuild against ffmpeg-5.0 --- srcpkgs/minidlna/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index da681f604300..e42ad491acf3 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -1,7 +1,7 @@ # Template file for 'minidlna' pkgname=minidlna version=1.3.0 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --sbindir=/usr/bin From a3971bd5f3ebd5af63bc45b471b2b0f6d9b35a36 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 50/90] mlt: rebuild against ffmpeg-5.0 --- srcpkgs/mlt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 8933eb4e7bb9..ed6b27503f9a 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,7 +1,7 @@ # Template file for 'mlt' pkgname=mlt version=6.26.1 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE --enable-gpl --enable-gpl3 --disable-swfdec --without-kde From d2f01a54461b1bc4e433c4e8bab8a2c65ef520ea Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 51/90] mlt7: rebuild against ffmpeg-5.0 --- srcpkgs/mlt7/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 5aefa500dd8a..f8352c2fc3f3 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -1,7 +1,7 @@ # Template file for 'mlt7' pkgname=mlt7 version=7.4.0 -revision=1 +revision=2 wrksrc="mlt-${version}" build_style=cmake configure_args="-DSWIG_PYTHON=ON" From 2900eb27925d1ec09dd920f68d2f08570bc5a586 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 52/90] moc: rebuild against ffmpeg-5.0 --- srcpkgs/moc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template index c42be650a1d2..4b95426599bf 100644 --- a/srcpkgs/moc/template +++ b/srcpkgs/moc/template @@ -1,7 +1,7 @@ # Template file for 'moc' pkgname=moc version=2.5.2 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel From 7cfdd8710c5d30875c2290ead98760775dd303ae Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 53/90] motion: rebuild against ffmpeg-5.0 --- srcpkgs/motion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template index 14ebb0b32118..efda46aec518 100644 --- a/srcpkgs/motion/template +++ b/srcpkgs/motion/template @@ -1,7 +1,7 @@ # Template file for 'motion' pkgname=motion version=4.4.0 -revision=1 +revision=2 wrksrc="motion-release-${version}" build_style=gnu-configure hostmakedepends="automake pkg-config gettext-devel tar" From 46aab0de546d361950a15a28264382b4bc42a2ae Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 54/90] mpd: rebuild against ffmpeg-5.0 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index b34c78c11815..7a61651ab8fd 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.23.6 -revision=1 +revision=2 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled From ec208de5967bf8bb0aeb8a1024ec830e7a5a2a24 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 55/90] mpv: rebuild against ffmpeg-5.0 --- srcpkgs/mpv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index f7093a16fa85..5d016e225da5 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.34.1 -revision=1 +revision=2 build_style=waf3 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive From fdc0f4ff13d0db030510ed4b04491e5ccd93f569 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 56/90] musikcube: rebuild against ffmpeg-5.0 --- srcpkgs/musikcube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 01afa616123a..1be832b772e5 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,7 +1,7 @@ # Template file for 'musikcube' pkgname=musikcube version=0.97.0 -revision=1 +revision=2 build_style=cmake make_cmd=make configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true From cc35cc02c174da237544e425a25aaf6b1526f84c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 57/90] notcurses: rebuild against ffmpeg-5.0 --- srcpkgs/notcurses/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template index 724e7b7f2475..22652caeaba9 100644 --- a/srcpkgs/notcurses/template +++ b/srcpkgs/notcurses/template @@ -1,7 +1,7 @@ # Template file for 'notcurses' pkgname=notcurses version=3.0.8 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)" hostmakedepends="pkg-config $(vopt_if man pandoc)" From b5eb443f21f6a6a82ee1dfb263127315bbafdba7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 58/90] obs: rebuild against ffmpeg-5.0 --- srcpkgs/obs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index df6ee22e52ee..5c33b20aa58c 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs version=27.2.4 -revision=1 +revision=2 archs="i686* x86_64* ppc64le* aarch64*" wrksrc="obs-studio-${version}" build_style=cmake From 87a604225a73fc769cdb719a90fbb800b166e652 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 59/90] olive: rebuild against ffmpeg-5.0 --- srcpkgs/olive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template index 12a46936c990..5290d8e5aacd 100644 --- a/srcpkgs/olive/template +++ b/srcpkgs/olive/template @@ -1,7 +1,7 @@ # Template file for 'olive' pkgname=olive version=0.1.2 -revision=2 +revision=3 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins" From 47cd17e7b125d9447b64c579ec4cdf0696deabf4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 60/90] opencv: rebuild against ffmpeg-5.0 --- srcpkgs/opencv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 10c687200014..02cc923d2341 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=3.4.15 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON From 6811cd580e6a13af28090efea1b08a86e04c0c4d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 61/90] opencv4: rebuild against ffmpeg-5.0 --- srcpkgs/opencv4/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 595d8b2e22a9..06986920b1c6 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -1,7 +1,7 @@ # Template file for 'opencv4' pkgname=opencv4 version=4.5.3 -revision=2 +revision=3 wrksrc=opencv-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON From 0d9f863dc433eb6b0317502ff712263eef44a616 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 62/90] openimageio: rebuild against ffmpeg-5.0 --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index b63eca2ae31c..688552b0af21 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=2.2.15.1 -revision=3 +revision=4 wrksrc="oiio-Release-${version}" build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1 From 561a84ed53940e1991e44b0aaaef9b861077cb7b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 63/90] openmw: rebuild against ffmpeg-5.0 --- srcpkgs/openmw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 581e2cbb081e..9a263c9eae45 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.47.0 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake # System bullet doesn't use double precision (double precision would break vdrift) From 5f6752c64097370bbcb0b36a48664506b9a124bb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 64/90] osg: rebuild against ffmpeg-5.0 --- srcpkgs/osg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 08bf6d4b6591..9b80c81617ce 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=12 +revision=13 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake build_helper="qemu" From f7f65a78b7ce7c6a4fec2e0be683090f4a6135a7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 65/90] ppsspp: rebuild against ffmpeg-5.0 --- srcpkgs/ppsspp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 38308424f58b..c76458459ec2 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,7 +1,7 @@ # Template file for 'ppsspp' pkgname=ppsspp version=1.12.3 -revision=1 +revision=2 _glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8 _SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1 _armips_commit=7885552b208493a6a0f21663770c446c3ba65576 From ad44337b7c6558a31b4651a7d6ccc790485c2991 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 66/90] pqiv: rebuild against ffmpeg-5.0 --- srcpkgs/pqiv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template index 542fc27a2d32..9308d949b6a1 100644 --- a/srcpkgs/pqiv/template +++ b/srcpkgs/pqiv/template @@ -1,7 +1,7 @@ # Template file for 'pqiv' pkgname=pqiv version=2.12 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg-devel) From 54857661001dfc4de2be7ecfeeb4a45ac9c864b3 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 67/90] qmmp: rebuild against ffmpeg-5.0 --- srcpkgs/qmmp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index df7b57da7ed6..4b9cc799ce69 100644 --- a/srcpkgs/qmmp/template +++ b/srcpkgs/qmmp/template @@ -1,7 +1,7 @@ # Template file for 'qmmp' pkgname=qmmp version=1.5.1 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" From a5e1ffd39709efbf89636da7e1e955c55a19d7d4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 68/90] qt5-webengine: rebuild against ffmpeg-5.0 --- srcpkgs/qt5-webengine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template index 213672ab215c..af54e123bd8d 100644 --- a/srcpkgs/qt5-webengine/template +++ b/srcpkgs/qt5-webengine/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webengine' pkgname=qt5-webengine version=5.15.8 -revision=1 +revision=2 _version="${version}-lts" _chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5 archs="x86_64* i686* armv[67]* ppc64* aarch64*" From 335bf064268a3d95146e5e7a1c9b98a0a1d1af64 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 69/90] qtav: rebuild against ffmpeg-5.0 --- srcpkgs/qtav/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template index 0d85ec076482..4f8e391dc210 100644 --- a/srcpkgs/qtav/template +++ b/srcpkgs/qtav/template @@ -1,7 +1,7 @@ # Template file for 'qtav' pkgname=qtav version=1.13.0 -revision=1 +revision=2 wrksrc="QtAV-${version}" build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" From f20f324c6e003e1e899cc0aa9d2054757f07d5ed Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 70/90] qtox: rebuild against ffmpeg-5.0 --- srcpkgs/qtox/patches/ffmpeg-5.0.patch | 79 +++++++++++++++++++++++++++ srcpkgs/qtox/template | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qtox/patches/ffmpeg-5.0.patch diff --git a/srcpkgs/qtox/patches/ffmpeg-5.0.patch b/srcpkgs/qtox/patches/ffmpeg-5.0.patch new file mode 100644 index 000000000000..950dcd886ea6 --- /dev/null +++ b/srcpkgs/qtox/patches/ffmpeg-5.0.patch @@ -0,0 +1,79 @@ +From 15673a52b6b4805d482b69281e21947fb7096e05 Mon Sep 17 00:00:00 2001 +From: Anthony Bilinski +Date: Thu, 10 Feb 2022 17:24:38 -0800 +Subject: [PATCH] fix(macOS): Update video API usage for newer libavcodec + +Newer version of avformat_open_input, av_find_input_format, +avcodec_find_decoder previously used non-const pointers that are now +const. Support both version for compatibiltiy with other platforms. +--- + src/video/cameradevice.cpp | 9 ++++++--- + src/video/cameradevice.h | 1 - + src/video/camerasource.cpp | 3 +-- + 3 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/video/cameradevice.cpp b/src/video/cameradevice.cpp +index 3b07968b32..a012a0f78d 100644 +--- a/src/video/cameradevice.cpp ++++ b/src/video/cameradevice.cpp +@@ -31,6 +31,9 @@ extern "C" { + #include "cameradevice.h" + #include "src/persistence/settings.h" + ++// no longer needed when avformat version < 59 is no longer supported ++using AvFindInputFormatRet = decltype(av_find_input_format("")); ++ + #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + #define USING_V4L 1 + #else +@@ -71,8 +74,8 @@ extern "C" { + + QHash CameraDevice::openDevices; + QMutex CameraDevice::openDeviceLock, CameraDevice::iformatLock; +-AVInputFormat* CameraDevice::iformat{nullptr}; +-AVInputFormat* CameraDevice::idesktopFormat{nullptr}; ++static AvFindInputFormatRet idesktopFormat{nullptr}; ++static AvFindInputFormatRet iformat{nullptr}; + + CameraDevice::CameraDevice(const QString& devName, AVFormatContext* context) + : devName{devName} +@@ -92,7 +95,7 @@ CameraDevice* CameraDevice::open(QString devName, AVDictionary** options) + goto out; + } + +- AVInputFormat* format; ++ AvFindInputFormatRet format; + if (devName.startsWith("x11grab#")) { + devName = devName.mid(8); + format = idesktopFormat; +diff --git a/src/video/cameradevice.h b/src/video/cameradevice.h +index 910873325b..c05f1dbed4 100644 +--- a/src/video/cameradevice.h ++++ b/src/video/cameradevice.h +@@ -64,5 +64,4 @@ class CameraDevice + std::atomic_int refcount; + static QHash openDevices; + static QMutex openDeviceLock, iformatLock; +- static AVInputFormat *iformat, *idesktopFormat; + }; +diff --git a/src/video/camerasource.cpp b/src/video/camerasource.cpp +index 134bc49afc..3a899f11d0 100644 +--- a/src/video/camerasource.cpp ++++ b/src/video/camerasource.cpp +@@ -278,7 +278,6 @@ void CameraSource::openDevice() + } + + // We need to create a new CameraDevice +- AVCodec* codec; + device = CameraDevice::open(deviceName, mode); + + if (!device) { +@@ -322,7 +321,7 @@ void CameraSource::openDevice() + AVCodecParameters* cparams = device->context->streams[videoStreamIndex]->codecpar; + codecId = cparams->codec_id; + #endif +- codec = avcodec_find_decoder(codecId); ++ const AVCodec* codec = avcodec_find_decoder(codecId); + if (!codec) { + qWarning() << "Codec not found"; + emit openFailed(); diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index f3fa78acb915..e90d434e370d 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,7 +1,7 @@ # Template file for 'qtox' pkgname=qtox version=1.17.4 -revision=1 +revision=2 wrksrc="qTox-${version}" build_style=cmake configure_args="-DUPDATE_CHECK=OFF From 7edde5416af29b7a463c8d0f188ff726aa4e1f6b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 71/90] retroarch: rebuild against ffmpeg-5.0 --- srcpkgs/retroarch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index bafac5d513a0..7b19803fbf41 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,7 +1,7 @@ # Template file for 'retroarch' pkgname=retroarch version=1.10.2 -revision=1 +revision=2 wrksrc="RetroArch-$version" build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking From 1ea1a543f902ac4503beb535a4847401f11b3578 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 72/90] scrcpy: rebuild against ffmpeg-5.0 --- srcpkgs/scrcpy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template index 42f57c3fb663..490c0442c361 100644 --- a/srcpkgs/scrcpy/template +++ b/srcpkgs/scrcpy/template @@ -1,7 +1,7 @@ # Template file for 'scrcpy' pkgname=scrcpy version=1.23 -revision=1 +revision=2 build_style=meson configure_args="-Dcompile_server=false -Dprebuilt_server=/usr/share/scrcpy/scrcpy-server-v${version}" From 61ff6a2ec881777d6864328430c0b75c4e1e6f58 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 73/90] siril: rebuild against ffmpeg-5.0 --- srcpkgs/siril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index a06f3352243d..424baf48cf76 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,7 +1,7 @@ # Template file for 'siril' pkgname=siril version=0.9.12 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel From 4edfc0af2a1f808cd7b7bbfbaee38a1621737e6b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 74/90] spek-alternative: rebuild against ffmpeg-5.0 --- srcpkgs/spek-alternative/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template index d65086b8f008..72747cbb0a02 100644 --- a/srcpkgs/spek-alternative/template +++ b/srcpkgs/spek-alternative/template @@ -1,7 +1,7 @@ # Template file for 'spek-alternative' pkgname=spek-alternative version=0.8.2.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common" makedepends="ffmpeg-devel wxWidgets-gtk3-devel" From 6aeea7c3714cef17f96409ca16a14de77708f24b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 75/90] ssr: rebuild against ffmpeg-5.0 --- srcpkgs/ssr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template index a6439c742b22..37976b35d7f7 100644 --- a/srcpkgs/ssr/template +++ b/srcpkgs/ssr/template @@ -1,7 +1,7 @@ # Template file for 'ssr' pkgname=ssr version=0.4.3 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_QT5=ON" hostmakedepends="pkg-config" From 0e2eaef9a04c503962bc790a5ca06b0f51000ceb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 76/90] sumo: rebuild against ffmpeg-5.0 --- srcpkgs/sumo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index f3cc1c4490ae..39c47a46b44c 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.12.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel From 59d53308ac8d17bf32bff8f6db15188668c44b5a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 77/90] synfig: rebuild against ffmpeg-5.0 --- srcpkgs/synfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index 87416c4a1731..c14771a9955c 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig version=1.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" From a468f00ea5a5d6620fe88873c02a6e6a571df411 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 78/90] synfigstudio: rebuild against ffmpeg-5.0 --- srcpkgs/synfigstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index 6c7e437732a0..800b20f696e4 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -1,7 +1,7 @@ # Template file for 'synfigstudio' pkgname=synfigstudio version=1.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-update-mimedb" hostmakedepends="pkg-config intltool gettext synfig" From 9d7c6495e11463f5335ed3dc6ac440bd241c8b5c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 79/90] telegram-desktop: rebuild against ffmpeg-5.0 --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index d778d218ef30..4452e74b3a86 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=3.4.8 -revision=1 +revision=2 wrksrc="tdesktop-${version}-full" build_style=cmake build_helper="qemu" From e1b054db5c34705eaed55ec63fe88718f6d2df3e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 80/90] timg: rebuild against ffmpeg-5.0 --- srcpkgs/timg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template index 91f1516b2597..334443d3f9bb 100644 --- a/srcpkgs/timg/template +++ b/srcpkgs/timg/template @@ -1,7 +1,7 @@ # Template file for 'timg' pkgname=timg version=1.4.4 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev" hostmakedepends="pkg-config git" From bbcd79a00670369e6382984dc62f7ae18ec5d839 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 81/90] transcode: rebuild against ffmpeg-5.0 --- srcpkgs/transcode/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template index 775cd09fc4e3..47aec6ae1399 100644 --- a/srcpkgs/transcode/template +++ b/srcpkgs/transcode/template @@ -1,7 +1,7 @@ # Template file for 'transcode' pkgname=transcode version=1.1.7 -revision=4 +revision=5 wrksrc=mojaves-transcode-tcforge-70badbfe3674 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" From 124aec5b9bca6c3fd19a820144caac9034f86515 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 82/90] tvheadend: rebuild against ffmpeg-5.0 --- srcpkgs/tvheadend/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template index 230ecb592571..4a4867b253e3 100644 --- a/srcpkgs/tvheadend/template +++ b/srcpkgs/tvheadend/template @@ -1,7 +1,7 @@ # Template file for 'tvheadend' pkgname=tvheadend version=4.2.8 -revision=5 +revision=6 wrksrc=tvheadend-${version} build_style=gnu-configure configure_args="--enable-dvbscan --disable-ffmpeg_static From bb6923d1a25bf0d03a785ecfd2b590dde7cee98a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 83/90] unpaper: rebuild against ffmpeg-5.0 --- srcpkgs/unpaper/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template index 38ed47a58401..064cca88cc73 100644 --- a/srcpkgs/unpaper/template +++ b/srcpkgs/unpaper/template @@ -1,13 +1,13 @@ # Template file for 'unpaper' pkgname=unpaper version=6.1 -revision=3 +revision=4 build_style=gnu-configure -maintainer="Orphaned " hostmakedepends="pkg-config libxslt" makedepends="ffmpeg-devel" -license="GPL-2" +short_desc="Post-processing tool for scanned sheets of paper" +maintainer="Orphaned " +license="GPL-2.0-only" homepage="https://www.flameeyes.eu/projects/unpaper" -short_desc="A post-processing tool for scanned sheets of paper" distfiles="https://www.flameeyes.eu/files/${pkgname}-${version}.tar.xz" checksum=237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930 From 35cf68d3f81eb10d5d829aaa629c740b48b9610a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 84/90] vba-m: rebuild against ffmpeg-5.0 --- srcpkgs/vba-m/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 8e6447f5c6f5..d98b4d9fd930 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.1.4 -revision=4 +revision=5 wrksrc="visualboyadvance-m-${version}" build_style=cmake configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE" From 15b316fb386454da9a4b56a5c46e07f9ef541fcb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 85/90] vlc: rebuild against ffmpeg-5.0 --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 14a00043a651..800009314203 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.17.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From 5cb0b13ddb0df65feccadc353584cf509aa1686c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 86/90] waypipe: rebuild against ffmpeg-5.0 --- srcpkgs/waypipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template index 31be3b1a0914..f7190653a187 100644 --- a/srcpkgs/waypipe/template +++ b/srcpkgs/waypipe/template @@ -1,7 +1,7 @@ # Template file for 'waypipe' pkgname=waypipe version=0.8.2 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=meson # lto is off because it causes linking errors in armv6l and armv7l (due to NEON) From 58bff2cf893e8a5d99cd1c45ea41d925c966d2d7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 87/90] wf-recorder: rebuild against ffmpeg-5.0 --- srcpkgs/wf-recorder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template index 8ca26d6ef458..a41f3d50c7eb 100644 --- a/srcpkgs/wf-recorder/template +++ b/srcpkgs/wf-recorder/template @@ -1,7 +1,7 @@ # Template file for 'wf-recorder' pkgname=wf-recorder version=0.2.1 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config ninja scdoc wayland-devel" makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel From a9f3fe9f9e8a34b44c326df5861dab95c51d9bd3 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:23 +0100 Subject: [PATCH 88/90] xine-lib: rebuild against ffmpeg-5.0 --- srcpkgs/xine-lib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index f713eff49b07..ef7bcca02b0a 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,7 +1,7 @@ # Template file for 'xine-lib' pkgname=xine-lib version=1.2.12 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss" From dc51fd892ae3e8ee1bd21f6072432905ab046c7d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:23 +0100 Subject: [PATCH 89/90] xpra: rebuild against ffmpeg-5.0 --- srcpkgs/xpra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 5bc9ea89fdff..91dddea47392 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,7 +1,7 @@ # Template file for 'xpra' pkgname=xpra version=4.3.2 -revision=1 +revision=2 build_style=python3-module make_install_args="$(vopt_with docs)" hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)" From 7c68d93c2374e849f6badfa872eb5877fdc270ce Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 15:03:00 +0100 Subject: [PATCH 90/90] pianobar: rebuild against ffmpeg-5.0 --- srcpkgs/pianobar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index a9b29e91993f..81efcd122c4d 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,7 +1,7 @@ # Template file for 'pianobar' pkgname=pianobar version=2022.04.01 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="V=1" hostmakedepends="pkg-config"