From 48ed34952bb3aa4c87b676a1a0ee86d5028fa1f9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 17:16:45 +0100 Subject: [PATCH 01/94] retroarch: update to 1.10.2. --- srcpkgs/retroarch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index ed8e9da4394f..59f266f4d1bd 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,6 +1,6 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.10.0 +version=1.10.2 revision=1 wrksrc="RetroArch-$version" build_style=configure @@ -25,7 +25,7 @@ license="GPL-3.0-or-later" homepage="https://www.retroarch.com/" changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=ff9c31abae19528275e40fbe49ef40be9410b4108513ae7dbf325e210e5b5bec +checksum=8ec7f464e8f2b0df2a52fc8e187c71684467aed1d59ee72238eaf65332b62189 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11" build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11" From b81559110adb28b48950b970fd4d7676c54c209b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 16:47:44 +0100 Subject: [PATCH 02/94] timg: update to 1.4.4. --- srcpkgs/timg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template index 7774d007cf01..91f1516b2597 100644 --- a/srcpkgs/timg/template +++ b/srcpkgs/timg/template @@ -1,6 +1,6 @@ # Template file for 'timg' pkgname=timg -version=1.4.2 +version=1.4.4 revision=1 build_style=cmake configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev" @@ -10,5 +10,5 @@ short_desc="24-bit color image & video viewer for terminal" maintainer="33KK " license="GPL-2.0-only" homepage="https://github.com/hzeller/timg" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=7607efaffbed0b65b3c824956de421b155a4f14243e7a752b19454f88bf9d563 +distfiles="https://github.com/hzeller/timg/archive/v${version}.tar.gz" +checksum=66d2e00b50068fd6638bb8be1859c50ca4f24caef751f9dc95b303f37fb07b1e From 3866d6c9c1a0213c1a9cc8bc9efe3cb58251e8c9 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Tue, 15 Mar 2022 20:28:48 +0530 Subject: [PATCH 03/94] musikcube: update to 0.97.0 and add MPRIS support - Update to 0.97.0 - Added patch to fix MPRIS support detection - Moved openmpt plugin to a separate package `musikcube-openmpt` --- srcpkgs/musikcube-openmpt | 1 + .../patches/fix-install-locations.patch | 26 +++++++++---------- .../patches/fix-mpris-detection.patch | 25 ++++++++++++++++++ srcpkgs/musikcube/template | 18 ++++++++++--- 4 files changed, 54 insertions(+), 16 deletions(-) create mode 120000 srcpkgs/musikcube-openmpt create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt new file mode 120000 index 000000000000..b3cc8e74bf48 --- /dev/null +++ b/srcpkgs/musikcube-openmpt @@ -0,0 +1 @@ +musikcube \ No newline at end of file diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch index 63537349f450..590f27bf1a7d 100644 --- a/srcpkgs/musikcube/patches/fix-install-locations.patch +++ b/srcpkgs/musikcube/patches/fix-install-locations.patch @@ -1,11 +1,11 @@ Currently all ELF files (binaries and libraries), get installed to /usr/share/musikcube. This patch moves all those files to their normal locations and fixes the code to expect that -diff --git CMakeLists.txt CMakeLists.txt -index d685695f..5ac43f1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake +index 62d3c003..01ef58ac 100644 +--- a/.cmake/InstallFiles.cmake ++++ b/.cmake/InstallFiles.cmake +@@ -4,7 +4,7 @@ if (APPLE) install(FILES ${plugins} DESTINATION share/musikcube/plugins) else () file(GLOB plugins "bin/plugins/*.so") @@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644 + install(FILES ${plugins} DESTINATION lib/musikcube/plugins) endif () - file(GLOB sdk_headers "src/musikcore/sdk/*.h") -@@ -237,20 +237,12 @@ endif() - if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + if (${BUILD_STANDALONE} MATCHES "true") +@@ -43,20 +43,12 @@ endif() + if (APPLE) install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube) else() - install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube) @@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -@@ -260,14 +252,6 @@ install( +@@ -66,14 +58,6 @@ install( # executable and shell script for daemon install( FILES bin/musikcubed @@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp -index 58bc4d2f..1670c2f7 100644 +diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp +index 31703117..53aa8a88 100644 --- a/src/musikcore/support/Common.cpp +++ b/src/musikcore/support/Common.cpp -@@ -90,65 +90,11 @@ namespace musik { namespace core { - } +@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) { + namespace musik { namespace core { std::string GetPluginDirectory() { - std::string path(GetApplicationDirectory()); diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch new file mode 100644 index 000000000000..dc7035d06693 --- /dev/null +++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch @@ -0,0 +1,25 @@ +In Void linux, elogind provides libsystemd + +diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake +index ce0eea9b..5b067671 100644 +--- a/.cmake/AddOsSpecificPlugins.cmake ++++ b/.cmake/AddOsSpecificPlugins.cmake +@@ -6,7 +6,7 @@ endif() + + # systemd / MPRIS detection + if (NOT ENABLE_MPRIS MATCHES "false") +- find_library(LIB_SYSTEMD NAMES systemd) ++ find_library(LIB_SYSTEMD NAMES elogind) + if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND") + message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD}) + message(STATUS "[mpris] setting ENABLE_MPRIS=true") +diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt +index fdee62d2..7a941d08 100644 +--- a/src/plugins/mpris/CMakeLists.txt ++++ b/src/plugins/mpris/CMakeLists.txt +@@ -6,4 +6,4 @@ find_package(PkgConfig) + pkg_check_modules (SYSTEMD REQUIRED libsystemd) + + add_library(mpris SHARED ${mpris_SOURCES}) +-target_link_libraries(mpris systemd) ++target_link_libraries(mpris elogind) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index d8d4e73d6b4b..580284d60f88 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,6 +1,6 @@ # Template file for 'musikcube' pkgname=musikcube -version=0.96.10 +version=0.97.0 revision=1 build_style=cmake make_cmd=make @@ -10,13 +10,17 @@ hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel - sndio-devel pipewire-devel" + sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel + $(vopt_if elogind elogind-devel)" short_desc="Terminal-based music player in c++" maintainer="eater <=@eater.me>" license="BSD-3-Clause" homepage="https://musikcube.com/" distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" -checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5 +checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5 +build_options="elogind" +build_options_default="elogind" +desc_option_elogind="Support MPRIS interface via elogind" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -56,3 +60,11 @@ musikcube-pipewire_package() { vmove usr/lib/musikcube/plugins/libpipewireout.so } } + +musikcube-openmpt_package() { + depends="musikcube>=${version}_${revision}" + short_desc+=" - openmpt decoder plugin" + pkg_install() { + vmove usr/lib/musikcube/plugins/libopenmptdecoder.so + } +} From 2e9cbe7ee2d813c1c8f4300d38419de40cb292b6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 19:10:10 +0100 Subject: [PATCH 04/94] xine-lib: update to 1.2.12. --- srcpkgs/xine-lib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 51cbd363f7ba..f713eff49b07 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,6 +1,6 @@ # Template file for 'xine-lib' pkgname=xine-lib -version=1.2.11 +version=1.2.12 revision=1 build_style=gnu-configure configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://www.xine-project.org" changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view" distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz" -checksum=ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005 +checksum=d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098 case "$XBPS_TARGET_MACHINE" in i686-musl) From 724bbd7ca08b211b1f5adbadd8a91ce6a5fd369e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 2 Mar 2022 16:35:12 +0100 Subject: [PATCH 05/94] 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 15ecbc6c73151d5e4c03d2b8d91edf3f15f0f44d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 21:50:38 +0100 Subject: [PATCH 06/94] 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 f128ff07a8ab941cf2945308a09e29760d4e7e03 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:15 +0100 Subject: [PATCH 07/94] 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 47a29570c9d01092836bea426b47b18de3a28c95 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:22 +0100 Subject: [PATCH 08/94] 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 19747cdf4e27eb8dfb9b544c643ead7b2942cf96 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:32 +0100 Subject: [PATCH 09/94] 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 36021a71cd02b8281f9e163dc89e67f173f285d1 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:35 +0100 Subject: [PATCH 10/94] 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 1d4f986f4d5697a37e0870876ad53490617dc026 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:41 +0100 Subject: [PATCH 11/94] 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 59f04444c5aa876af4a38ec5d4ccf387c99f99c0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:46 +0100 Subject: [PATCH 12/94] 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 d4d2fe029d1910c60d85f2cfffad3101dcd88d57 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 6 Feb 2022 04:02:50 +0100 Subject: [PATCH 13/94] 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 2d8a8b8b0df3..ee2a4316a34a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -386,15 +386,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 d019b005f52294474e591fb9d7890c79d90b3deb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 6 Feb 2022 04:35:01 +0100 Subject: [PATCH 14/94] libavresample: remove --- srcpkgs/libavresample | 1 - srcpkgs/removed-packages/template | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) 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 30fa0d2cce34..6668ad9126e4 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=66 +revision=67 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -203,6 +203,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 1b016c318ebdb94bed738e84fe2f54d764235377 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 15/94] 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 873d77cba7ae1c04a3912dda19bf244b013b61ee Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 16/94] 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 42f3380900824774a8292bab872b8aaa3f1193d5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 17/94] 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 3236cd8802446e8291aedd883f7a3e283808b00a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 18/94] 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 9cb4c6a0561e26c747c33268de0625c970801f87 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:11 +0100 Subject: [PATCH 19/94] 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 dc041234fddd8f8425bdcd71f71f16b78736045f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 20/94] 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 cbd152bdd809312bc09724aab32a83b94ec20f1c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 21/94] 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 64b77e9016fd5e6b761323db05503a9544639583 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 22/94] 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 e6ea26740759a0a1b8b1d71b62b141a60708b7d7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 23/94] 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 af9ca07a89b4fd5334b855ccb858f20b3f732bb5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 24/94] 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 fb0ec7d356b47d092c08ba410808073e5096519e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:12 +0100 Subject: [PATCH 25/94] 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 6b9d5c76d0bd1e4535ddaf57b38827b6a842053a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 26/94] 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 2708747046d7..eeb4da7d417a 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=99.0.4844.51 -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 1fdcdd5261dd4eac5f5a5f70f7146799896ba0dd Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 27/94] 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 a8cd59a0a9c9dbdc474f0801435c4d77f4c4628c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 28/94] 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 d552c286ab98e95772be039f0168f31a27cbe6ff Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 29/94] 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 fd9464fd790e85adc0cec7a9a2d779bd4e6be1b8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 30/94] 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 52ad815cbcd2d63f4662cf622dc93e44a47c4c7a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 31/94] 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 5b2171f44f5757ccf8eee0e18e8d21548ce05ae8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:13 +0100 Subject: [PATCH 32/94] 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 c1296caf57f9951c7a39b3917b14ffea1e690e83 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 33/94] 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 a606f5ff597c54aafd5c570955be2778ad3698f2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 34/94] 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 2a4c28adcc5f752f5547e862fd2f415365afc28a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 35/94] 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 bc4e5f6dc6ef20ac2aeb1c86d2aacd7c94effe59 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 36/94] 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 c4796b8c73c0..d484740037f9 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=2.6.0 -revision=1 +revision=2 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON From 40b2a81bce8728f80bfb55ee91aea9b4e48c5bfb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 37/94] 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 f41ef72217d97393bc1affb4da9141bec3443220 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 38/94] goldendict: rebuild against ffmpeg-5.0 --- srcpkgs/goldendict/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d558c18315fdeb38706853ae79622dc83ee6653b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:14 +0100 Subject: [PATCH 39/94] 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 dc77de85702b..1a09c7f06ba6 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.18.5 -revision=1 +revision=2 wrksrc="${pkgname}-${version}" build_style=meson hostmakedepends="pkg-config yasm" From c58a6db5a9923723f1568028f15dc455545aab50 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 40/94] 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 23df62e8272609d81bce75cc18f2e09a068e6fe5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 41/94] 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 f1540d6b6955311e456fded67c807ed93e39e921 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 42/94] 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 97e18f283f3649a82cec721ab09b41b35c3052e2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 43/94] 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 7baebe9c02765265e293c5f55d1fd86fe4621f07 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 44/94] 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 a60967d855381bad2ae026d17df8507e4c756476 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 45/94] 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 46d898853023..59be73111345 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,7 +1,7 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 version=5.91.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 514ba9a51ad3f374bf662d1b495745ba4106cbe9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:15 +0100 Subject: [PATCH 46/94] 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 45891cc0aa288eb66142dc54057736a6fea44d9c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 47/94] 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 a31240ff2766..9467a52c852f 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.0 -revision=4 +revision=5 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake From 78266903d6eda198a29fb6d4333a486b4fb6e280 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 48/94] 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 09695acf1238520bc655223842f5ac8ead72c248 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 49/94] 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 96d91ccd98d021702e13f1d112149fcb8fb54809 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 50/94] 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 527507ec28b49d65a91f5c75d906b7d98302496a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 51/94] 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 ba8b3dcc19e0..49572e52dd2f 100644 --- a/srcpkgs/mediastreamer/template +++ b/srcpkgs/mediastreamer/template @@ -1,7 +1,7 @@ # Template file for 'mediastreamer' pkgname=mediastreamer version=5.0.55 -revision=1 +revision=2 wrksrc="mediastreamer2-${version}" build_style=cmake configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0" From 134e2cbd184edffa6a498fc7bdf92929dd6c6e5c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 52/94] 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 25cabfea2132e56fde60cddc671bf2d02f8b72e9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:16 +0100 Subject: [PATCH 53/94] 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 3c97d541fbb3b1ada7b09334946726b2cb054e4b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 54/94] 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 9bdbb8432279aa724e55b6456adcce09961b5533 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 55/94] 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 e02ceb98349a01f940dd7438b1c78e6cf7084b08 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 56/94] 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 0cd1c2ba87e442941d5657d09c48b803b0d208dc Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 57/94] 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 1e4dbe6cb86b6736d65600a2adf5b0393b9f3321 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 58/94] 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 a29dc7c109a85cbbe1182089a04562fa6357df6b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:17 +0100 Subject: [PATCH 59/94] 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 14cd885934f774bc2a37c76264d8581b22739583 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 60/94] 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 580284d60f88..bdc1b917d224 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 -DDISABLE_STRIP=true From 1b7ef26ee217f4cc0047a08e10d47f0b5f5ad86e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 61/94] 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 9581a8e3de89..b74b03de5913 100644 --- a/srcpkgs/notcurses/template +++ b/srcpkgs/notcurses/template @@ -1,7 +1,7 @@ # Template file for 'notcurses' pkgname=notcurses version=3.0.7 -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 0b2cb0cef1cef628a23eb9e755153b0d5737d066 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 62/94] 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 f8599214a122..639c2f0c2dd5 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs version=27.2.0 -revision=1 +revision=2 archs="i686* x86_64* ppc64le* aarch64*" wrksrc="obs-studio-${version}" build_style=cmake From e35885ee2d63297c13aaa60907c98c787c0b5d46 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 63/94] 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 719105e1dd9e45ed8c5b9cfd6f2f7ecc5c9f7701 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 64/94] 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 f2ec03eaafa419ac5be980c4236a66fa596db92e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 65/94] 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 efd7c662147976bcca9af5865c020d239b6c58a7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:18 +0100 Subject: [PATCH 66/94] 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 6bd0f20de3a349522e88dcbb60696a08ccf99507 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 67/94] 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 b190671c78447d63e0052b04b8a9135d2e16c857 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 68/94] 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 a8c8043f98cabe9bc4dbc1ea5b01b2f99710cb85 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 69/94] 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 e3ae04e9098f6a2671253d8dc04e83995886056c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 70/94] 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 ce2a5126124178ee3a89b6f86e05cacb77b3f4f2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 71/94] 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 4fbc491f52020aeceff09d62fca1c3f05cf1ab83 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:19 +0100 Subject: [PATCH 72/94] 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 f1c62337baf7326c4da232033a5815a29bb8dd86 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 73/94] 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 338edf5ec121c9e9159274aacb4a28b3b92ed4c4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 74/94] 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 fc7ab5e64983b655a289a0d53bbe0fa8ba6e14be Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 75/94] 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 59f266f4d1bd..10b6ad310e59 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 233c505f1578680e924028f8b4cdeb21088c5a9d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 76/94] 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 59197aa527927aa343e252bea73d1f4b3ef6b9b8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 77/94] 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 a468d4308c02717f23d114c0d53f70a28fa86a35 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 78/94] 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 ff1dc8fbae25db52cf32f6691023872588475899 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:20 +0100 Subject: [PATCH 79/94] 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 b28a15086ca163fdd9183c932d60ca7914ebe01a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 80/94] 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 91f42c178e2a87868a35ee2013dc8e79d8521c59 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 81/94] 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 da3552ac5a049390938186697bfb70272a942758 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 82/94] 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 4f302612da487dc5ce2bab579ddb6fb471564c6c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 83/94] 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 cfa180ddfaf55c1a8ea6a887ac3789b1c220593d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 84/94] 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 1d25f4d85725367537475e9b3febaa24f32a8076 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 85/94] 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 bc6ba5270c171fedb6dece22077848406efe7baa Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:21 +0100 Subject: [PATCH 86/94] 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 da96f6914e4eb2e0007bbba4e6b37e70c2553951 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 87/94] 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 906fca5ffb04ebd3c32e22ba92149f401b7b4174 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 88/94] 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 138e2d72ef7707e6f5ac8425808d93d57cd61cab Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 89/94] 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 6d1cd045dda104783b11405346f680734a459690 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 90/94] 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 a0893730c5e0403b2441da0f5a6a2289bee3c2b9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:22 +0100 Subject: [PATCH 91/94] wf-recorder: rebuild against ffmpeg-5.0 --- srcpkgs/wf-recorder/patches/ffmpeg.patch | 172 +++++++++++++++++++++++ srcpkgs/wf-recorder/template | 2 +- 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wf-recorder/patches/ffmpeg.patch diff --git a/srcpkgs/wf-recorder/patches/ffmpeg.patch b/srcpkgs/wf-recorder/patches/ffmpeg.patch new file mode 100644 index 000000000000..06d31b03fd2c --- /dev/null +++ b/srcpkgs/wf-recorder/patches/ffmpeg.patch @@ -0,0 +1,172 @@ +From fcb219901b6b0aff8b261722ae173b60486fd76e Mon Sep 17 00:00:00 2001 +From: Manuel Stoeckl +Date: Fri, 19 Nov 2021 20:12:19 -0500 +Subject: [PATCH] Fix build with latest FFmpeg + +Changes to the FFmpeg git repository since version 4.4 include: +* Removing the deprecated av_register_all +* Making AVCodec const +* Removing the long deprecated AVStream.codec field +--- + src/frame-writer.cpp | 37 +++++++++++++++++++++++++++---------- + src/frame-writer.hpp | 6 +++--- + 2 files changed, 30 insertions(+), 13 deletions(-) + +diff --git a/src/frame-writer.cpp b/src/frame-writer.cpp +index 043d772..7614b0c 100644 +--- a/src/frame-writer.cpp ++++ b/src/frame-writer.cpp +@@ -15,6 +15,8 @@ + static const AVRational US_RATIONAL{1,1000000} ; + #define AUDIO_RATE 44100 + ++// av_register_all was deprecated in 58.9.100, removed in 59.0.100 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 100) + class FFmpegInitialize + { + public : +@@ -27,6 +29,7 @@ public : + }; + + static FFmpegInitialize ffmpegInitialize; ++#endif + + void FrameWriter::init_hw_accel() + { +@@ -93,7 +96,7 @@ AVPixelFormat FrameWriter::lookup_pixel_format(std::string pix_fmt) + std::exit(-1); + } + +-AVPixelFormat FrameWriter::choose_sw_format(AVCodec *codec) ++AVPixelFormat FrameWriter::choose_sw_format(const AVCodec *codec) + { + auto in_fmt = get_input_format(); + +@@ -117,7 +120,7 @@ AVPixelFormat FrameWriter::choose_sw_format(AVCodec *codec) + return codec->pix_fmts[0]; + } + +-void FrameWriter::init_video_filters(AVCodec *codec) ++void FrameWriter::init_video_filters(const AVCodec *codec) + { + if (params.codec.find("vaapi") != std::string::npos) { + if (params.video_filter == "null") { +@@ -272,7 +275,7 @@ void FrameWriter::init_video_stream() + AVDictionary *options = NULL; + load_codec_options(&options); + +- AVCodec* codec = avcodec_find_encoder_by_name(params.codec.c_str()); ++ const AVCodec* codec = avcodec_find_encoder_by_name(params.codec.c_str()); + if (!codec) + { + std::cerr << "Failed to find the given codec: " << params.codec << std::endl; +@@ -286,7 +289,7 @@ void FrameWriter::init_video_stream() + std::exit(-1); + } + +- this->videoCodecCtx = videoStream->codec; ++ videoCodecCtx = avcodec_alloc_context3(codec); + videoCodecCtx->width = params.width; + videoCodecCtx->height = params.height; + videoCodecCtx->time_base = US_RATIONAL; +@@ -321,10 +324,16 @@ void FrameWriter::init_video_stream() + std::exit(-1); + } + av_dict_free(&options); ++ ++ if ((ret = avcodec_parameters_from_context(videoStream->codecpar, videoCodecCtx)) < 0) { ++ av_strerror(ret, err, 256); ++ std::cerr << "avcodec_parameters_from_context failed: " << err << std::endl; ++ std::exit(-1); ++ } + } + + #ifdef HAVE_PULSE +-static uint64_t get_codec_channel_layout(AVCodec *codec) ++static uint64_t get_codec_channel_layout(const AVCodec *codec) + { + int i = 0; + if (!codec->channel_layouts) +@@ -339,7 +348,7 @@ static uint64_t get_codec_channel_layout(AVCodec *codec) + return codec->channel_layouts[0]; + } + +-static enum AVSampleFormat get_codec_sample_fmt(AVCodec *codec) ++static enum AVSampleFormat get_codec_sample_fmt(const AVCodec *codec) + { + int i = 0; + if (!codec->sample_fmts) +@@ -356,7 +365,7 @@ static enum AVSampleFormat get_codec_sample_fmt(AVCodec *codec) + + void FrameWriter::init_audio_stream() + { +- AVCodec* codec = avcodec_find_encoder_by_name("aac"); ++ const AVCodec* codec = avcodec_find_encoder_by_name("aac"); + if (!codec) + { + std::cerr << "Failed to find the aac codec" << std::endl; +@@ -370,7 +379,7 @@ void FrameWriter::init_audio_stream() + std::exit(-1); + } + +- audioCodecCtx = audioStream->codec; ++ audioCodecCtx = avcodec_alloc_context3(codec); + audioCodecCtx->bit_rate = lrintf(128000.0f); + audioCodecCtx->sample_fmt = get_codec_sample_fmt(codec); + audioCodecCtx->channel_layout = get_codec_channel_layout(codec); +@@ -407,6 +416,14 @@ void FrameWriter::init_audio_stream() + std::cerr << "Failed to initialize swr" << std::endl; + std::exit(-1); + } ++ ++ int ret; ++ if ((ret = avcodec_parameters_from_context(audioStream->codecpar, audioCodecCtx)) < 0) { ++ char errmsg[256]; ++ av_strerror(ret, errmsg, sizeof(errmsg)); ++ std::cerr << "avcodec_parameters_from_context failed: " << err << std::endl; ++ std::exit(-1); ++ } + } + #endif + void FrameWriter::init_codecs() +@@ -697,11 +714,11 @@ FrameWriter::~FrameWriter() + if (outputFmt && (!(outputFmt->flags & AVFMT_NOFILE))) + avio_closep(&fmtCtx->pb); + +- avcodec_close(videoStream->codec); ++ avcodec_free_context(&videoCodecCtx); + // Freeing all the allocated memory: + #ifdef HAVE_PULSE + if (params.enable_audio) +- avcodec_close(audioStream->codec); ++ avcodec_free_context(&audioCodecCtx); + #endif + // TODO: free all the hw accel + avformat_free_context(fmtCtx); +diff --git a/src/frame-writer.hpp b/src/frame-writer.hpp +index cb9ba73..88f1ae2 100644 +--- a/src/frame-writer.hpp ++++ b/src/frame-writer.hpp +@@ -72,7 +72,7 @@ class FrameWriter + FrameWriterParams params; + void load_codec_options(AVDictionary **dict); + +- AVOutputFormat* outputFmt; ++ const AVOutputFormat* outputFmt; + AVStream* videoStream; + AVCodecContext* videoCodecCtx; + AVFormatContext* fmtCtx; +@@ -85,11 +85,11 @@ class FrameWriter + AVBufferRef *hw_frame_context = NULL; + + AVPixelFormat lookup_pixel_format(std::string pix_fmt); +- AVPixelFormat choose_sw_format(AVCodec *codec); ++ AVPixelFormat choose_sw_format(const AVCodec *codec); + AVPixelFormat get_input_format(); + void init_hw_accel(); + void init_codecs(); +- void init_video_filters(AVCodec *codec); ++ void init_video_filters(const AVCodec *codec); + void init_video_stream(); + + void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt); 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 563f963b4bb22a29abec0661660fda28f8bb533a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:23 +0100 Subject: [PATCH 92/94] 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 1442a9655d87c6861694ef134fb5dc3938d5031d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 18:40:23 +0100 Subject: [PATCH 93/94] 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 6c7ca4347f25cfc5b6577497dbc8b10aa50cce13 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 15:03:00 +0100 Subject: [PATCH 94/94] 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 b7d991fef5a4..4b50bbbcf328 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,7 +1,7 @@ # Template file for 'pianobar' pkgname=pianobar version=2020.11.28 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="V=1" hostmakedepends="pkg-config"