* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
@ 2022-03-24 14:57 ` tibequadorian
2022-03-24 15:23 ` tibequadorian
` (21 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3611 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [ ] audacious-plugins
- [x] baresip
- [ ] blender
- [ ] cantata
- [ ] ccextractor
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef
- [ ] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer
- [ ] ffmpegthumbs
- [ ] ffms2 https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [ ] mgba
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv
- [ ] opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav
- [ ] qtox
- [ ] retroarch
- [x] scrcpy
- [ ] siril
- [ ] spek-alternative - remove? unmaintained
- [ ] ssr
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop
- [ ] timg
- [ ] transcode
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 89168 bytes --]
From 745ff016de40d713c67c91b8ee8ffc8687b181a6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 01/92] 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 b4550b2bf445b7609da32d595e930c5ec12b7e86 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 02/92] 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 84ba591dee40f8b893ab0ed16e07d81f10580c3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 03/92] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 45ca09f6044659e42faed6bb1e423f84ecb6bdea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 04/92] 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 <tibequadorian@posteo.de>"
+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 1fc01a4787a11eb4639df659b3250ae161d0dea2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 05/92] 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 <orphan@voidlinux.org>"
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 552feb348d32d94e662b4a41f2ce32e4af0942cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 06/92] 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 <orphan@voidlinux.org>"
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 951fade8df7c6316e3b3dba90bf3cb732e85ceae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 07/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 7612912bd74e32aa579b2acb6552e83608403695 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 08/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 21985001534ade07603a123d965b2f3f59e2628c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 09/92] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 86ae4b371cbf4549b430ef2203e73fca74f724ce Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 10/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 49c2f0b3efed3889e9ce759bd35996bb2000e2c9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 11/92] 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 <orphan@voidlinux.org>"
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 e7bd8605780415da702ca62bd6dee94fbdb6304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 12/92] 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 <chocimier@tlen.pl>"
@@ -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 f65bbde8bc501b5ae09d8face931f9d8ed454e66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/92] 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 8849aa721cb7da880421d1bf60f46d20081b8439 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/92] 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 030af5dedb63e8027321257044a1bdb6dd5091b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/92] 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 6f106464da18704f99f655de6be97cb03070f589 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/92] 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 753baaf67df0c0da2971419624b3b292ee6348ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/92] 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 <piem@piem.org>
+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 bfb610842496113214a92bb403eb9296c57133ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/92] audacious-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/audacious-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 07b9d099964299f4dbb7874f23cfd9995e9cf2f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/92] 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 8b25a106bccdf25120c3e84ba76c600be8968e16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/92] 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 3888e718af899e42a24f0fb9245ff1fc6f46d827 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/92] 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 8dce3319608aef1609ce0f8c4fb9ac521f6e643a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/92] 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 4c385178640dd48c3e01bcd56424009e522e3baf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/92] 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 f1f673cf15d3e320b5c1dec1fe591bd9eceb84d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/92] 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 <duncaen@voidlinux.org>"
From e89a9ebbcf7f19919391434539a4987dc5e5db1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/92] 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 a26be07b0d95f0a398d4926d52374e4018496524 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/92] 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 bd0f571ebe058bdffa4ddd7689f2dc46c54521ad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/92] 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 3449299f29ef31261c69bd53be7826322f67fe4e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/92] 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 1ffc1bc9907750a97109e214744651ebe8f53c34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/92] 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 800b54acbec25dcc338e7077af5c980cad15c546 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/92] 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 2a0af92c30990c1ca72e9f320b91676ca734f7a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/92] 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 8765d629cd473a88a9dfebcc779964d0515027e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/92] 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 72c435dcf9eb2a269bbd44b5982875e718d4e979 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/92] ffms2: rebuild against ffmpeg-5.0
---
srcpkgs/ffms2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f9d3057a78b11585103dfb43c531813d0368a39a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/92] 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 9c17741464e1ba00c04fd3f2e035e3cb69660c2b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/92] 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 a7589f1aebdfeb0a1507e20a9826d6e493f75cd9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/92] 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 13350061aca240c85f926bee70ee9126c7002807 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/92] 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 19684b36e18ad182a94af2073030c6f942e25a0e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/92] 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 59238a82e029c75935f8fcb55928d943487c3df6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/92] 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 6bae21540e5e3819d520ee8c372c00caf521364a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/92] 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 74421708bfe8d40604968dddddc6bfc112230feb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/92] 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 dac96755f974adc2a50b12f3a9bacc70668c890a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/92] 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 0b1709805d416d41974c5dc885fd9a44a058997e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/92] 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 c29d3e61165b684a6dc5a77add80b4cce69a5977 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/92] 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 57a8e2987ac7f877463971cb079dff5c9cbfa2c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/92] 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 38b9293e14d9566c83f7a97382c4378bdac805f6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/92] 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 2bbeafad62464d762acaaae6f9c357da64c29181 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/92] 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 720893e3b9f3c775b1dd565ad309a53986f7a9f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/92] 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 ded220469b6f7c33461f50ae10b5b665164c71f1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/92] 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 6abff36309668f7ed7c4ed046900a471145d7055 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/92] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 fb90952556256528ee0367f46aeb32d3c308d2f7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/92] 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 b273c4dce60b1e9656c542655f041c1f30e89d79 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/92] 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 55c8ab1840faf672f71e2f02d6952ad596677658 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/92] 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 86568d33ac47073bcdcdb65caf3111d3db440c4a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/92] 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 6b7d2965af3d0a43d81a0b857d0a24f5555cb233 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/92] 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 7bc4a18112ece972670ca671a6104fa94d5d29f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/92] 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 860c1a8c3d43e87a64c4089936e33133eebe925a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/92] 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 55dcdf56ebb9f813ccc93aae99141b64f2b9cc43 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/92] 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 715ea9c5350b2209c298213313aedc8030b0696d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/92] 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 3c961baef5f4a939e0b26c1d06aab24bbf459b1e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/92] 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 37fe18bf9b8b10d295f3d49f0e6111f8acea38f6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/92] 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 b4f7c4cad20b166944df3e70eede487af9d39fa9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/92] 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 55c2c4b9aa138d657ccbf4b9bd979d89c45b7847 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/92] 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 ad4a906aee2c9f11e5f0a59f9e248a93eea10b07 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/92] 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 aa5881469bf2654cca8157478e7ca8211436692d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/92] 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 e1033a80ed81209c476881eae69e57897f1da948 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/92] 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 713682d919263c09c6890fa7124338691b6df8c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/92] 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 e7fcaec5245c683980a5bbf3bfa59587ad6c3bc6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/92] 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 43fb4321d5ee4071276d78e2af22408192517672 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/92] 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 ce4211bd81ddeab030de0baf4cdb50cecc29b051 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/92] 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 73f850b72f642b3f4333549c45b15fcc1a832470 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/92] 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 5d23edb3219c9c44bd9fc21554557add27b7e1ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/92] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 76ecf34972ab26b40b552e9623c602f355f4c2c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/92] 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 ed8e9da4394f..f118848b9a15 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.0
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From a4209a2c3e36efc9fe7732f7f856c6ebe84008eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/92] 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 78f3b4967c9eb88772c956ec95d6e42f673d804d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/92] 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 192596e45fa8a00ed341f000aa229a3acafaa7da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/92] 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 f38d63c6bd17c86ae343eb35f9a244e0d8590575 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/92] 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 88419927f54df940c2e555bf69cee9df853f6cc1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/92] 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 3bd43d652d01f48ded10c0f8852b56381dbcf083 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/92] 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 476a16e4893fd7477b7cf83e30a1699fa4d1896b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/92] 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 ad8ad2b3f36591d9d4b17c1568245626a3b6c70e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/92] 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 4ce981357ef8dcac934a0c80ff96accba7299e90 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/92] 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 7774d007cf01..1681657338b5 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From 1f80e231349f49ea6c12fee007d354d2497e2f05 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/92] 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 3992058e85bab598c06dda9dd04ac230412a3751 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/92] 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 6a1a37a207bda25572c6fe6c21eb3ca8740e42d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/92] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..b05920d13101 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,7 +1,7 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
From a35d3c24d4914249dfbd6027799f258901119c06 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/92] 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 67f75ed4296e0dbff101759606e1af591009c590 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/92] 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 b95c6ad5a89828638d998cfb49e0b7212895bfd3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/92] 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 4864ac31fd0a3ce96dd58efbe53ef343209db421 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/92] 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 <code@mstoeckl.com>
+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 4cd76b1e5339471d5dbcc2fd0ae3440aab069bfd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 90/92] 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 4e5969521b35cc0ac016bf2c1f8ca6ce0d60ef31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/92] 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 96d0d4c048d0d8fd8ce548f0a33aef9e2f576e9a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 92/92] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
2022-03-24 14:57 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-24 15:23 ` tibequadorian
2022-03-24 15:51 ` tibequadorian
` (20 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 15:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3749 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [ ] audacious-plugins
- [x] baresip
- [ ] blender
- [ ] cantata
- [ ] ccextractor
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef
- [ ] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [ ] mgba
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv
- [ ] opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav
- [ ] qtox
- [ ] retroarch
- [x] scrcpy
- [ ] siril
- [ ] spek-alternative - remove? unmaintained
- [ ] ssr
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop
- [ ] timg
- [ ] transcode
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 108010 bytes --]
From 745ff016de40d713c67c91b8ee8ffc8687b181a6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 01/92] 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 b4550b2bf445b7609da32d595e930c5ec12b7e86 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 02/92] 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 84ba591dee40f8b893ab0ed16e07d81f10580c3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 03/92] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 45ca09f6044659e42faed6bb1e423f84ecb6bdea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 04/92] 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 <tibequadorian@posteo.de>"
+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 1fc01a4787a11eb4639df659b3250ae161d0dea2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 05/92] 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 <orphan@voidlinux.org>"
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 552feb348d32d94e662b4a41f2ce32e4af0942cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 06/92] 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 <orphan@voidlinux.org>"
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 951fade8df7c6316e3b3dba90bf3cb732e85ceae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 07/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 7612912bd74e32aa579b2acb6552e83608403695 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 08/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 21985001534ade07603a123d965b2f3f59e2628c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 09/92] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 86ae4b371cbf4549b430ef2203e73fca74f724ce Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 10/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 49c2f0b3efed3889e9ce759bd35996bb2000e2c9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 11/92] 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 <orphan@voidlinux.org>"
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 e7bd8605780415da702ca62bd6dee94fbdb6304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 12/92] 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 <chocimier@tlen.pl>"
@@ -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 f65bbde8bc501b5ae09d8face931f9d8ed454e66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/92] 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 8849aa721cb7da880421d1bf60f46d20081b8439 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/92] 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 030af5dedb63e8027321257044a1bdb6dd5091b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/92] 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 6f106464da18704f99f655de6be97cb03070f589 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/92] 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 753baaf67df0c0da2971419624b3b292ee6348ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/92] 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 <piem@piem.org>
+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 bfb610842496113214a92bb403eb9296c57133ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/92] audacious-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/audacious-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 07b9d099964299f4dbb7874f23cfd9995e9cf2f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/92] 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 8b25a106bccdf25120c3e84ba76c600be8968e16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/92] 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 3888e718af899e42a24f0fb9245ff1fc6f46d827 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/92] 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 8dce3319608aef1609ce0f8c4fb9ac521f6e643a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/92] 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 4c385178640dd48c3e01bcd56424009e522e3baf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/92] 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 f1f673cf15d3e320b5c1dec1fe591bd9eceb84d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/92] 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 <duncaen@voidlinux.org>"
From e89a9ebbcf7f19919391434539a4987dc5e5db1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/92] 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 a26be07b0d95f0a398d4926d52374e4018496524 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/92] 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 bd0f571ebe058bdffa4ddd7689f2dc46c54521ad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/92] 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 3449299f29ef31261c69bd53be7826322f67fe4e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/92] 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 1ffc1bc9907750a97109e214744651ebe8f53c34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/92] 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 800b54acbec25dcc338e7077af5c980cad15c546 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/92] 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 2a0af92c30990c1ca72e9f320b91676ca734f7a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/92] 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 8765d629cd473a88a9dfebcc779964d0515027e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/92] 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 dc580c92c69b9df2b76d34ec210cfb1019089d4e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/92] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 2be97631d7b75c7aab340c2b60c22651e03fa2be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/92] 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 0d97d174b3e1b38b5286e98bbabc7a2b47cc1274 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/92] 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 06e5b8306cb5af6c24c9e69df53bb799d26d13ff Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/92] 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 1eee61bd7ceff6f529c2850668367f99b01b4684 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/92] 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 e84a0758fd325d7153ea5cf2d47e429f9d822228 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/92] 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 7b7bdfc6de9b24fe7ad2167fcd497e528c11bf61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/92] 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 e31ebc7a40e5a7f92999b9dcfdf29921078f8117 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/92] 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 e87e9024a9e94853409002882d45ed76a0255185 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/92] 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 6b25f5291574dc26c6d4bc2db7d00840637e93cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/92] 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 bbbcd41ee7a07348aac11c55413bab4be8595a77 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/92] 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 6838402c5dda07bda6f6e52b5a359549ff01e39f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/92] 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 1f419a81b0d86ada085bd8ba55c52df4add7d963 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/92] 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 7c119d33439da907fef8da840f64918731424803 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/92] 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 a9a8745e48f67d8668bb76dfc01b9ed0135b9b6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/92] 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 4a9f22b89addad3fc70a9ec6224e2fc9aea00a64 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/92] 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 659697b9975c91875d6a51017d923e31ec839b61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/92] 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 2e623f8c08f240f13b3c83b10b4281102db9401a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/92] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 edc04cc0b4f18ed75aae4ed8db5ad1649fbde225 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/92] 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 2c6e3bedeafc65c7d0918cb363b69f7749b391b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/92] 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 b65f12413e3f643db53cb22537a2c3c1bd1c8127 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/92] 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 375bed2b17941b6c9ca564d33597961f8a5e122b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/92] 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 66b56f849bab8baff9994980af73bc857450a351 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/92] 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 35e914ce005587afdd370b1626a50071456cb1b7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/92] 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 bcd6003276a95beb417a03e2b79836be5b1b2201 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/92] 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 b1ae038789e735da42ba6da08e55baeac54871dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/92] 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 befc2d96e5f42052a1e2d3fec44f37a85351e599 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/92] 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 081f3e7247629019198fc1af4c207982e06eabe9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/92] 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 1d393e4471c29741e5a92332c9e8c5d1e750898a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/92] 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 37ff69240f0fbb0f234bab398bc8ab9c46a74636 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/92] 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 3ca1a975c829a49e7636846ba3a515abd0b5d82c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/92] 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 d5ddf0bc353f352d38df98ee76635df756c8eab6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/92] 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 7b7d21d7592e01f81f80106e2c05cc809a8168ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/92] 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 b68e5b83c8776479644e9933a0a23c1cd9cc8013 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/92] 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 e9ef12407256ba3c645b32d2b1d90bc4e9ae82a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/92] 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 75c44aee4214b7227201966e6a0b033012bbd44b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/92] 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 fb2064fa68504ecd160f7e896bc71698ca79d34b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/92] 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 cc1617546cd0aa4390f8bcdd46726f7d0a473ff8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/92] 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 533a000d615cc50c9f77fd0ab452eb07d8581c56 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/92] 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 99289e2153e14615bc0e00b167cca4cd53c92c65 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/92] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 14195961de4d3c79ad254e1737de8936100af0dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/92] 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 ed8e9da4394f..f118848b9a15 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.0
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From 014972c2a13a48ec6963b02b7ee2c94c0e128dad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/92] 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 68bbafd5c18bcc049d6be267552cbb0c23aa20e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/92] 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 e5e280d3584f7e9a235b3c4a3965b5fb0e1630e1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/92] 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 c3bc4838fb801ad9e6e416891857c2ed3fa5c31e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/92] 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 8b04ce20582811c3fc0afcd3064a42a85eb49337 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/92] 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 16c59946490562e1b88b4fa7384b471642dda598 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/92] 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 cb647a35e93c23e0caea73059a24bf06a2d98a25 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/92] 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 54aa6afae2ec6ff5dcdf8b3b7590b7154d6720a9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/92] 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 a2374e073d58268bae1dc30ecfeea5b7746309f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/92] 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 7774d007cf01..1681657338b5 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From ed1e5e01ffe49a0649865660180a016b7cee9314 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/92] 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 720b4e870641ea14741ef98f72b287f876060170 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/92] 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 848178dc41b1085ef06e9ef2a9671c17fa88b2c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/92] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..b05920d13101 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,7 +1,7 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
From 9345359a003bc1f0edc973ae85f18e9376d8bfe4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/92] 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 7071163433bac3cc90eb9431d2c8a6b97f109638 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/92] 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 431283098c32a511f3b89000ac243448140c5515 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/92] 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 5fa9a794d8a957554cac89a7dc3634e34252300f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/92] 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 <code@mstoeckl.com>
+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 d1715030fd898fb166a51f9df7a85030f7979dbd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 90/92] 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 2f402a456083d4ee9c7a8421e3a5396e47a7d847 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/92] 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 6ca53b0321246b5b7814e6b1cf46089965a48569 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 92/92] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
2022-03-24 14:57 ` [PR PATCH] [Updated] " tibequadorian
2022-03-24 15:23 ` tibequadorian
@ 2022-03-24 15:51 ` tibequadorian
2022-03-24 16:19 ` tibequadorian
` (19 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 15:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3776 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [ ] audacious-plugins
- [x] baresip
- [ ] blender
- [ ] cantata
- [ ] ccextractor
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef
- [ ] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [ ] mgba
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav
- [ ] qtox
- [ ] retroarch
- [x] scrcpy
- [ ] siril
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop
- [ ] timg
- [ ] transcode
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 109084 bytes --]
From 48d29e99c27e914dca88abd24c215c7491d4bfc8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 16:47:44 +0100
Subject: [PATCH 01/93] 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 <g33kk@pm.me>"
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 fb8fb0b004cefb92724273a6ed6df7e0660f1a80 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 02/93] 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 c6a85c126c455bdc0606b64239d6ef3620372cc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 03/93] 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 d6017e1b70ca8b03005bcdbe4680c916ece8c2a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 04/93] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 f0937a97b1dcc20b57a01894be61d3df535005d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 05/93] 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 <tibequadorian@posteo.de>"
+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 826083be3c5dcd7f77064a1263d5295a6f37a6fc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 06/93] 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 <orphan@voidlinux.org>"
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 3f4cdac9122b65ea2b9822c2fe6826e6f5cf693a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 07/93] 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 <orphan@voidlinux.org>"
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 bc1384f0c1f33985702fffeebe2a0b9bee78fc8e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 08/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 f174ec2c3e0a3e250caa239c3f1fd763a4ad9689 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 09/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 a35613d40b8dd85ece316390cb744304f67458ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 10/93] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 cbd9e548c6c77e8a6e9bcbd9de77a1e8ed330cfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 11/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 65c6222e9f6049dabc21f70fba12fb6cbf15ed04 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 12/93] 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 <orphan@voidlinux.org>"
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 e192798733c3e59f763fcb62823dc445b2feb0e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 13/93] 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 <chocimier@tlen.pl>"
@@ -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 b89c76c992b333800b5630829646badae38a61c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/93] 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 797c9df6af1c7488b9ad241615f2a25af3c36978 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/93] 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 b88e91c1ea037ce80bb5511cddb12f0fc9937115 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/93] 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 c7a4530c03883ffdc321907a16a6554be4c9c638 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/93] 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 f3792a191648135e49cf523f3931b1c6730ffdc5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 18/93] 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 <piem@piem.org>
+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 2f53bcc0e84b9a8cf3fdd5e2c1e7d16b94e08e85 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/93] audacious-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/audacious-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 cef8b3ca12b9c89bec34eacd9f178e680e81b411 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/93] 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 e1441654bf31d0fcb6a54255b9ee4d5f427e18ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/93] 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 13ac30f3ea102c8698e9ba53b12615c175de1b86 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/93] 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 4f83345c90acfc51f82a0a9949f3542a329c90ee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/93] 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 e0f140eb085eae3ce134cf51ab66a8895d368efc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 24/93] 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 929f6c171d9e978b5f6dc959ad7a85016165d991 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/93] 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 <duncaen@voidlinux.org>"
From 63339d63ddf6b5896581ce2f6deb25817f79e533 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/93] 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 97387015bc2eda43cb805ceed4581e7dafb1132f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/93] 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 2100ca79e69ff6b200df5e43e2193fb1dc04da62 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/93] 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 d12d748ce45b555a22f466968e1016549834c728 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/93] 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 5b394aefd4973ebb42eb2df1233f1cd146f0c066 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/93] 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 3197360e98cffb0b79e83a018d02b6d5f6de1765 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 31/93] 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 c486bcb902bd5bb677ec0ee0fe231422b7fa6600 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/93] 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 8c8e28e8584de4617b1433ef69d96f76845098ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/93] 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 d69fab72d943f4c5fd7d1a20b695764ba14ae001 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/93] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 e06a0992793757940cbb88eceda44758cf75b993 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/93] 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 0120feabc570ac7c4148621456af890727d677f2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/93] 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 c5c9f2a6df276c2b67d2b7add267d6654af4043a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/93] 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 f3dcaebdeee49d47867e4a88233a6bd24cedef17 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 38/93] 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 2c43b2451bc280a8472d47e96aabfb390f87458d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/93] 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 da13b3be8eec7e3c670aae04f3b804fbfba37a67 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/93] 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 58dfaaf37ce8b306619da6d0094fd5831b0e0e14 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/93] 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 263a896e9b20d79553800154dbc72ccc06988240 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/93] 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 8a5b972cc24e87be87e531c444aeee57a495aefe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/93] 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 c6c6e28c3f5ef2879f012e1ed8451f4d2de3f9dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/93] 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 f8fb8dbe842220d009ae09096850938ff4caf8df Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 45/93] 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 72f35ae498e75fcedfc150a5b4f0251302fb7a16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/93] 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 cf26b8a86e050fd200b4bffb890d852650bc4dd0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/93] 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 12bbe2e8737d66712735b6a6edf9c5bd407b211d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/93] 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 afde649dae1b7e3de3c1ef27d625053c4e386c37 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/93] 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 379fb0044ab1271255ac1e9e797ba42eedd0e2c7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/93] 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 99e84b5053d65f2334470ccc94ee28b15827cc31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/93] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 8aa1202d26617b394b831142c23164c48af8793c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 52/93] 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 bface4394c253ae8da8700cbc928f85662de89b7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/93] 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 7ec6478a0b92d020e262f6b519ca8303d4b7fe12 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/93] 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 85f328811e8dff4429b3a2150aa90a3bb6293775 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/93] 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 532c1b361d7bbf4bb23ff5a3055fd8e25cc29539 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/93] 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 1cc1f6defaac9095ba3c99067129ceb8926bc52c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/93] 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 fbcfa20170c1c8635424a5c0b0d97e124cc3afcd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 58/93] 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 8ad686b4ee5a9eb747aee2cfe9fa45989e07c008 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/93] 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 d44d67e61d042c21fce7fbe1f534b4ce0629f944 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/93] 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 35dc8e305bf985b25120d302f217773c9360fd64 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/93] 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 ebb9ca47f6499bb4425047559f4bf20467be4fbf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/93] 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 66668aa229f0a263a9d0386711d6654f4d6458a6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/93] 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 b03860d9ca2ff09f109e1cc284edd769f8954820 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/93] 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 61776e8e8954b12c1659e00b97a725d1f2ff6d0c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 65/93] 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 24d2433ee007904afe5ab7ed6eac0895a1b8f039 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/93] 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 75a2d16954844332c0673f69403c89be5e0df827 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/93] 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 9255f6a5b2b26036d7d894af2ea464b50d12192e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/93] 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 b56032ac4d7435d001090a1e2ee11a1b3151b557 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/93] 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 cb82cd8286e00a2a1a9ebd59b5b34f34bb8081be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/93] 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 f7f710576669c228c5eadd270fed4de06be785fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 71/93] 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 81a1796b428ce2faef49546d73fd878e7719299a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/93] 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 4316208cdc0ad50b645b8db3cdbf01b2769c8376 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/93] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2617211a8e398b4e27126e49e49ef9254aecf594 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/93] 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 ed8e9da4394f..f118848b9a15 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.0
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From 4e77553ee609e0ca1aaf3abf34fbf53344533851 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/93] 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 d930a69362b5c1c370bf2aa91429cc491b726627 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/93] 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 3707f022e8fd4f063bc15fb9ad8564f4a068a9e1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/93] 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 ac2da5eb2e757c46527485590b30d35e1ef5ca03 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 78/93] 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 08e8233559d5eb7fc49cbd35e6870f4f2d6952f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/93] 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 632497c74496d5e66b2475597d20fd5643d0e6ee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/93] 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 2f07eb0fbd4a287e78241098e71e7a37075b4677 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/93] 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 76d7d1e946023c6648f006497a1e182f182df1d3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/93] 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 9f1b29d747ad1aa25c6e05af6524e559769de854 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/93] 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 bd2f6b266628258b8e8b098cb2913aa0e303ed49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/93] 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 80ceda0a44b9e13724013f44e554fb070c37454c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 85/93] 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 49667483a5c2bcb1bf6350691070ab7da3a93800 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/93] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..b05920d13101 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,7 +1,7 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
From ef65101dc17525ef4a07aa0f363f90f2758b4cfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/93] 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 5705797ccb3758e0ac945399e3c8e09a0dfd40e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/93] 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 c7ad6eae8c3aedc65b0c4ab6d63b61cb48de3f51 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/93] 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 cd05fdb6811c9947d8b93ac2c3cf74e2d9dfbcfe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 90/93] 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 <code@mstoeckl.com>
+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 022521ceca97f82394d92813d62459bc40c48b87 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/93] 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 80e7fc064584e22b5e97302a20f183d109f369eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 92/93] 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 3b69571fac088bfa092b24e2013a58b5b21c170d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 93/93] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (2 preceding siblings ...)
2022-03-24 15:51 ` tibequadorian
@ 2022-03-24 16:19 ` tibequadorian
2022-03-24 17:58 ` tibequadorian
` (18 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3897 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [ ] audacious-plugins
- [x] baresip
- [ ] blender
- [ ] cantata
- [ ] ccextractor
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef
- [ ] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [ ] mgba
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav
- [ ] qtox
- [ ] retroarch
- [x] scrcpy
- [ ] siril
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 110305 bytes --]
From 48ed34952bb3aa4c87b676a1a0ee86d5028fa1f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <g33kk@pm.me>"
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 <sn03.general@gmail.com>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>"
+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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <chocimier@tlen.pl>"
@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <piem@piem.org>
+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 b0149c8e3ca21731bbb692527f0bba56271fff26 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/94] audacious-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/audacious-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0d21c6945ea9e7d5464a6a26625280c1aa2f9037 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 501e3b1dda61e2dd32fb9d3cd5698dab0900f8ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a1da2364bd2be7f8fd5a970f637f1f94f2f47858 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 c36369e7335d722d1ad2dd62ed93fb4becc5f28d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 f856d0742eae66a84a9e99b5bff428d804439491 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 b485b580587e89a5b42a65a0a7a6b6086a7276b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <duncaen@voidlinux.org>"
From 4b935068293f359464ddd4f773f88bb76844b5d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3c8ad7b78330984e6fcdaec0ef478b0f80b57b51 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 2212c96f2787f6ba1e12876ebb1ba528d93d966d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 88d5fe9e1235a0eb9ece3729a21327615e2b8d6f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 fe114df348f61215b71eaf5fbdf51d21964e6c88 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 8cc41f82734d03cfee21f0c16113f9ea2243fc30 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3cac8ec72c825f72f8de37a45b332962b6f5ed25 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 de88d038f3911ac099f7e12e3683d829ff72cb1d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 839d6416d025a5d0b93c6280a8fe4fa3479f133c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 235c27824a6cabd443fff7137084a46d70e0f8a2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 dab10d7bcc61d4013aee397b9672c427b29ed959 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d2db7feed938252e1fb6e87e1cbc0972c7ac0d96 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 2dc5677058b1dc646d4a0fd269ab2b2f6e13a752 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 c8b1680948b4ab647e055d44b1bef6872ace0d7e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d66c85d135fd5a779a69482ff1b27bc14526e10f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 2569add787e6157f49570ee8eb81d7d2d08967ad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a414294f5207c6550e9c26d8885c1d879b8bbb93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 b74ee400958e68c7f10dca39479f4e892b6547da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4aa2acadb1a685f3f5c6964f5af6fe17efd12eda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 feefeb7dcd278ad9b36f6daa6a6ef6f245c3d2ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 f5674a02f10ba72e9adc18a623ae3e49e8472b5a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 e77eb91f5d7d44459ff63d6430095183d1a2d1fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 407a3b5d6f73cec95fa73da1c8e26a1c985b3bdc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 9f4255663f3785374fd570df79bce331a87953fb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 9c51a7fc8d32010d83952d0aa7e249c563014768 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 c09927f582f07c26d8bfe960211c981096bc9de1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 52/94] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 14332acf3dad5e20f495ec70a377bc3e20be2713 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 ac11ba042380d665b047740cbae8dd295d3eed91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 13c54e027b44e9f47dde58178ac3fb57c3cac851 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 49748665d2e8060197329294ce1a74b54a992315 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6aa371ff920a4987b044531c847a9c4ba7fd19e6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a0e8ecfe273dfdebaf9290ca603aba74102bc046 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 1b0d029e04a84f9d36a2399667de85051c2857e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 40dc98174949e9150bf03db60ec08701b85fba66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4a0a842e04f4b083e8935a0375d817135d859b99 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 fed393c3f8afb4175436a4ca7a7214f14b24262c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 38e1a55b10d5ccf7d2f689fb51a8a58688eeaabf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d41a5caaaadadd581ef3da6587aad5f1a1d6e69b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3e6b140c8bf414fc507817b41b1514513eb9cb64 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 69b7b3478aab818cd8290bcd94fe9296b2d77999 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 78ebd723e5625b2833a8adf4f2c1addc7c0674f7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 f2da6ebe2f819426a42866abe0777180b4bba8dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 9a5a8e1cf2c6c641ec952a1c0b42a262ac3ecf98 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 1bcd934c71c6707c648161380c31d5dcac8a0756 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3bca354a2c50fbdf3843824a5dffeb1d031b8f21 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 dff4921b40438c2057e604a66f109d806252d60e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4606300f2530b32672d23e3d7833c0983f3fbfe8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 89c15865d445b02aa163b5105e0b21c939e64414 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/94] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 1dbcdb3c52456565dd92ff5eb54db95553d2c727 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4a34f63bd705ad7209daade8a6c0722fe587a885 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 abf687a3d566d07e9e17a746a8792e3b9b41029a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 db2071f516386a530bd5c02cb1d695394eb1c011 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 38495b4f99e785d9638a60cd177ad7ccb8d73143 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 8d5279ea3bced0e603819e9416379fb45cd9671e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 b9b7e0ecc1ba3974168d56ab98946c719e9f7ab3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a500511a81219d91e105827dbad4f2fb7ec72db0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a7aec2d62de0d15b6b1df23767733025d23f8570 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 275bdd61986839e93e19ccaae614096430b36cd0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 e5ba221c2b975dff239715f877d338562ad2a213 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 eb0e79ef79e7c446118136a47260ac796d57e897 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 2491a2223d81387524c141076245d1380fe1fb19 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/94] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..b05920d13101 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,7 +1,7 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
From 72d96b173beaf4f523510a44f26ac48afbc19209 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6034042f3c8c4bc95e4087ab0b46dcae855ee32b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 2a0e4df17eee3a54d67d7d9e302cfa153a96ebbc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 fbc6175aa3b11cc38df7ac85a8c306cec098cddd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <code@mstoeckl.com>
+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 5f5f47abd1f8a40d79a26157d10ee8d0ac3995eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 48f2e14dc5e98e32e49d94c84c21e0fb2536eef9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 f88342c43de03a309bd526dede07a44091644e0b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (3 preceding siblings ...)
2022-03-24 16:19 ` tibequadorian
@ 2022-03-24 17:58 ` tibequadorian
2022-03-24 18:14 ` tibequadorian
` (17 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 17:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4659 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [ ] audacious-plugins https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [ ] mgba https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [ ] qtox https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 121289 bytes --]
From 48ed34952bb3aa4c87b676a1a0ee86d5028fa1f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <g33kk@pm.me>"
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 <sn03.general@gmail.com>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>"
+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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <chocimier@tlen.pl>"
@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <piem@piem.org>
+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 <tibequadorian@posteo.de>
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 <john@jlindgren.net>
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <duncaen@voidlinux.org>"
From 1fdcdd5261dd4eac5f5a5f70f7146799896ba0dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <code@mstoeckl.com>
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (4 preceding siblings ...)
2022-03-24 17:58 ` tibequadorian
@ 2022-03-24 18:14 ` tibequadorian
2022-03-24 18:41 ` tibequadorian
` (16 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4709 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [ ] goldendict
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 114769 bytes --]
From 48ed34952bb3aa4c87b676a1a0ee86d5028fa1f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <g33kk@pm.me>"
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 <sn03.general@gmail.com>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>"
+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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <chocimier@tlen.pl>"
@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <piem@piem.org>
+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 <tibequadorian@posteo.de>
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 <john@jlindgren.net>
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <duncaen@voidlinux.org>"
From 1fdcdd5261dd4eac5f5a5f70f7146799896ba0dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 047acc3604c793fb91363b7548e7b3daba23d38c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 91/94] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From a0ce2a6d7d98c13dd1d3ad165f8a9b05f37d515d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6223a61a1eeec7229b8496480daba0a72277c0dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 667dfb0d9eb77fdc0696e97a71f783a54da48d7a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (5 preceding siblings ...)
2022-03-24 18:14 ` tibequadorian
@ 2022-03-24 18:41 ` tibequadorian
2022-03-25 23:15 ` tibequadorian
` (15 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-24 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4988 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 125005 bytes --]
From 48ed34952bb3aa4c87b676a1a0ee86d5028fa1f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <g33kk@pm.me>"
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 <sn03.general@gmail.com>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>"
+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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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 <tibequadorian@posteo.de>
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 <chocimier@tlen.pl>"
@@ -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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <piem@piem.org>
+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 <tibequadorian@posteo.de>
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 <john@jlindgren.net>
+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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <duncaen@voidlinux.org>"
From 1fdcdd5261dd4eac5f5a5f70f7146799896ba0dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 4fde67bc9d9c0c5713c323166fe1b142d529d5b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 38/94] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From 8b9b62d7f5eb2feb0ace116166f3ee1ec6e2d9f7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 522115fc273850fe3cd92d3bb38dda27abbf42f2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 ddde44ef54cce029db7e579f686ef8d91767d14c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d4d3dc23b3b2f04735de9c7c10ced28378e3cb5c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 c1e663fd2f28d501169efe44bc3bc12dc4389585 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4320c9dd7c6c5c12982bc412132a53f6aeafe2cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 fe3e4efde075f949db3e6573ab697dffe085f457 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 a10706d7fcad34a1bfe9740fcc51427031d3288b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 82130fd3b0e910bf65b0207df197139a49d54170 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d8dfb35d1df951a0f928e177d135fbf86089fc63 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 62df712cffe236e7865fc54601981a65ba8c684c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 0dac2bcf79c7d989b664fb1199abdc092c2941d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3cf64a2127841adfdd7ea8c8db90b97567f89f6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 e251c839753658776f55a31009e9d88a9d1cf805 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 b6a3f6979a1bc9a50142e79af992a3692ce33e52 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 36c5d6c15d07ab256ea73de89bb7d7a21df76ea8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 ed7e88a98918fea1e2a19135d61cb40800d0ce4a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 00a299d34ab79e67cc6c03faa8f0863c4f13b340 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3f2ea6b883ceaa51c1c47cc63746c865d1e5bd04 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 70c3bd82ce213c9e07a22c886cb9a695e142a00f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 573b197ffb5a74898fedc6fd740c43f7f5d92168 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 bbbb9db6014e3a8012c23f475461adf341fe1683 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6755237ed808cca2a78b2a8eec24b346226d41af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 bee2892eb22608d8c38beefd5d964a669157f50f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 7e8ee4af5b0c8d81f0f753550380941fe0a00a4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 68b5106710c6297eed117480fa9e37969acb0199 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 0b949a06e26853a0da594b72d6a817695baf9b77 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 0206fc928cebbdb08e22866010779b5de8836630 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 57cc857aa3716a5451a6562d1c36958bebb1e74b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 17a5a4b91b89f4e9c6abbb47b746c967ab905702 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 04946819c0996d46184479875bf4f52c7d0a5eb8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4ac05b22a097b16f95d4c3e5ff0a248b521b7a66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6fa6a37f1a5d448c590641e77f593af435679509 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 40fde49748116bb855d4bae0a11f48d9ae527227 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 29cddebe69dda5bf2f43a83df9abce2e42075f9a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 5b9936542e7a42af1aad91922571ef6ede34044b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 129a71fe00e5e0f30abf0dbae8b592132564786c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 42f46db25afbdcf7a0e5a05b410179d3cfeaa05c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 32f1ca7d77a14fef32141e8ba5f5e4fd41a4c227 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 e584badb27693db0d27d20e96c60d05b5035cf05 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 1efe519568a9eaa84da78286e501df0cb289fbb9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 853d3bfe6e819a2332725968a85ec0cf6440fb59 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 3d6650f1a7189fbad236fb864f7d07bbd9b7fde7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 d00ceb72c77e351e14f303077b72d35429b22d78 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 4aad393cd252960753597e2f047255edf60f3a52 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 df723e1691c357faebf0e8b1b76fa2269bbea4b1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 c9bef26d7559a684b659470492d2992d507f8c16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 212138b5e8c41d3e0508f13b22bbe5b14e03939f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 ef40f322f0b2a1941e2be95817af186984258448 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 101467c104df88e46ef5049c8b399f02b6320fe4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 dbd4e58a973ea7051cecfbab5e16923a41e4b5a2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 6090d1882bb90e40d6eb6d1bfcca927f8d3b6f72 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 ddc692a8fd7aa653a1befc4af455be71495b5ea9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 91/94] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 47a7ca16129e9547b06e47ed2ed7d5ae081e45af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 57a34c080ac4d82f49466f13f86aba55125f0524 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 7924d0a0c670e5b01d7d305ef0ca4f6f611ac857 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (6 preceding siblings ...)
2022-03-24 18:41 ` tibequadorian
@ 2022-03-25 23:15 ` tibequadorian
2022-03-26 0:52 ` tibequadorian
` (14 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-25 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5353 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav - fixed in [1.20](https://gstreamer.freedesktop.org/releases/1.20/)
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 123535 bytes --]
From 151d2ce19ab694ba1211131100560643cc4fa432 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 16:47:44 +0100
Subject: [PATCH 01/93] 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 <g33kk@pm.me>"
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 417bf48291f3429dcdd1f1d9a84d6bfd7acdc384 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 02/93] 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 bc1d6a73778a8caea03274de86fa88eb41397267 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 03/93] 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 5680c2ded6221371c41742d9f4aa630b15920034 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 04/93] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 6038e58f100095b77f08f4225b92eee589eb6936 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 05/93] 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 <tibequadorian@posteo.de>"
+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 d967f8936c0bfa2a4b4b9849bde1877bcf1b194c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 06/93] 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 <orphan@voidlinux.org>"
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 027555e16df780d0b01b1ee3d4914b77274dcac2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 07/93] 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 <orphan@voidlinux.org>"
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 520ad47f4c259f08cec7552bfb5cbd89c749df34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 08/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 ff7271ab2e02d0517f3a707d4f8b2b62cdf0e432 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 09/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 5deb7cbdd4cb1710c4b3ad760a46d14fd77acba0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 10/93] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 d30f7e6c0bd9db160bde663b9028ab64215ba9c6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 11/93] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 736f27e39038c162cbd1fd1e261ce633027f5e94 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 12/93] 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 7d323593a120..e9ad0f43e675 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 <orphan@voidlinux.org>"
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 885936f2d340adcbe89f9f39879dab6ab2ca7551 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 13/93] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..34a201f332ad 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -205,6 +205,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 adbadd74c06194d83e9479157d0283207a1db71a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/93] 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 c148b59c738ff4af6202330b1a9574d29548caf6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/93] 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 810a15eb490b8d38852598056ddd539d630f9ef3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/93] 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 da0ec2c7f62f0bded7e7ca7a4cfc2e3dc66f0d99 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/93] 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 c65c86ad62b9588728130356c55c1e5fd5186cb5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 18/93] 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 <piem@piem.org>
+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 c8a696ce740472d27a16189c33494a354259e7d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/93] 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 <john@jlindgren.net>
+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 4e75fadd87d235b54cfd3732691fed34df798213 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/93] 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 faa3fed48a6cd7fdef41d4f15a3824d02dc9c297 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/93] 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 cf47fc177f54dfcfdbe81f306424b1b8bfa4a9e9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/93] 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 780e8bb478178274ecf281f897084e6f134410a8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/93] 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 a2bd371eb87c262e5940f9ae73cb50b172316604 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 24/93] 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 5d18b7d18bf453c0188478dd7a7b445fda093264 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/93] 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 <duncaen@voidlinux.org>"
From d60e0a23c42956f51562d5784963a185cdbd065e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/93] 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 2ef2b7a02e2d81f14d96aaa9493e59ac96f32290 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/93] 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 8832e7f55c597344349bb3cfa34514fb567766a9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/93] 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 38c3a071b25fd4c0ad4de8ec0e38c43297fa27d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/93] 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 4f8070d7b1d1aeac928936833e920628b81f9c63 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/93] 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 a57a11860b9cbe9e9df419dca08852a7bab12849 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 31/93] 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 5a5ccd2c157aa90be6855264e8faa70058e1df66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/93] 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 2743791957109335ece548f3eee4c511a0d675c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/93] 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 a535da1b0f08c0ef2965c15f7c05557cabc86432 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/93] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 9d9ee347f7b8afe2e01b5ecefe9a61012d27efa4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/93] 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 e9d810371877f4428e98b907928ac6674ad2daed Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/93] 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 dfdbee6da90b05f6b531ba745b68d9979892952a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/93] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From a3a2cc517d98f3ae66fcf328045f470d48f1c6d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 38/93] 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 7948bde1f1813f59228890b4c0b238c04912578f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/93] 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 7647ef2756733c476c82a0539698a731b659e02d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/93] 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 ba9adec2d0bb0fef23435066f98fd5a42c088b8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/93] 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 57d367d6d4d2caf416cc77d91179dee7b1cd2518 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/93] 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 8066711eb35413cad129ba6f1f87d43b7a145013 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/93] 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 8a4e0f892339fd5d912877ae3c852ba0ef1c9c16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/93] 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 778baa1ac877f9b77b3ef23aea3719a90c7a52a8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 45/93] 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 e79dab11e14faf11503bc27b7feda07b1bfe1683 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/93] 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 9015a16daedf299ee7c91dd917be8af41efee76b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/93] 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 caac04f06835a0a3bb62c2168a637da778be8e99 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/93] 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 075770964cb277f9c66007efa23708ad185ed824 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/93] 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 a80bc1b801bc7a69565055c4fdb84dd7b7e17d8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/93] 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 8c903949673de77c0cd5909d5efbdfecf4f2e077 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/93] 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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 f901df0f1476479c414bbe7a3afebb7f4f2a1e23 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 52/93] 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 07276998f8d1f5a29754863c20b09aade8dc5542 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/93] 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 fbfd466b5bde180f019e9043a91e93a34f3d1272 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/93] 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 9d16ccc4a98c32bf2f746d130b10b20e8b72159e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/93] 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 9a04d2c1a30908b79b6122ca4a2320e943bcbf2c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/93] 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 a55e2db38807017a31d1611f1eac32b442e8e22f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/93] 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 21bbf7ad76dd0dd53f12617e0abb3925f44818c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 58/93] 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 3184658cfeeb1e832f6efb0f33f88ef05f7fba78 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/93] 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 8f950ded2b4d86555eadd93d4598b2f3cbc9bc79 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/93] 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 04596e6ce097dfa4073d8bf4d9465017a016a6e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/93] 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 fa0336577ddceb2b8a209437cd314f8983086fec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/93] 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 c1eca97f49c914f9be870f814ce989ef30675458 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/93] 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 00034c078e66e6cb7e8bd0821d31f8ff01eb9011 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/93] 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 d5cffc2d1f05e08bf087cf445e04a26c5538d586 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 65/93] 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 9fbe8144cbc0d238566556401d7bf8ab58e82295 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/93] 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 720034200b224875608c444f0e8718b698793d9f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/93] 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 0839b1905e83f85a17b14d844ff8e8b99905d3bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/93] 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 fd92a2012be6f289f20797cb85f8e2c8aac3a260 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/93] 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 8a153d004f4b0c7bcff062ad5827d5883e6cfe27 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/93] 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 8befe1c39c18af6c48bf0f20a69ee23d94b0ab4e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 71/93] 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 10eba8d265d0721ba3148837f341681002a4913b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/93] 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 7a56b5006d991503204f9f241038c188dece59e0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/93] 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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 9089d6b2cb6795b2855dac3f73e617e5beec81f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/93] 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 6b89a54d89a2..1c1f89d48dfd 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 37daf59be9491c2962bb21932cc7e007ad3bdd76 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/93] 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 790ed966075d6034c1e57f1308b5a94073226c61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/93] 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 d8cc8e0ce3b9c0b54be7f3b0768d37023a7be3f2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/93] 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 c5f0cbe3ba1660ae9b3aacccc81b51f59755545d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 78/93] 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 638370ec09e019618fabd51b02e227f38b1f25de Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/93] 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 77d098409d5afa86335178e9920251bd2cb31c8f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/93] 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 b6da677244456c100644a2925947d31151c5b359 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/93] 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 6654e27c3da433fa12bc5953dc8cc8e37c0a9be1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/93] 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 ae5320c5b2b84c8f79ccf1c24fa20665cd39fdeb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/93] 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 d90037cecf905491b75b39ab2caf639c1882ff66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/93] 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 405c5d17a2c66fe287122f1041372f32d15be9ff Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 85/93] 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 2ce9df2063135a18110fd8137bf6d1b873968ab4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/93] 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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 e6109415b31941ecf29e18be3d24478dfc9eaad1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/93] 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 fdde3d38350478e1953006e16bf9ce6ca97920d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/93] 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 08c99def5b79a19ac85cc0fa5b56eca2fa92af77 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/93] 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 3badd2e6fbc7917d0f7df46534353c8830f26b70 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 90/93] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 69b1ba6066f963a47f6c23e08e95d740e1a88777 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/93] 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 352714e05b29de8c0ed698da0238fbe30ead5766 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 92/93] 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 7b54d1bd5cfd5fb475c374fee9fcc5335f4a1a98 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 93/93] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (7 preceding siblings ...)
2022-03-25 23:15 ` tibequadorian
@ 2022-03-26 0:52 ` tibequadorian
2022-03-28 12:25 ` tibequadorian
` (13 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-26 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5353 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav - fixed in [1.20](https://gstreamer.freedesktop.org/releases/1.20/)
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 122461 bytes --]
From b364dab68b9bbb3a926c1afc6fdfee2c5d714e9e Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 01/92] 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 ae6cdeece80f758910eef63ddfd57c3a3c83c931 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 02/92] 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 f56d019017a52fa11ee8bb65a61e28ec37e7ffbe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 03/92] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 3ed00c2dc71ba262abf83172622061789c4507bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 04/92] 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 <tibequadorian@posteo.de>"
+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 82350976b836f1cf74c73864c35c8ffa2e32485c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 05/92] 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 <orphan@voidlinux.org>"
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 1e4abdd0cd189fb45b76c74f1c8a6d1ffd723c28 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 06/92] 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 <orphan@voidlinux.org>"
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 e045f5ccc4e26b092988a6fac6ca4d6e7dbd5530 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 07/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 505b4394dc106414a810bb647e10e40b75c4d19e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 08/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 ef7777783078b170219883619c74a18cb8fbd1dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 09/92] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 971cb70e60112c9a251401f45e487516445c65f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 10/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 1e717d02597f65b2a084954fb141dece9d98f636 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 11/92] 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 7d323593a120..e9ad0f43e675 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 <orphan@voidlinux.org>"
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 c4df4b0aee2463123dd7bc0592b7b4fad6e0ce2f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 12/92] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..34a201f332ad 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -205,6 +205,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 f5d3cb168e3b012acc0893971c3422c6731bce36 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/92] 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 31ec5f69ed9949cf0174dcde69e0f83cfaa00833 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/92] 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 865f5d2a0ed3ffe786e6f6e1c9e8d0cc84d2e935 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/92] 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 b6b402bd0996d4c839ec86455e2b03268a786692 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/92] 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 ce6097370194847a854a530f272c5b72d477a360 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/92] 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 <piem@piem.org>
+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 ea74e0d06331009abb72d6f7ded3e6002c70b2d6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/92] 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 <john@jlindgren.net>
+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 1033ead9a7a2342d2fecd1cd30c7f12046a1c03f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/92] 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 50c53f26a345f3f6f86a7b07d8e5487ba0f67671 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/92] 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 56fa349a8f38c8ed3b9c82483a095c4cab629eb0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/92] 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 887da64886c985ed492271ccbfea4ee3c1b379b5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/92] 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 d39d1b2fad9bd1e2b282f4d7eb5005a49f958fc8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/92] 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 19a03f3ad9bc02edb6c57e08b1604ac0300a203a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/92] 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 <duncaen@voidlinux.org>"
From 0830ce3660e9dd2c149d5732ed7b3a14268c7d44 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/92] 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 8666c78600b184706a9cfbd806584c609c6d9a0e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/92] 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 b4227ddb875c0499debf9232a2d84cd13fc5776e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/92] 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 51e840c49b73bc1a376d60bf0de6f3ff261fb7cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/92] 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 70c1b34a3a2068c91903ae10cbfbcd836f6857ab Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/92] 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 fbebde232349292d3391e1d7a762cc2766dae702 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/92] 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 96bb20efc7e31b7dd1aa59e9d6916498d86934ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/92] 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 457dc8199e1a1d1c1fe1e6116a41215aaaabf8d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/92] 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 26fe2c9332eb52a17747d0f1a442a78186bb2990 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/92] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 744bd41c71d615681f3886a687724420e7db42ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/92] 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 c7dd3f4a2357c1152eb1548b552f0580b3c785e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/92] 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 d1c782a6f8b5cb9e7b3f389f9e2a460dcb724b7d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/92] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From f3ba5902f43fa9e12c35f1b36848e11507061a42 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/92] 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 ef68f6f8dbbb8c0187db3f252acef13dd92c2b65 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/92] 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 04b2faa1675de63e92129a47bdc4ae0fe401ace6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/92] 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 a9570492b635c6c6c8ab4bba03e5f809d71ed22c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/92] 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 dbdccb1fc2b6eafa223e89988e58ae8a6bf88480 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/92] 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 238f571c646e7c1ca0ee0bead6aee9f19a49a473 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/92] 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 9b80a6cb3b7ae2d412f3a0dfd567846139819642 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/92] 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 5fd16f1a80d642d00d41f14554ba51bfdd495693 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/92] 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 5645c763b99ae9a65d3aa5e5294da2ea3be993af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/92] 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 ee89226abe40683476654683905ce3f346ef4652 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/92] 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 be2772dbd0a4e1be5d46b536568c4a6554ae1256 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/92] 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 ab9c82c82bc83967e61fc94649e35b5da1e6b362 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/92] 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 355d338d5fb26c8a2a752ad402038a20ff28752c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/92] 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 a372bddc5b7d4104d1578a72062459e7f1e035ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/92] 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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 6b942527392b615101137c966e3ff3afc7ad75c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/92] 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 f61bcf586fac447c033258f466f72df7f4750744 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/92] 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 463aea66ae0265ef17b6a7a1201a7d4a442ef383 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/92] 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 c0997ad9af3b62bc6ddb78c87de9be20ffeebb2e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/92] 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 3453ce9a46ac7b0680b067052d91fddeab37d528 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/92] 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 ffb97af0db8e09b4bb9d2752cb63babcb58a0183 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/92] 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 36996f77a44fe813d3129f76549d798a2e697c6a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/92] 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 aebafb40e7e4671369b681293115bd73e4515aee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/92] 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 9380cc09d65637b79ed28cd30a09b161259d6d37 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/92] 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 445d391491074736be17a5ea6cfd5a18f53bfaf9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/92] 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 f87e3caab7cc27a392daa2e37f71e1442414e3a2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/92] 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 f1af8b7853af79b722879d1cc49af49c8f2a3870 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/92] 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 98a9bdf7a82bdd83c2afc6b4f791744a7fb7b6b1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/92] 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 7cbaebce2fc9433f79b3f142e93b7b4d73e1efcf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/92] 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 9b40efe672ebdfdd1acd3afd1e118eb96f1b705f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/92] 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 36912bd4fccb562a74d5d1fb6e7eb170a563d402 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/92] 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 3658639d57de34fe5c443f89c16580f1876db00a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/92] 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 8a6cd14eb035cdda17444a58859d5ce98be424f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/92] 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 0ada1b24b63c36f5b5dc29cdb39f8c6e801fef48 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/92] 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 22c6191416c87f288d64a3ee64c00e09328bbfbb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/92] 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 a5b5380a8fbbe3d1f06f485df1faeef3448cfa02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/92] 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 2474fd3ff36036cbdc1f8b7abf5a934ffbe65c8f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/92] 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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 7df6ee7c967b870bf84c35d6a01f0483436c8a8c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/92] 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 6b89a54d89a2..1c1f89d48dfd 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 4256ee87ab3a99815be782cf0878dc91a7a67c1e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/92] 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 1f40efa3e6f735b569c237ba44ad3befcbd3609f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/92] 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 40aa3c648ac0327591110792d870946647063ebc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/92] 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 a98db7d68e3041dae07f1246c9c563869d802628 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/92] 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 c9a57b181fad624404783702501f2c2033d253b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/92] 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 7f378e329b590fe6da3f35aaa8cd60f3eb64d1c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/92] 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 b485b202a209b8af6ad34b429062f941489973f7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/92] 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 51f88b801118aa2c39075756f5e54367315961f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/92] 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 6e18ee9cd1bde52f47a4a75c2ac347010b645775 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/92] 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 dd71c298b93d3bee185481cd8e20616170ef611a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/92] 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 2f1dfb458260948f17f734665f6fc7ab217b6caa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/92] 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 f3ae0458f8a7d645a25668a455f3ad33cc63553f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/92] 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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 64cb8e8d7ddf40794d62c3281d72f2d7e11fef8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/92] 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 3581e861b078b982b7cfae192c8a969996d34033 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/92] 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 12495a2ecf32faaf82281893135a4333e7a37a90 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/92] 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 393edc020c84a960c14995d90b980204b8da5105 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/92] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From b37163df74ab018d6b82ee86783eb4ab14b1de91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 90/92] 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 fff68181a5a35b12516ab226f570d0b500d268a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/92] 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 dbd0d2fe353a396d49ca9df9236475daf4e4b0e3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 92/92] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (8 preceding siblings ...)
2022-03-26 0:52 ` tibequadorian
@ 2022-03-28 12:25 ` tibequadorian
2022-04-11 0:48 ` tibequadorian
` (12 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-03-28 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5490 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav - fixed in [1.20](https://gstreamer.freedesktop.org/releases/1.20/)
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 122461 bytes --]
From e6a83d0241de522a6d4cb9952018fffdefba8303 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 01/92] 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 9666cdaefd905f5a655aac14e752c14140e74e75 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 02/92] 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 81b3a0e8e5551fadc9291116c220199bd127c0b8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 03/92] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 2496863a8979097c518d58d44e62ab4e5a1fab44 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 04/92] 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 <tibequadorian@posteo.de>"
+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 5055aa7b0cd8738a2c0b93b6f1bb63d6a8749cb2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 05/92] 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 <orphan@voidlinux.org>"
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 ce74d8b3fbe12e1454be90c087c6398979bd32af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 06/92] 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 <orphan@voidlinux.org>"
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 efc11014fb3a95154f1f7543affd7586268cf9d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 07/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 d56575b4a0829d6b11eeebc42610ae8b0ce097ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 08/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 814ff2f4c6b7ba1e7f90961c956f9222e443f4ee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 09/92] 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 <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 cdc06a53dee575cd96af738567295a30a349ddb0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 10/92] 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 <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 e3d62a594ecf51b7af3c44a8827665f0974994df Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 11/92] 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 ccc55a1b3772..bed7b76225a3 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 <orphan@voidlinux.org>"
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 2d97875fb072c488924d31201dfd1d8ecd8c7914 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 12/92] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..34a201f332ad 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -205,6 +205,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 125c39481e636d804b97f4aace0495d5984fe1f7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/92] 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 a8cfd586d09a319ac960f1fa801d9445b38bafd2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/92] 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 1675dbde7f0c223e97bc7ef358931c8f6673e534 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/92] 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 eafeeb0bd5202147dafa5cbefbf6752bad55962e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 16/92] 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 c28282751eb2e61ad1070fe3d20c4e463e6e3986 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 17/92] 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 <piem@piem.org>
+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 538afbc06655c3d9fba337dedc2ad609af63bbc5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/92] 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 <john@jlindgren.net>
+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 3541c50c05614a446a51a06528bbf5f151f8be06 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/92] 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 924b4e045f6c99871a1c79cf60752d1c7c56531e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/92] 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 89650f13c223d5bf89ed75c0bcb312a0798914b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/92] 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 097da6275acd5dd08ad4fdc94fd1cdb53946c25a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 22/92] 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 a79cabbab19397b0366c0aa839b264507bf4e4ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 23/92] 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 1b40c9d06aa146bf61a4ef1639498429704601fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/92] 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 f6154e223751..e4c509e08b56 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.84
-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 <duncaen@voidlinux.org>"
From fafcf6a83416cc6c23443ea3a3da68d22bbd5171 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/92] 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 0fdcf5819a3cd71253d488efd895578747a88dd9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/92] 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 cf0dbcbdf3eb88f7e4789e1ba78c7847115d7d20 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/92] 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 d7a80f3d0cef0dcaf34f27557a64c097c8968f44 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/92] 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 c50d358b8787c138f00b923520f64718d4920a99 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 29/92] 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 75aff05393c3e3ec5be945f4e973c29204515fb7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 30/92] 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 ebdb2b86849d9401a867db1b0a752fce6ced0f8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/92] 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 57b6872e68fc7f703b0a0f4333cc9338d157473e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/92] 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 8dc6d9bc2ff83ef5d55b3b942be43dc761e9a295 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/92] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 ef657b17945d51c0881353fdfda0c72c3ea50b3c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/92] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From 5c5a6805ca6a3e870ad337e23dadf62a0743949c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/92] 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 9221bb83ab89c99dc44acb5ffdc9c1cf57b4bd40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 36/92] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From b29f3deeaa2e633cce4d262e3dabb418a5bd940a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 37/92] 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 e71cb01fa5a0b910bb89f889952582d678ae4844 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/92] 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 b40d40c5b806dd4e3f1730993b5a44244a2c3670 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/92] 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 a76dd57953a90fe22ccf1ace90f8dddb0f3dc4cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/92] 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 2dc2c2ed45587f3e26039bdb2f4891995aaf28db Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/92] 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 528e21c6644e4b526d25ff3f13dc65e5c8e8cffa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/92] 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 eb4e1c96ebd46d6896a9bd277e13d6dafa4a97b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 43/92] 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 71c3e92f2527d7602527e92661a4b439b62a491d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 44/92] 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 f7a12c5668083b991d68211feac8cc63c016da8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/92] 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 66c78af694f17a166ff23262306ca874b1b70eb9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/92] 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 3582925c84e19d4768c4a3de640c8dc3e5d3683a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/92] 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 fb9a19ef99b42f16bad6bdf3ee80243cc6b755cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/92] 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 06db1c873f325a33778a8611013e0a7cff54de59 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/92] 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 781b4913b9c0c7a3b85172f06919eca5561a290f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 50/92] 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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 3e0060498aae002ebb57a65aed5eb57978ecf201 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 51/92] 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 cd8196a87de2c7c811edb985e1e48bf97df6ba36 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/92] 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 0be552b5e4932a12810417706ab1b4b58413ca32 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/92] 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 a5e2d3675533065ed3e059a063da8e730971d1a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/92] 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 9f8a8d2a8768664f87eb6ae6a9ce0fbed9f83e9f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/92] 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 7fd0a31ab4633f703084b78454de159e8d31108a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 56/92] 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 bdb861756fa39e7f13631796ae1c34e7ac7860e6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 57/92] 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 85920159df78b0d89a73d35b61090c8c8b8a23b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/92] 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 6586ef1325b841ef560c947c890fc0640440eccb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/92] 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 e73ebbdeb1af96ebcdc1b53b6418e0c92730ad3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/92] 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 b823f538e72b76287e5c5e53f537e33d10e5c842 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/92] 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 8faa4ead1caf0779a02343cd549b8a167f1fbda4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/92] 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 d99b091aeaf6523fa458b1da0f1b05d0bae7fdf7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 63/92] 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 d60a4880b2de5380fa3278ab6114d66fb5cfa3e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 64/92] 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 cd06e4d3ad540837ec0154d6bf370f6342fc4c9a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/92] 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 d6970743cb47886ac89f2e375d91b8da01a63bad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/92] 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 12757fed09614226bdd324599738b89fae95d701 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/92] 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 860fc2ef83bab2dd00c7d2e11adae98b5de9c69e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/92] 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 9d6e877314b7dadc235cda38091a9308e8a45698 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 69/92] 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 04a3d47e9ea81e3246b0676689a8306efdf07496 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 70/92] 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 7d86825b384c4706626cd2afb80746b0e2a9de41 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/92] 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 6efb51bd57175b32664faa2b6080eab94109e8d6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/92] 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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 ce4a2cbd440c814cd7c1b108879fb93105747a47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/92] 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 6b89a54d89a2..1c1f89d48dfd 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 1fc8efb0194245378ebd0892928a57d1be71d327 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/92] 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 e2680b7a1ab34d7258e51e5abd0f6ffa358befc3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/92] 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 0ad7e89020f1f93a3a53606b793d42e60b619eb1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 76/92] 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 89a6de76f69854948ccbbd3b264e056bc52c44ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 77/92] 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 f3e61ca6c29be352a15de3cd8f4e739cdc7abd49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/92] 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 fa34284f1d796d55a75e1453d6ff8c4bb55822b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/92] 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 d31b59b87b20ff317899bea8ffd7210a288b0068 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/92] 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 c41507375b63f67233e70ea94f711f494666c26e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/92] 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 f0c2e868800c800e5b042203ee43abc58194eb89 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/92] 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 54bef639f8ed604016447a70eabcd30a199a3b41 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 83/92] 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 1bcaf60337c22f99822aa561cf83efbd811990f1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 84/92] 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 3d3be2ddcfe4ffa256f7c35a23b3f117585f4ad1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/92] 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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 72479bf56c8317fffe10c0748b0062a3134dd52e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/92] 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 37dd8e5ca1bbea56955d6f4b5d6195c0e8c138b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/92] 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 0a52d4253b6ff07cb9b34d055a493c077c688346 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 88/92] 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 0230bd17438207b9d94e58d4c7ef55f2e7fe405b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 89/92] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 27727bcb5b91a47aef4aa82d3aa193575a190ebd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 90/92] 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 c550452ec3a5adafa12dea598fc4ca4cbf570700 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 91/92] 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 c625b122b6c913f8c7ec6619b4d3c3e30d62da09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 92/92] 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (9 preceding siblings ...)
2022-03-28 12:25 ` tibequadorian
@ 2022-04-11 0:48 ` tibequadorian
2022-04-14 13:51 ` Idesmi
` (11 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-04-11 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5548 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
- https://github.com/void-linux/void-packages/pull/36605
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav - fixed in [1.20](https://gstreamer.freedesktop.org/releases/1.20/)
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 114974 bytes --]
From 3c32acc4500741c220a3152d396aa095fbfb9fc6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 01/90] mlt: update to 6.26.1.
---
srcpkgs/mlt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 857a88d3a3ce..8933eb4e7bb9 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
-version=6.22.1
-revision=3
+version=6.26.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
@@ -14,11 +14,11 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libvidstab-devel libatomic-devel"
depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 90d22d4f358d5841d112c0d8606e738596840148 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 02/90] New package: robin-hood-hashing-3.11.5
---
srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/robin-hood-hashing/template
diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+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 1f785d1a04c7b1cfdb2339ce0a1979b9e255179c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 03/90] SPIRV-Tools: update to 2022.1.
---
srcpkgs/SPIRV-Tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..7a0e2e6d2646 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
# Template file for 'SPIRV-Tools'
pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
revision=1
build_style=cmake
configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 811d84fb029db037e295650151f333edcba82f19 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 04/90] SPIRV-Headers: update to 1.3.204.1.
---
srcpkgs/SPIRV-Headers/template | 8 +++++---
srcpkgs/SPIRV-Headers/update | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/SPIRV-Headers/update
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..c67315ceb63f 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,13 @@
# Template file for 'SPIRV-Headers'
pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
build_style=cmake
short_desc="Machine-readable files for the SPIR-V Registry"
maintainer="Orphaned <orphan@voidlinux.org>"
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 3dcfe6eda875d7ec34c8ca74fe747ece550a38ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 05/90] Vulkan-Headers: update to 1.3.204.1.
---
srcpkgs/Vulkan-Headers/template | 9 +++++----
srcpkgs/Vulkan-Headers/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..f26d72798a03 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
# Template file for 'Vulkan-Headers'
pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
build_style=cmake
short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 fc8700e7185fcbf53093756f335dc7f7019c76c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 06/90] Vulkan-Tools: update to 1.3.204.1.
---
srcpkgs/Vulkan-Tools/template | 12 ++++++------
srcpkgs/Vulkan-Tools/update | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..b577e832c73e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
# Template file for 'Vulkan-Tools'
pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
build_style=cmake
configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 acddd8fa77fd1dc4d3de8a27baf18c610425bd32 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 07/90] Vulkan-ValidationLayers: update to 1.3.204.1.
---
srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
srcpkgs/Vulkan-ValidationLayers/update | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/Vulkan-ValidationLayers/update
diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..9a2d58434d24 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
# Template file for 'Vulkan-ValidationLayers'
pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
hostmakedepends="pkg-config"
makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 3d871eb5852cc61441accac7e52d8e09ed07cb2d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 08/90] vulkan-loader: update to 1.3.204.1.
---
srcpkgs/vulkan-loader/template | 10 +++++-----
srcpkgs/vulkan-loader/update | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..5b4f5366fe72 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
# Template file for 'vulkan-loader'
pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
build_style=cmake
configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
-DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
libXrandr-devel"
short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 5a14ad8b99965bca118bc20b15e747ad01d81aa1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 09/90] ffmpeg: update to 5.0.
---
common/shlibs | 17 ++++++++---------
srcpkgs/ffmpeg/template | 19 ++++++-------------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0ac24701898d..91e89dc6718d 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 <orphan@voidlinux.org>"
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 5f1ebe6fc49a9e49bb11a8bd0fafc8df6139ceef Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 10/90] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6859fe29da93..100934f05712 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -212,6 +212,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 680fd25d865ec9febf3e10ed42ec1495b653b713 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 11/90] QMPlay2: rebuild against ffmpeg-5.0
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..335c130656d6 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=22.03.19
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 8717a7659e947b2b432cd566979cbaee8183e9cb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 12/90] alsa-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/alsa-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..60066091b803 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
version=1.2.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
From bd3be4ca4117da32726369f41ae92a69ac8fa791 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/90] arcan: rebuild against ffmpeg-5.0
---
srcpkgs/arcan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f33db1fadeb8..e78d9dc76e2d 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,7 +1,7 @@
# Template file for 'arcan'
pkgname=arcan
version=0.6.1
-revision=1
+revision=2
build_wrksrc=src
build_style=cmake
make_cmd=make
From 5ff779d0b2b8b6b005964c08d1d5866f0dc3a394 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/90] attract: rebuild against ffmpeg-5.0
---
srcpkgs/attract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index ceff4287193d..dc471aea1968 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
# Template file for 'attract'
pkgname=attract
version=2.6.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="VERBOSE=1"
hostmakedepends="pkg-config"
From abb635b239f4b91d33986dbbde2538c870ce1586 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/90] aubio: rebuild against ffmpeg-5.0
---
srcpkgs/aubio/patches/ffmpeg-5.0.patch | 25 +++++++++++++++++++++++++
srcpkgs/aubio/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/aubio/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..aace41a6e6d9
--- /dev/null
+++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
@@ -0,0 +1,25 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+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 974f1eaef3a782e7e8af5299e2edf60d32b04b14 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 16/90] audacious-plugins: rebuild against ffmpeg-5.0
---
.../patches/ffmpeg-5.0.patch | 31 +++++++++++++++++++
srcpkgs/audacious-plugins/template | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..617c11215b90
--- /dev/null
+++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
@@ -0,0 +1,31 @@
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+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 91bf86aa04072d66b9eb6c89a88599bdafb6ce6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 17/90] baresip: rebuild against ffmpeg-5.0
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..2b375e17d197 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=1.1.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr
SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
From 7c7b0577e535a5401deada23b50b9121f2b2ad09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/90] blender: rebuild against ffmpeg-5.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 77f41d06cdec6e8f6fe269a44b9adcd0894cb4c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/90] cantata: rebuild against ffmpeg-5.0
---
srcpkgs/cantata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 8ce1d756ace9..f685d5f985f7 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,7 +1,7 @@
# Template file for 'cantata'
pkgname=cantata
version=2.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
From f3066991416e5f22e7932ee9cbab8be2287b5aae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/90] ccextractor: rebuild against ffmpeg-5.0
---
srcpkgs/ccextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 9abcd82852b2..7fe2ba4f27b6 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
# Template file for 'ccextractor'
pkgname=ccextractor
version=0.93
-revision=1
+revision=2
build_wrksrc="linux"
build_style=gnu-configure
configure_args="--enable-ocr --enable-hardsubx"
From e327bb5fd1195c6e6425e2a674898d6417acb836 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/90] chromaprint: rebuild against ffmpeg-5.0
---
srcpkgs/chromaprint/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 7ef7838949f3..1f7bbc70a22c 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,7 +1,7 @@
# Template file for 'chromaprint'
pkgname=chromaprint
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TOOLS=ON"
make_check_target="check"
From 522fc9a40b75f91901b5159526a76777b74d91d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 22/90] chromium: rebuild against ffmpeg-5.0
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96b34227a323..4199247f11c6 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=100.0.4896.60
-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 <duncaen@voidlinux.org>"
From 44d4afd26b0423769f95fb443154789bfa7f170c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 23/90] cmus: rebuild against ffmpeg-5.0
---
srcpkgs/cmus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..81c867e53d38 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
version=2.9.1
-revision=2
+revision=3
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
From 74214da12ce5131ab17358dc167ee8256acd4135 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/90] deadbeef: rebuild against ffmpeg-5.0
---
srcpkgs/deadbeef/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 159ad1ce38bc..9a1589dbb1d9 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,7 +1,7 @@
# Template file for 'deadbeef'
pkgname=deadbeef
version=1.8.8
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
From 5142451ca2a4dd5c342ecea5621f08614aa50df4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/90] dolphin-emu: rebuild against ffmpeg-5.0
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 2b3a783943b8..91b02229a382 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.16101
-revision=1
+revision=2
_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
_mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
#Version/hash pair can be found at https://dolphin-emu.org/download/
From bb742890d3a95071a1795b1a640a47dc65454f92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/90] droidcam: rebuild against ffmpeg-5.0
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..2b2eec714633 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,7 +1,7 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
From 50d342de036efa0561153cd93405251a9c05dbc2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/90] electron10: rebuild against ffmpeg-5.0
---
srcpkgs/electron10/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 05506dddcb37..986c96bf83f4 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -3,7 +3,7 @@ pkgname=electron10
version=10.4.7
_nodever=12.16.3
_chromiumver=85.0.4183.121
-revision=2
+revision=3
archs="x86_64* i686* aarch64*"
build_wrksrc="src"
create_wrksrc=yes
From d199fda38b718baef15ce248cee2e493e108cf31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/90] electron13: rebuild against ffmpeg-5.0
---
srcpkgs/electron13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 1ceb6f788a62..77c7d5306cd6 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,7 +1,7 @@
# Template file for 'electron13'
pkgname=electron13
version=13.6.7
-revision=1
+revision=2
_nodever=14.16.0
_chromiumver=91.0.4472.164
archs="x86_64* i686* aarch64* ppc64le*"
From aa93e3d0c3ce10cea8d462c5428b44ea2f02742a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 29/90] ffmpegthumbnailer: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbnailer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 039eea7622b3..27bba7e685a0 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbnailer'
pkgname=ffmpegthumbnailer
version=2.2.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
From 4dd018adbaf8760c6fb62b3e16e97ecbd80bcf31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 30/90] ffmpegthumbs: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..4e61fa2e51d7 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbs'
pkgname=ffmpegthumbs
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
pkg-config qt5-host-tools qt5-qmake gettext"
From c99d86373a107c28736de8424043eee542a3b1e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/90] ffms2: rebuild against ffmpeg-5.0
---
srcpkgs/ffms2/patches/ffmpeg-5.0.patch | 419 +++++++++++++++++++++++++
srcpkgs/ffms2/template | 2 +-
2 files changed, 420 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ffms2/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/ffms2/patches/ffmpeg-5.0.patch b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..86f1387d7f9d
--- /dev/null
+++ b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
@@ -0,0 +1,419 @@
+From 28fc493fda2fa2064afeeb0a5d85fdc42db05dcf Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 5923e0f1a501795f96ff509d5ff89fb6e2785e1c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/90] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From 4e39b52fce60143fe732fe232a9f591cf34ade51 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/90] gerbera: rebuild against ffmpeg-5.0
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..4e0e2a94a9fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.6.4
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 7550b99d097e5b1ec8a278add4531f633b24dafc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/90] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From 024ba97dfe020e51f0e5ca2d8531e1cd583e2bdc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/90] gst-libav: rebuild against ffmpeg-5.0
---
srcpkgs/gst-libav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 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 efa21856782fbef9601c0d03037912f815f255ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 36/90] guvcview: rebuild against ffmpeg-5.0
---
srcpkgs/guvcview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 345cf6006f24..d42fd38fa4ad 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,7 +1,7 @@
# Template file for 'guvcview'
pkgname=guvcview
version=2.0.7
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-static --disable-debian-menu"
From 963400d65ea358aaaa345cdb23deb59aa38651b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 37/90] handbrake: rebuild against ffmpeg-5.0
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6ad7bd3ea798..7bff9580c310 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.5.1
-revision=1
+revision=2
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From a9c9022f283be1b24f5809ef8f31cf9c72842b96 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/90] hedgewars: rebuild against ffmpeg-5.0
---
srcpkgs/hedgewars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 7060dbc37d95..36ca62d4fbbd 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=3
+revision=4
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
From ed908affaa3701a3ad2d17dd6be528863718ccf4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/90] idjc: rebuild against ffmpeg-5.0
---
srcpkgs/idjc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index ddabff2a4e74..df60318b3db9 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,7 +1,7 @@
# Template file for 'idjc'
pkgname=idjc
version=0.9.1
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
From 7cea1d06eb4e3407f1f4966c321571366655cf96 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/90] k3b: rebuild against ffmpeg-5.0
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..900f312e9338 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
qt5-host-tools kauth kdoctools kcoreaddons"
From a374edd50887891f46967f03ae2a05c9c6c935d3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/90] kfilemetadata5: rebuild against ffmpeg-5.0
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index ab36e2d86496..82a7be20ea48 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.92.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 ff342071ee253907fa15def94df3f33b36ee437b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/90] kid3: rebuild against ffmpeg-5.0
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 81633262dc03..456206d90e16 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 9ed2a2d669013215166753773cb91e2326855b12 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 43/90] kodi: rebuild against ffmpeg-5.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..fa671eb181ff 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=1
+revision=2
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From dfd12b178d430d6c3b6dac4c6ba3519ceae76823 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 44/90] libextractor: rebuild against ffmpeg-5.0
---
srcpkgs/libextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index 29d5b8df01f8..ddd4790f93e8 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,7 +1,7 @@
# Template file for 'libextractor'
pkgname=libextractor
version=1.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
From e2b1d5579921a87c6c897454ba264d7b97ccaeb0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/90] libopenshot: rebuild against ffmpeg-5.0
---
srcpkgs/libopenshot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 71dff12b5d61..662a54758232 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
# Template file for 'libopenshot'
pkgname=libopenshot
version=0.2.7
-revision=1
+revision=2
build_style=cmake
# Builds fail with Ruby-2.4.1
configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON"
From 050b42aca287b809ffc3d61b8db99749a9921e6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/90] loudgain: rebuild against ffmpeg-5.0
---
srcpkgs/loudgain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index da4f2d56e94c..4d6bf29efb4f 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
# Template file for 'loudgain'
pkgname=loudgain
version=0.6.8
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libebur128-devel taglib-devel ffmpeg-devel"
From 3e1823056491841c6b11ab2605c60f7d527586ff Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/90] mediastreamer: rebuild against ffmpeg-5.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 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 8b4fdf0105cc253590c656da0a782fcdabb1936f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/90] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/patches/ffmpeg-5.0.patch | 117 ++++++++++++++++++++++++++
srcpkgs/mgba/template | 2 +-
2 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mgba/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/mgba/patches/ffmpeg-5.0.patch b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 ef122663a166e0735fa1b1bea848d99ca22de0fb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/90] minidlna: rebuild against ffmpeg-5.0
---
srcpkgs/minidlna/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index da681f604300..e42ad491acf3 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,7 +1,7 @@
# Template file for 'minidlna'
pkgname=minidlna
version=1.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin
From ff7cab1178c772df444613fef973f5d57a96e257 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 50/90] mlt: rebuild against ffmpeg-5.0
---
srcpkgs/mlt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 8933eb4e7bb9..ed6b27503f9a 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
version=6.26.1
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
From c857735015f047bdd9579183145eef2241b03bba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 51/90] mlt7: rebuild against ffmpeg-5.0
---
srcpkgs/mlt7/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5aefa500dd8a..f8352c2fc3f3 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
# Template file for 'mlt7'
pkgname=mlt7
version=7.4.0
-revision=1
+revision=2
wrksrc="mlt-${version}"
build_style=cmake
configure_args="-DSWIG_PYTHON=ON"
From dab5ff8e5772b144709a36d6f138a70a7720e464 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/90] moc: rebuild against ffmpeg-5.0
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index c42be650a1d2..4b95426599bf 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From a85d2cefadc60c9d9488dc18e39a70c4acad823d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/90] motion: rebuild against ffmpeg-5.0
---
srcpkgs/motion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template
index 14ebb0b32118..efda46aec518 100644
--- a/srcpkgs/motion/template
+++ b/srcpkgs/motion/template
@@ -1,7 +1,7 @@
# Template file for 'motion'
pkgname=motion
version=4.4.0
-revision=1
+revision=2
wrksrc="motion-release-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config gettext-devel tar"
From d0e80dff1c6005aee14a61d12a9ea599fb26558b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/90] mpd: rebuild against ffmpeg-5.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..7a61651ab8fd 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.6
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 5df6b626e872c75b6a0a423942c1cd3a3a6d39f1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/90] mpv: rebuild against ffmpeg-5.0
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From 63427cad2c10f8742e16bc107dbc6680954c1b5e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 56/90] musikcube: rebuild against ffmpeg-5.0
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..1be832b772e5 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.97.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
From 6fc8473130a652fe3bfd5e080917ec88bfb9367d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 57/90] notcurses: rebuild against ffmpeg-5.0
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 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 cf47da4a92183893fb3ee3a91d9d6ff2a3f15310 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/90] obs: rebuild against ffmpeg-5.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index df6ee22e52ee..5c33b20aa58c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=27.2.4
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
wrksrc="obs-studio-${version}"
build_style=cmake
From 484eee3e9e69cd5964b2bda8b1f4d51819343e85 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/90] olive: rebuild against ffmpeg-5.0
---
srcpkgs/olive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..5290d8e5aacd 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,7 +1,7 @@
# Template file for 'olive'
pkgname=olive
version=0.1.2
-revision=2
+revision=3
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
From cc11c45a956a626b32323ea011489dc327ad5429 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/90] opencv: rebuild against ffmpeg-5.0
---
srcpkgs/opencv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..02cc923d2341 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
From 0346bd550f6554a8eb2380e9c06533d57d3da0a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/90] opencv4: rebuild against ffmpeg-5.0
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From b78f853bfcb32928f5b44f6c392430ba2de71099 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/90] openimageio: rebuild against ffmpeg-5.0
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..688552b0af21 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 9a5389f258276ff9d9833bc508440e0e8a303887 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 63/90] openmw: rebuild against ffmpeg-5.0
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 7385b582d6b7981c3ffaa55218a6e9fe53f6e309 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 64/90] osg: rebuild against ffmpeg-5.0
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
From 6fce5b93b9e9dc0c6f851d3c1ddd190673524c6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/90] ppsspp: rebuild against ffmpeg-5.0
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 38308424f58b..c76458459ec2 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.12.3
-revision=1
+revision=2
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
From 62240da319230638a4114ca0c513c7b195a959b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/90] pqiv: rebuild against ffmpeg-5.0
---
srcpkgs/pqiv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template
index 542fc27a2d32..9308d949b6a1 100644
--- a/srcpkgs/pqiv/template
+++ b/srcpkgs/pqiv/template
@@ -1,7 +1,7 @@
# Template file for 'pqiv'
pkgname=pqiv
version=2.12
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg-devel)
From 6a33c17a37f4784ff4378683af52faacc57b4011 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/90] qmmp: rebuild against ffmpeg-5.0
---
srcpkgs/qmmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..4b9cc799ce69 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 17d9fd55459d489994eac9abfed56306c7dc52c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/90] qt5-webengine: rebuild against ffmpeg-5.0
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 213672ab215c..af54e123bd8d 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.8
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From 1328dd4bb607b3b51160a189207a47348906f3a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 69/90] qtav: rebuild against ffmpeg-5.0
---
srcpkgs/qtav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 0d85ec076482..4f8e391dc210 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -1,7 +1,7 @@
# Template file for 'qtav'
pkgname=qtav
version=1.13.0
-revision=1
+revision=2
wrksrc="QtAV-${version}"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
From 3f9aab4221a6e469b1bd2adda871b6cb30127112 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 70/90] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/patches/ffmpeg-5.0.patch | 79 +++++++++++++++++++++++++++
srcpkgs/qtox/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/qtox/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/qtox/patches/ffmpeg-5.0.patch b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..950dcd886ea6
--- /dev/null
+++ b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
@@ -0,0 +1,79 @@
+From 15673a52b6b4805d482b69281e21947fb7096e05 Mon Sep 17 00:00:00 2001
+From: Anthony Bilinski <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 24f72bffc97823c5946a7f8b1464750552e4eeb7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/90] retroarch: rebuild against ffmpeg-5.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..7b19803fbf41 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.2
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From c69abfed94762d3aa15cd355ae178d5b164cd210 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/90] scrcpy: rebuild against ffmpeg-5.0
---
srcpkgs/scrcpy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..490c0442c361 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,7 +1,7 @@
# Template file for 'scrcpy'
pkgname=scrcpy
version=1.23
-revision=1
+revision=2
build_style=meson
configure_args="-Dcompile_server=false
-Dprebuilt_server=/usr/share/scrcpy/scrcpy-server-v${version}"
From b02f0a00f4dda51b2e18deab4a092c6e7d109160 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/90] siril: rebuild against ffmpeg-5.0
---
srcpkgs/siril/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..424baf48cf76 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
# Template file for 'siril'
pkgname=siril
version=0.9.12
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
From 6db24bf1860445aad7be1ee43f1e61340d438f21 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/90] spek-alternative: rebuild against ffmpeg-5.0
---
srcpkgs/spek-alternative/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template
index d65086b8f008..72747cbb0a02 100644
--- a/srcpkgs/spek-alternative/template
+++ b/srcpkgs/spek-alternative/template
@@ -1,7 +1,7 @@
# Template file for 'spek-alternative'
pkgname=spek-alternative
version=0.8.2.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common"
makedepends="ffmpeg-devel wxWidgets-gtk3-devel"
From 98b3eedfd9ef667ad4fafd0a7c050b72b39bcb0b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/90] ssr: rebuild against ffmpeg-5.0
---
srcpkgs/ssr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index a6439c742b22..37976b35d7f7 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,7 +1,7 @@
# Template file for 'ssr'
pkgname=ssr
version=0.4.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_QT5=ON"
hostmakedepends="pkg-config"
From 0ffa0a1c2eb12822bf22f24e0034990a7d89aef2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 76/90] sumo: rebuild against ffmpeg-5.0
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From 47608473edb15060922e4d019df15f7aa8caea7c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 77/90] synfig: rebuild against ffmpeg-5.0
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From f00b109c8637d89b9bde66b40a68e597d331403e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/90] synfigstudio: rebuild against ffmpeg-5.0
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 60907a6e150fcbb4b430987cbde8f4bf88311ff1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/90] telegram-desktop: rebuild against ffmpeg-5.0
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..4452e74b3a86 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=3.4.8
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From d68418d64db5728464017d374addb596677e3fd1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/90] timg: rebuild against ffmpeg-5.0
---
srcpkgs/timg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 91f1516b2597..334443d3f9bb 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From 89ada539f2aacce0743202db50961cc62fa0cdc3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/90] transcode: rebuild against ffmpeg-5.0
---
srcpkgs/transcode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template
index 775cd09fc4e3..47aec6ae1399 100644
--- a/srcpkgs/transcode/template
+++ b/srcpkgs/transcode/template
@@ -1,7 +1,7 @@
# Template file for 'transcode'
pkgname=transcode
version=1.1.7
-revision=4
+revision=5
wrksrc=mojaves-transcode-tcforge-70badbfe3674
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
From de9cf48872c16dfe6b4771d6458da2c86ad16ebe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/90] tvheadend: rebuild against ffmpeg-5.0
---
srcpkgs/tvheadend/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index 230ecb592571..4a4867b253e3 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=5
+revision=6
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
From 8ab78f8ca4a1b1e77f47659258a09670ad2d03ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 83/90] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..064cca88cc73 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,13 +1,13 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 83cfe320c957a4aecbb66692028843fad2256761 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 84/90] vba-m: rebuild against ffmpeg-5.0
---
srcpkgs/vba-m/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 8e6447f5c6f5..d98b4d9fd930 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -2,7 +2,7 @@
pkgname=vba-m
reverts=1292_2
version=2.1.4
-revision=4
+revision=5
wrksrc="visualboyadvance-m-${version}"
build_style=cmake
configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
From 806147eca6a49aaa3dd6da0a2473f1c2aba56c2b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/90] vlc: rebuild against ffmpeg-5.0
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..800009314203 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 59104243290928bb660d6dc9640a6e8f9623addf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/90] waypipe: rebuild against ffmpeg-5.0
---
srcpkgs/waypipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index 31be3b1a0914..f7190653a187 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,7 +1,7 @@
# Template file for 'waypipe'
pkgname=waypipe
version=0.8.2
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
# lto is off because it causes linking errors in armv6l and armv7l (due to NEON)
From 2ee9b8631473fc01de9654a51e51f4046a4e5f60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/90] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 05bae4d0b080e4af89ff9a0dc88090482450aeb0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 88/90] xine-lib: rebuild against ffmpeg-5.0
---
srcpkgs/xine-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index f713eff49b07..ef7bcca02b0a 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
# Template file for 'xine-lib'
pkgname=xine-lib
version=1.2.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
--disable-oss"
From 51303a547384928d0246c3ec773defb27ddf3498 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 89/90] xpra: rebuild against ffmpeg-5.0
---
srcpkgs/xpra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..91dddea47392 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
# Template file for 'xpra'
pkgname=xpra
version=4.3.2
-revision=1
+revision=2
build_style=python3-module
make_install_args="$(vopt_with docs)"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
From 90d04fb669fd758f63dc6bddead304eaef07be06 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 90/90] pianobar: rebuild against ffmpeg-5.0
---
srcpkgs/pianobar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (10 preceding siblings ...)
2022-04-11 0:48 ` tibequadorian
@ 2022-04-14 13:51 ` Idesmi
2022-04-14 14:11 ` tibequadorian
` (10 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: Idesmi @ 2022-04-14 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by Idesmi on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1099209249
Comment:
ffmpeg 5.0.1 bug-fix version has been released. This comment is for the eventuality you haven't noticed, perhaps you want to push it straight away in this PR.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (11 preceding siblings ...)
2022-04-14 13:51 ` Idesmi
@ 2022-04-14 14:11 ` tibequadorian
2022-04-14 14:58 ` [PR PATCH] [Updated] " tibequadorian
` (9 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-04-14 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1099228119
Comment:
> ffmpeg 5.0.1 bug-fix version has been released. This comment is for the eventuality you haven't noticed, perhaps you want to push it straight away in this PR.
This PR is far from complete and more of a tracking PR but thank you for noticing.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (12 preceding siblings ...)
2022-04-14 14:11 ` tibequadorian
@ 2022-04-14 14:58 ` tibequadorian
2022-04-21 13:26 ` marmeladema
` (8 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-04-14 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5606 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
- https://github.com/void-linux/void-packages/pull/36605
- https://github.com/void-linux/void-packages/pull/36691
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [ ] gst-libav - fixed in [1.20](https://gstreamer.freedesktop.org/releases/1.20/)
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [ ] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 114974 bytes --]
From 079e5a908ac774373075dbf7091c016a544feba5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 01/90] mlt: update to 6.26.1.
---
srcpkgs/mlt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 857a88d3a3ce..8933eb4e7bb9 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
-version=6.22.1
-revision=3
+version=6.26.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
@@ -14,11 +14,11 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libvidstab-devel libatomic-devel"
depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 1fb026ee688eac14a85739252b7b0508fa836920 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 02/90] New package: robin-hood-hashing-3.11.5
---
srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/robin-hood-hashing/template
diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+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 902013ff7bf762656017278dfb6a3493c48dad41 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 03/90] SPIRV-Tools: update to 2022.1.
---
srcpkgs/SPIRV-Tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..7a0e2e6d2646 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
# Template file for 'SPIRV-Tools'
pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
revision=1
build_style=cmake
configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 2ee9d044f6d1007700ab739d2c79f53bd3674c0e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 04/90] SPIRV-Headers: update to 1.3.204.1.
---
srcpkgs/SPIRV-Headers/template | 8 +++++---
srcpkgs/SPIRV-Headers/update | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/SPIRV-Headers/update
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..c67315ceb63f 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,13 @@
# Template file for 'SPIRV-Headers'
pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
build_style=cmake
short_desc="Machine-readable files for the SPIR-V Registry"
maintainer="Orphaned <orphan@voidlinux.org>"
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 dcf79ad34086d8b74e3d6885007f562d729bcfe4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 05/90] Vulkan-Headers: update to 1.3.204.1.
---
srcpkgs/Vulkan-Headers/template | 9 +++++----
srcpkgs/Vulkan-Headers/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..f26d72798a03 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
# Template file for 'Vulkan-Headers'
pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
build_style=cmake
short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 ef7adfbefe58fc17387fdaa744864df01bc25bcc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 06/90] Vulkan-Tools: update to 1.3.204.1.
---
srcpkgs/Vulkan-Tools/template | 12 ++++++------
srcpkgs/Vulkan-Tools/update | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..b577e832c73e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
# Template file for 'Vulkan-Tools'
pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
build_style=cmake
configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 4a4bd63df55fce3acd5ca1bbcd7be82a04621043 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 07/90] Vulkan-ValidationLayers: update to 1.3.204.1.
---
srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
srcpkgs/Vulkan-ValidationLayers/update | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/Vulkan-ValidationLayers/update
diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..9a2d58434d24 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
# Template file for 'Vulkan-ValidationLayers'
pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
hostmakedepends="pkg-config"
makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 2ef4e748a1edc5364cb60e16b285244270c91bdc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 08/90] vulkan-loader: update to 1.3.204.1.
---
srcpkgs/vulkan-loader/template | 10 +++++-----
srcpkgs/vulkan-loader/update | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..5b4f5366fe72 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
# Template file for 'vulkan-loader'
pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
build_style=cmake
configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
-DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
libXrandr-devel"
short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 a2df5dca606fda3c4c68f0e879301bf6fe0b7f3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 09/90] ffmpeg: update to 5.0.
---
common/shlibs | 17 ++++++++---------
srcpkgs/ffmpeg/template | 19 ++++++-------------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..1bbc1b2d5dde 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 <orphan@voidlinux.org>"
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 a8deca466b2a10382c209b87dd3c1dcf10b5d0c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 10/90] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6859fe29da93..100934f05712 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -212,6 +212,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 60919297b0c62c4f0b74bea2ea4567710083b726 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 11/90] QMPlay2: rebuild against ffmpeg-5.0
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..335c130656d6 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=22.03.19
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 25990662792786a14a60372d54d89a34fa5cff27 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 12/90] alsa-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/alsa-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..60066091b803 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
version=1.2.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
From a0c1516e160d26d9c1674db9526de1c2b8be40a2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/90] arcan: rebuild against ffmpeg-5.0
---
srcpkgs/arcan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f33db1fadeb8..e78d9dc76e2d 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,7 +1,7 @@
# Template file for 'arcan'
pkgname=arcan
version=0.6.1
-revision=1
+revision=2
build_wrksrc=src
build_style=cmake
make_cmd=make
From 2e44da42859f6aef9823870f24386776da1e2239 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/90] attract: rebuild against ffmpeg-5.0
---
srcpkgs/attract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index ceff4287193d..dc471aea1968 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
# Template file for 'attract'
pkgname=attract
version=2.6.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="VERBOSE=1"
hostmakedepends="pkg-config"
From 36e52c937aa89ece89bf94b4dda063f26ba7e2be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/90] aubio: rebuild against ffmpeg-5.0
---
srcpkgs/aubio/patches/ffmpeg-5.0.patch | 25 +++++++++++++++++++++++++
srcpkgs/aubio/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/aubio/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..aace41a6e6d9
--- /dev/null
+++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
@@ -0,0 +1,25 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+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 5cba8179f5731bf3ec9edb97499f983cac9f2ad6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 16/90] audacious-plugins: rebuild against ffmpeg-5.0
---
.../patches/ffmpeg-5.0.patch | 31 +++++++++++++++++++
srcpkgs/audacious-plugins/template | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..617c11215b90
--- /dev/null
+++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
@@ -0,0 +1,31 @@
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+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 cde434547779be7d0eb2adff1fe20bb1600bfe0a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 17/90] baresip: rebuild against ffmpeg-5.0
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..2b375e17d197 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=1.1.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr
SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
From c52710d5866e87037b58675c9ee2eb68815ec102 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/90] blender: rebuild against ffmpeg-5.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 670853b65c08e1b9e09f38e64cdc8204536cdf80 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/90] cantata: rebuild against ffmpeg-5.0
---
srcpkgs/cantata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 8ce1d756ace9..f685d5f985f7 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,7 +1,7 @@
# Template file for 'cantata'
pkgname=cantata
version=2.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
From c3f498369cc4b4c83ce11303d1759a8f8dd6f6dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/90] ccextractor: rebuild against ffmpeg-5.0
---
srcpkgs/ccextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 9abcd82852b2..7fe2ba4f27b6 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
# Template file for 'ccextractor'
pkgname=ccextractor
version=0.93
-revision=1
+revision=2
build_wrksrc="linux"
build_style=gnu-configure
configure_args="--enable-ocr --enable-hardsubx"
From 48ea539c69817fdfdf018bec525e61d267eabea1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/90] chromaprint: rebuild against ffmpeg-5.0
---
srcpkgs/chromaprint/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 7ef7838949f3..1f7bbc70a22c 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,7 +1,7 @@
# Template file for 'chromaprint'
pkgname=chromaprint
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TOOLS=ON"
make_check_target="check"
From a8c1d1742dea45a16beed59af1a5148ff01da30e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 22/90] chromium: rebuild against ffmpeg-5.0
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96b34227a323..4199247f11c6 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=100.0.4896.60
-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 <duncaen@voidlinux.org>"
From 31fd753ed24f4ff63d470f1c30843de9bcabe557 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 23/90] cmus: rebuild against ffmpeg-5.0
---
srcpkgs/cmus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..81c867e53d38 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
version=2.9.1
-revision=2
+revision=3
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
From 5fe85396f5c9715c1c69f7dbda1e3e3892ed1ce1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/90] deadbeef: rebuild against ffmpeg-5.0
---
srcpkgs/deadbeef/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 159ad1ce38bc..9a1589dbb1d9 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,7 +1,7 @@
# Template file for 'deadbeef'
pkgname=deadbeef
version=1.8.8
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
From 4c3ffd2e8230c101be3c888c3410b855be72b5c7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/90] dolphin-emu: rebuild against ffmpeg-5.0
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 2b3a783943b8..91b02229a382 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.16101
-revision=1
+revision=2
_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
_mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
#Version/hash pair can be found at https://dolphin-emu.org/download/
From 20e60bb325ccb7d9af193e6ecf1e2689f3bc4a5c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/90] droidcam: rebuild against ffmpeg-5.0
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..2b2eec714633 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,7 +1,7 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
From 1f9518e2c471a745c2b8a636a86a7e379e7b9738 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/90] electron10: rebuild against ffmpeg-5.0
---
srcpkgs/electron10/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 05506dddcb37..986c96bf83f4 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -3,7 +3,7 @@ pkgname=electron10
version=10.4.7
_nodever=12.16.3
_chromiumver=85.0.4183.121
-revision=2
+revision=3
archs="x86_64* i686* aarch64*"
build_wrksrc="src"
create_wrksrc=yes
From 5bbabdf032b78e8c009ac4344d4f537479f1a176 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/90] electron13: rebuild against ffmpeg-5.0
---
srcpkgs/electron13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 1ceb6f788a62..77c7d5306cd6 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,7 +1,7 @@
# Template file for 'electron13'
pkgname=electron13
version=13.6.7
-revision=1
+revision=2
_nodever=14.16.0
_chromiumver=91.0.4472.164
archs="x86_64* i686* aarch64* ppc64le*"
From e580e42d2e8184d89e48f158e6a3aa7d8b3b3e8e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 29/90] ffmpegthumbnailer: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbnailer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 039eea7622b3..27bba7e685a0 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbnailer'
pkgname=ffmpegthumbnailer
version=2.2.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
From d4897aa9f311381ee68280f7679a25aef30076ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 30/90] ffmpegthumbs: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..4e61fa2e51d7 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbs'
pkgname=ffmpegthumbs
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
pkg-config qt5-host-tools qt5-qmake gettext"
From 832c7d50313438088874228c881d4b1d8ef94733 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/90] ffms2: rebuild against ffmpeg-5.0
---
srcpkgs/ffms2/patches/ffmpeg-5.0.patch | 419 +++++++++++++++++++++++++
srcpkgs/ffms2/template | 2 +-
2 files changed, 420 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ffms2/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/ffms2/patches/ffmpeg-5.0.patch b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..86f1387d7f9d
--- /dev/null
+++ b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
@@ -0,0 +1,419 @@
+From 28fc493fda2fa2064afeeb0a5d85fdc42db05dcf Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 625a2720b4a62c7cfc83532ed3094488cd64ebad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/90] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From 3fb4627a600925a60a2077cceeead5989e005696 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/90] gerbera: rebuild against ffmpeg-5.0
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..4e0e2a94a9fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.6.4
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From f21bfc888fdff11092718afb56acd7dd78407c86 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/90] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From 819d989b6c1c2609dc94fe9441130e9cfc8807db Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/90] gst-libav: rebuild against ffmpeg-5.0
---
srcpkgs/gst-libav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 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 30594a2ba32cfdbda53e18e59bcbf86e1ee83919 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 36/90] guvcview: rebuild against ffmpeg-5.0
---
srcpkgs/guvcview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 345cf6006f24..d42fd38fa4ad 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,7 +1,7 @@
# Template file for 'guvcview'
pkgname=guvcview
version=2.0.7
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-static --disable-debian-menu"
From 8db4f3562ca311775d7c8988886554b2b0e34c28 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 37/90] handbrake: rebuild against ffmpeg-5.0
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6ad7bd3ea798..7bff9580c310 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.5.1
-revision=1
+revision=2
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From c5184175c290cdc5f0d72541dda0d08c7f3143a1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/90] hedgewars: rebuild against ffmpeg-5.0
---
srcpkgs/hedgewars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 7060dbc37d95..36ca62d4fbbd 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=3
+revision=4
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
From 8f458232275d22d4e8cba82ccb1955d102fd8f7c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/90] idjc: rebuild against ffmpeg-5.0
---
srcpkgs/idjc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index ddabff2a4e74..df60318b3db9 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,7 +1,7 @@
# Template file for 'idjc'
pkgname=idjc
version=0.9.1
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
From 7727b644cccd51a398cc1df8def29292a9652fff Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/90] k3b: rebuild against ffmpeg-5.0
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..900f312e9338 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
qt5-host-tools kauth kdoctools kcoreaddons"
From 06ad57a109faa2bb59b1776dea371e99528392d6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/90] kfilemetadata5: rebuild against ffmpeg-5.0
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index ab36e2d86496..82a7be20ea48 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.92.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 82d7d5d3b5a954df801bd1d2d4cbde62bc836bb2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/90] kid3: rebuild against ffmpeg-5.0
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 81633262dc03..456206d90e16 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From dac4da989188a968145ecbdb7b1a9ce3d134d849 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 43/90] kodi: rebuild against ffmpeg-5.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..fa671eb181ff 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=1
+revision=2
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From caa4366ecf9a3625fb6db37fdfe8599760b8fd46 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 44/90] libextractor: rebuild against ffmpeg-5.0
---
srcpkgs/libextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index 29d5b8df01f8..ddd4790f93e8 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,7 +1,7 @@
# Template file for 'libextractor'
pkgname=libextractor
version=1.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
From 3810857a6529fdb60b41f52f0e8ca1fb4ea7cc5e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/90] libopenshot: rebuild against ffmpeg-5.0
---
srcpkgs/libopenshot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 71dff12b5d61..662a54758232 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
# Template file for 'libopenshot'
pkgname=libopenshot
version=0.2.7
-revision=1
+revision=2
build_style=cmake
# Builds fail with Ruby-2.4.1
configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON"
From ba132b1ccffeb9d58bd81d3394f71fabd5eb103b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/90] loudgain: rebuild against ffmpeg-5.0
---
srcpkgs/loudgain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index da4f2d56e94c..4d6bf29efb4f 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
# Template file for 'loudgain'
pkgname=loudgain
version=0.6.8
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libebur128-devel taglib-devel ffmpeg-devel"
From 84b427e977a569bd50c55cf3e86e52c6847de856 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/90] mediastreamer: rebuild against ffmpeg-5.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 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 36b04e38e52e41ed0fe7a770ec3ac9a5fe8aaa8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/90] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/patches/ffmpeg-5.0.patch | 117 ++++++++++++++++++++++++++
srcpkgs/mgba/template | 2 +-
2 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mgba/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/mgba/patches/ffmpeg-5.0.patch b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 1ef440ac44bef856129f5e4feabbfacd822225c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/90] minidlna: rebuild against ffmpeg-5.0
---
srcpkgs/minidlna/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index da681f604300..e42ad491acf3 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,7 +1,7 @@
# Template file for 'minidlna'
pkgname=minidlna
version=1.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin
From 1854d6f176fd130f29952580c756baf09649ac2a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 50/90] mlt: rebuild against ffmpeg-5.0
---
srcpkgs/mlt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 8933eb4e7bb9..ed6b27503f9a 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
version=6.26.1
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
From e60a379e2423fb5ce7bbaa780347d8a0a09f846f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 51/90] mlt7: rebuild against ffmpeg-5.0
---
srcpkgs/mlt7/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5aefa500dd8a..f8352c2fc3f3 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
# Template file for 'mlt7'
pkgname=mlt7
version=7.4.0
-revision=1
+revision=2
wrksrc="mlt-${version}"
build_style=cmake
configure_args="-DSWIG_PYTHON=ON"
From 6c8da15d5676fbc090f26f96f8bfe52f26591a7a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/90] moc: rebuild against ffmpeg-5.0
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index c42be650a1d2..4b95426599bf 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 5a2c5429efaa2f3894309e9f81deae166ea0de33 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/90] motion: rebuild against ffmpeg-5.0
---
srcpkgs/motion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template
index 14ebb0b32118..efda46aec518 100644
--- a/srcpkgs/motion/template
+++ b/srcpkgs/motion/template
@@ -1,7 +1,7 @@
# Template file for 'motion'
pkgname=motion
version=4.4.0
-revision=1
+revision=2
wrksrc="motion-release-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config gettext-devel tar"
From ecba278096e89073fc431da9c5ed60d2a2d37312 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/90] mpd: rebuild against ffmpeg-5.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..7a61651ab8fd 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.6
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 92de8e83427f8c2ba7b10595eb44cda6bfbabe87 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/90] mpv: rebuild against ffmpeg-5.0
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From 3737a8ff7772f6fbb2c2d56739ec3140dbd9579c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 56/90] musikcube: rebuild against ffmpeg-5.0
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..1be832b772e5 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.97.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
From 19463c918349c28118cd93ffe47ed068f7cd74d6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 57/90] notcurses: rebuild against ffmpeg-5.0
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 724e7b7f2475..22652caeaba9 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
# Template file for 'notcurses'
pkgname=notcurses
version=3.0.8
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
hostmakedepends="pkg-config $(vopt_if man pandoc)"
From 4c9b5686d9d48ddf72417e3fbd89f966ec5ca116 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/90] obs: rebuild against ffmpeg-5.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index df6ee22e52ee..5c33b20aa58c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=27.2.4
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
wrksrc="obs-studio-${version}"
build_style=cmake
From af35729bbbee602ce5a277ce615afb8cd63300a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/90] olive: rebuild against ffmpeg-5.0
---
srcpkgs/olive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..5290d8e5aacd 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,7 +1,7 @@
# Template file for 'olive'
pkgname=olive
version=0.1.2
-revision=2
+revision=3
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
From bf6961f0c411a436264870903235db9177840fc6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/90] opencv: rebuild against ffmpeg-5.0
---
srcpkgs/opencv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..02cc923d2341 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
From 7ec32c413cf1851fc25713fc25b23432319f82bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/90] opencv4: rebuild against ffmpeg-5.0
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From 28865a6c789c0075578474a9f097cd15203aa81c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/90] openimageio: rebuild against ffmpeg-5.0
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..688552b0af21 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 3bd62be4158ff2c9c9ad514906e07604bb4af799 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 63/90] openmw: rebuild against ffmpeg-5.0
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 86e470bba96ba16fb1c4c9e48826c7d49befb560 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 64/90] osg: rebuild against ffmpeg-5.0
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
From b747416a9640df70e82c6f7cbfa8020939d6b8fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/90] ppsspp: rebuild against ffmpeg-5.0
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 38308424f58b..c76458459ec2 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.12.3
-revision=1
+revision=2
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
From e9ae6101fa391795ca5a76e30db86924d4218536 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/90] pqiv: rebuild against ffmpeg-5.0
---
srcpkgs/pqiv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template
index 542fc27a2d32..9308d949b6a1 100644
--- a/srcpkgs/pqiv/template
+++ b/srcpkgs/pqiv/template
@@ -1,7 +1,7 @@
# Template file for 'pqiv'
pkgname=pqiv
version=2.12
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg-devel)
From 90c85524900c2a48583d944f5b50b9a9c1e06bd8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/90] qmmp: rebuild against ffmpeg-5.0
---
srcpkgs/qmmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..4b9cc799ce69 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From e7e05c29022b642659238e612569d6626cb4cc51 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/90] qt5-webengine: rebuild against ffmpeg-5.0
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 213672ab215c..af54e123bd8d 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.8
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From f8c2a06dbb036185d2fc676113bbf6bd721bbdb0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 69/90] qtav: rebuild against ffmpeg-5.0
---
srcpkgs/qtav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 0d85ec076482..4f8e391dc210 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -1,7 +1,7 @@
# Template file for 'qtav'
pkgname=qtav
version=1.13.0
-revision=1
+revision=2
wrksrc="QtAV-${version}"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
From d7ad3ea8ee388e8da1a43bf01984a990222168cd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 70/90] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/patches/ffmpeg-5.0.patch | 79 +++++++++++++++++++++++++++
srcpkgs/qtox/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/qtox/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/qtox/patches/ffmpeg-5.0.patch b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..950dcd886ea6
--- /dev/null
+++ b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
@@ -0,0 +1,79 @@
+From 15673a52b6b4805d482b69281e21947fb7096e05 Mon Sep 17 00:00:00 2001
+From: Anthony Bilinski <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 62a80e81a3a5bbbee04e9bb47e7f249ca5a258b3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/90] retroarch: rebuild against ffmpeg-5.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..7b19803fbf41 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.2
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From c748bf180a154164bf8f23434704cf080d22e4bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/90] scrcpy: rebuild against ffmpeg-5.0
---
srcpkgs/scrcpy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..490c0442c361 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,7 +1,7 @@
# Template file for 'scrcpy'
pkgname=scrcpy
version=1.23
-revision=1
+revision=2
build_style=meson
configure_args="-Dcompile_server=false
-Dprebuilt_server=/usr/share/scrcpy/scrcpy-server-v${version}"
From 766962917e85e96b3c7f55cd9f27ac79652ea6af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/90] siril: rebuild against ffmpeg-5.0
---
srcpkgs/siril/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..424baf48cf76 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
# Template file for 'siril'
pkgname=siril
version=0.9.12
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
From 607c4d5fdc3d68294917a4220fe46cd2ab09aea5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/90] spek-alternative: rebuild against ffmpeg-5.0
---
srcpkgs/spek-alternative/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template
index d65086b8f008..72747cbb0a02 100644
--- a/srcpkgs/spek-alternative/template
+++ b/srcpkgs/spek-alternative/template
@@ -1,7 +1,7 @@
# Template file for 'spek-alternative'
pkgname=spek-alternative
version=0.8.2.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common"
makedepends="ffmpeg-devel wxWidgets-gtk3-devel"
From fd331d0a0b554fe7b5b5b70af11adc373b223767 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/90] ssr: rebuild against ffmpeg-5.0
---
srcpkgs/ssr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index a6439c742b22..37976b35d7f7 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,7 +1,7 @@
# Template file for 'ssr'
pkgname=ssr
version=0.4.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_QT5=ON"
hostmakedepends="pkg-config"
From 9134cdaabd2894c5794be822df5d42104872f48f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 76/90] sumo: rebuild against ffmpeg-5.0
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From b6303513336c3db32e4185390a982a2a593433a9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 77/90] synfig: rebuild against ffmpeg-5.0
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From 5da87c680b9e093d0dce819a1d769855ad250c78 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/90] synfigstudio: rebuild against ffmpeg-5.0
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 5c9e1a3ef5ccca42b67bdd9770a43414e59c4f1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/90] telegram-desktop: rebuild against ffmpeg-5.0
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..4452e74b3a86 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=3.4.8
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From 0c1ac327ec05d7a3ee8a1866d019dc256fc91e11 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/90] timg: rebuild against ffmpeg-5.0
---
srcpkgs/timg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 91f1516b2597..334443d3f9bb 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From c629a24c604ee2062e2cb33010e72331c55984f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/90] transcode: rebuild against ffmpeg-5.0
---
srcpkgs/transcode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template
index 775cd09fc4e3..47aec6ae1399 100644
--- a/srcpkgs/transcode/template
+++ b/srcpkgs/transcode/template
@@ -1,7 +1,7 @@
# Template file for 'transcode'
pkgname=transcode
version=1.1.7
-revision=4
+revision=5
wrksrc=mojaves-transcode-tcforge-70badbfe3674
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
From f2b17ffd1038777118c553a28915ffe4ae6cf869 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/90] tvheadend: rebuild against ffmpeg-5.0
---
srcpkgs/tvheadend/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index 230ecb592571..4a4867b253e3 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=5
+revision=6
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
From 51ec22d2a15dae34b7e936f1dd6d978c41347578 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 83/90] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..064cca88cc73 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,13 +1,13 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 38b192a863ad6ae41e220b980641a24ddc5a79c7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 84/90] vba-m: rebuild against ffmpeg-5.0
---
srcpkgs/vba-m/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 8e6447f5c6f5..d98b4d9fd930 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -2,7 +2,7 @@
pkgname=vba-m
reverts=1292_2
version=2.1.4
-revision=4
+revision=5
wrksrc="visualboyadvance-m-${version}"
build_style=cmake
configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
From b5e8d8d0d922beae1e0065717e2a27ed9cccf59a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/90] vlc: rebuild against ffmpeg-5.0
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..800009314203 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 3529a9637f4b61212eda784dedaa83100aa80904 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/90] waypipe: rebuild against ffmpeg-5.0
---
srcpkgs/waypipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index 31be3b1a0914..f7190653a187 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,7 +1,7 @@
# Template file for 'waypipe'
pkgname=waypipe
version=0.8.2
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
# lto is off because it causes linking errors in armv6l and armv7l (due to NEON)
From 19b87a3830fa60dce69b763d682c6645b680380c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/90] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 34a77236984c4259be190b1d28b718306fdbf742 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 88/90] xine-lib: rebuild against ffmpeg-5.0
---
srcpkgs/xine-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index f713eff49b07..ef7bcca02b0a 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
# Template file for 'xine-lib'
pkgname=xine-lib
version=1.2.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
--disable-oss"
From b19cd569af38a7777a17e81cfa86eee2046db9bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 89/90] xpra: rebuild against ffmpeg-5.0
---
srcpkgs/xpra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..91dddea47392 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
# Template file for 'xpra'
pkgname=xpra
version=4.3.2
-revision=1
+revision=2
build_style=python3-module
make_install_args="$(vopt_with docs)"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
From 24db3155299311de0bd252dce4d9caf7684f2249 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 90/90] pianobar: rebuild against ffmpeg-5.0
---
srcpkgs/pianobar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 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"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (13 preceding siblings ...)
2022-04-14 14:58 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-04-21 13:26 ` marmeladema
2022-04-22 1:48 ` [PR PATCH] [Updated] " tibequadorian
` (7 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: marmeladema @ 2022-04-21 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
New comment by marmeladema on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1105204063
Comment:
* gst-libav should be fixed now since it has been updated to 1.20.1 in https://github.com/void-linux/void-packages/pull/36605
* k3b should be fixed by https://github.com/void-linux/void-packages/pull/36800
* vlc 3.0.17 has partial support for FFmpeg 5 according to https://code.videolan.org/videolan/vlc/-/merge_requests/1245
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (14 preceding siblings ...)
2022-04-21 13:26 ` marmeladema
@ 2022-04-22 1:48 ` tibequadorian
2022-04-24 22:46 ` tibequadorian
` (6 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-04-22 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5596 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
- https://github.com/void-linux/void-packages/pull/36605
- https://github.com/void-linux/void-packages/pull/36691
- https://github.com/void-linux/void-packages/pull/36800
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [x] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [x] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 114975 bytes --]
From f2b47cb5391d146ddfd29040a591b296818117d5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 01/90] mlt: update to 6.26.1.
---
srcpkgs/mlt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 857a88d3a3ce..8933eb4e7bb9 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
-version=6.22.1
-revision=3
+version=6.26.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
@@ -14,11 +14,11 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libvidstab-devel libatomic-devel"
depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://mltframework.org/"
distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz"
-checksum=a3debdf0b8811f0d20c902cc3df3d05dad7d3ff36d1db16c0a7338d0d5989998
+checksum=8a484bbbf51f33e25312757531f3ad2ce20607149d20fcfcb40a3c1e60b20b4e
CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1"
CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1"
From c22f899741c0ded8fe51768e7fb6b6b14ada2687 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 02/90] New package: robin-hood-hashing-3.11.5
---
srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/robin-hood-hashing/template
diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
+homepage="https://github.com/martinus/robin-hood-hashing"
+distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz"
+checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0
+
+post_install() {
+ vlicense LICENSE
+}
From d3030139e76fd1b824dafa2ae1fd7a49228448f4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 03/90] SPIRV-Tools: update to 2022.1.
---
srcpkgs/SPIRV-Tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..7a0e2e6d2646 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
# Template file for 'SPIRV-Tools'
pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
revision=1
build_style=cmake
configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/KhronosGroup/SPIRV-Tools"
distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
+checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
SPIRV-Tools-devel_package() {
depends="SPIRV-Tools-${version}_${revision}"
From 5ed224a8e93aa1b334c13d89575a934ec4e150b0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 04/90] SPIRV-Headers: update to 1.3.204.1.
---
srcpkgs/SPIRV-Headers/template | 8 +++++---
srcpkgs/SPIRV-Headers/update | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/SPIRV-Headers/update
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..c67315ceb63f 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,13 @@
# Template file for 'SPIRV-Headers'
pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
build_style=cmake
short_desc="Machine-readable files for the SPIR-V Registry"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
-checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
+checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c
diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/SPIRV-Headers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
From fb6ba64ae0a02e8ae19efc2153997eb05613fb91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 05/90] Vulkan-Headers: update to 1.3.204.1.
---
srcpkgs/Vulkan-Headers/template | 9 +++++----
srcpkgs/Vulkan-Headers/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..f26d72798a03 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
# Template file for 'Vulkan-Headers'
pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
build_style=cmake
short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8
+distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz"
+checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e
diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update
index 995551ef357b..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Headers/update
+++ b/srcpkgs/Vulkan-Headers/update
@@ -1,2 +1 @@
-pkgname=sdk
-pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)"
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
From 66d931300396fcd22379fbd81ae795cdf4acf1ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 06/90] Vulkan-Tools: update to 1.3.204.1.
---
srcpkgs/Vulkan-Tools/template | 12 ++++++------
srcpkgs/Vulkan-Tools/update | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..b577e832c73e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
# Template file for 'Vulkan-Tools'
pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
build_style=cmake
configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz"
-checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
+distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz"
+checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49
build_options="cube"
desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update
index 75a4ad43aa6d..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Tools/update
+++ b/srcpkgs/Vulkan-Tools/update
@@ -1,2 +1 @@
-site=https://github.com/KhronosGroup/Vulkan-Tools/releases
-pkgname=sdk
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
From ee58a21e0b48b2f1cbff67f70d714a4efb187f28 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 07/90] Vulkan-ValidationLayers: update to 1.3.204.1.
---
srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
srcpkgs/Vulkan-ValidationLayers/update | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/Vulkan-ValidationLayers/update
diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..9a2d58434d24 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
# Template file for 'Vulkan-ValidationLayers'
pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
hostmakedepends="pkg-config"
makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
+distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz"
+checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341
diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/Vulkan-ValidationLayers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
From a8d7c218ad0bf087273f6288d77128b78933d40d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 08/90] vulkan-loader: update to 1.3.204.1.
---
srcpkgs/vulkan-loader/template | 10 +++++-----
srcpkgs/vulkan-loader/update | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..5b4f5366fe72 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
# Template file for 'vulkan-loader'
pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
build_style=cmake
configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
-DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
libXrandr-devel"
short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz"
-checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90
+distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz"
+checksum=5dcd42b564804f4c01891ddd429a4a5028113c4cf39b44256689e8f543773134
diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update
index 46acb07cbe81..c21c479d0e53 100644
--- a/srcpkgs/vulkan-loader/update
+++ b/srcpkgs/vulkan-loader/update
@@ -1,3 +1,3 @@
_pkgname=Vulkan-Loader
-site="https://github.com/KhronosGroup/${_pkgname}/releases"
+site="https://github.com/KhronosGroup/${_pkgname}/tags"
pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)"
From 3a9bc89fc6cb5a3519ad510ee30f38c79fc80bc6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 09/90] ffmpeg: update to 5.0.
---
common/shlibs | 17 ++++++++---------
srcpkgs/ffmpeg/template | 19 ++++++-------------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11328b15a9cc..5cd03500a921 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -387,15 +387,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
libgif.so.7 giflib-5.1.0_1
libImlib2.so.1 imlib2-1.4.2_1
libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.58 libavdevice-4.0_1
-libavformat.so.58 libavformat-4.0_1
-libswscale.so.5 libswscale-4.0_1
-libswresample.so.3 libswresample-4.0_1
-libavresample.so.4 libavresample-4.0_1
-libpostproc.so.55 libpostproc-4.0_1
-libavcodec.so.58 libavcodec-4.0_1
-libavutil.so.56 libavutil-4.0_1
-libavfilter.so.7 libavfilter-4.0_1
+libavdevice.so.59 libavdevice-5.0_1
+libavformat.so.59 libavformat-5.0_1
+libswscale.so.6 libswscale-5.0_1
+libswresample.so.4 libswresample-5.0_1
+libpostproc.so.56 libpostproc-5.0_1
+libavcodec.so.59 libavcodec-5.0_1
+libavutil.so.57 libavutil-5.0_1
+libavfilter.so.8 libavfilter-5.0_1
libSDL-1.2.so.0 SDL-1.2.14_1
libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 213aae8bbfa0..d319619deeaf 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.1
-revision=2
+version=5.0
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
+checksum=51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -24,7 +24,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
$(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
$(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
$(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)
- $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if vulkan 'vulkan-loader Vulkan-Headers Vulkan-Tools Vulkan-ValidationLayers')
$(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel)"
depends="ffplay>=${version}_${revision}"
@@ -109,7 +109,7 @@ do_configure() {
$(vopt_enable x265 libx265) \
$(vopt_enable v4l2 libv4l2) \
$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \
- --enable-libbs2b --enable-avresample --enable-libvidstab \
+ --enable-libbs2b --enable-libvidstab \
$(vopt_enable dav1d libdav1d) \
$(vopt_enable zimg libzimg) \
$(vopt_enable webp libwebp) \
@@ -138,12 +138,6 @@ libavdevice_package() {
vmove "usr/lib/libavdevice.so.*"
}
}
-libavresample_package() {
- short_desc="FFmpeg audio resampling library"
- pkg_install() {
- vmove "usr/lib/libavresample.so.*"
- }
-}
libavformat_package() {
short_desc="FFmpeg file format library"
pkg_install() {
@@ -189,8 +183,7 @@ ffmpeg-devel_package() {
libavfilter>=${version}_${revision}
libpostproc>=${version}_${revision}
libswscale>=${version}_${revision}
- libswresample>=${version}_${revision}
- libavresample>=${version}_${revision}"
+ libswresample>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 10e7cd63c8071b515bc699e264e755c9545ae0e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 10/90] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0923c53cfc05..63d7625925f5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -213,6 +213,7 @@ replaces="
key-mon<=1.17_5
laditools<=1.1.0_3
libapp<=20140527_2
+ libavresample<=4.4.1_1
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
From b6a015f899b06cd3fe31b8af68d18ebf7503de8e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 11/90] QMPlay2: rebuild against ffmpeg-5.0
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..335c130656d6 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=22.03.19
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 6ba36c6dd3f5fb23f232cb6ae1a26f8b6d0b3c31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 12/90] alsa-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/alsa-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..60066091b803 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
version=1.2.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
From f67c9a9d59734ae5914c4cccb5c98974d9a9f02c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/90] arcan: rebuild against ffmpeg-5.0
---
srcpkgs/arcan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f33db1fadeb8..e78d9dc76e2d 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,7 +1,7 @@
# Template file for 'arcan'
pkgname=arcan
version=0.6.1
-revision=1
+revision=2
build_wrksrc=src
build_style=cmake
make_cmd=make
From 3cdd30f85c4442cb5be472ea2e10da8dd0ad145e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/90] attract: rebuild against ffmpeg-5.0
---
srcpkgs/attract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index ceff4287193d..dc471aea1968 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
# Template file for 'attract'
pkgname=attract
version=2.6.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="VERBOSE=1"
hostmakedepends="pkg-config"
From 5f457c5924b864223b3c1424c68e5a446692083d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/90] aubio: rebuild against ffmpeg-5.0
---
srcpkgs/aubio/patches/ffmpeg-5.0.patch | 25 +++++++++++++++++++++++++
srcpkgs/aubio/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/aubio/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..aace41a6e6d9
--- /dev/null
+++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
@@ -0,0 +1,25 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+Date: Tue, 25 Jan 2022 18:30:27 +0100
+Subject: [PATCH] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec >
+ 59, thx @berolinux (closes gh-353)
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index e0ae93b5..1421bd9a 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -68,6 +68,10 @@
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ #endif
+
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#define FF_API_LAVF_AVCTX 1
++#endif
++
+ struct _aubio_source_avcodec_t {
+ uint_t hop_size;
+ uint_t samplerate;
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index eaab3e9fdb72..1697eb83541b 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -1,7 +1,7 @@
# Template file for 'aubio'
pkgname=aubio
version=0.4.9
-revision=1
+revision=2
build_style=waf3
# XXX lash, pure and swig support.
hostmakedepends="pkg-config txt2man"
From a13f5d0649d2972db1a03a19bca525e95808057d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 16/90] audacious-plugins: rebuild against ffmpeg-5.0
---
.../patches/ffmpeg-5.0.patch | 31 +++++++++++++++++++
srcpkgs/audacious-plugins/template | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..617c11215b90
--- /dev/null
+++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
@@ -0,0 +1,31 @@
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Sat, 5 Mar 2022 12:05:34 -0500
+Subject: [PATCH] Fix build with FFmpeg 5.0
+
+---
+ src/ffaudio/ffaudio-core.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
+index 16dc63e3a..a2b95fd6c 100644
+--- a/src/ffaudio/ffaudio-core.cc
++++ b/src/ffaudio/ffaudio-core.cc
+@@ -274,7 +274,7 @@ static AVInputFormat * get_format_by_content (const char * name, VFSFile & file)
+ AVProbeData d = {name, buf, filled};
+ score = target;
+
+- f = av_probe_input_format2 (& d, true, & score);
++ f = (AVInputFormat *) av_probe_input_format2 (& d, true, & score);
+ if (f)
+ break;
+
+@@ -347,7 +347,7 @@ static bool find_codec (AVFormatContext * c, CodecInfo * cinfo)
+ #endif
+ if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+ {
+- AVCodec * codec = avcodec_find_decoder (stream->codecpar->codec_id);
++ AVCodec * codec = (AVCodec *) avcodec_find_decoder (stream->codecpar->codec_id);
+
+ if (codec)
+ {
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d0724c54b0ad..9c29e6b45d47 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -2,7 +2,7 @@
#Keep in sync with audacious!
pkgname=audacious-plugins
version=4.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
hostmakedepends="gettext pkg-config glib-devel"
From f21b9c9877f04df83c14eaebe62bd205103a481f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 17/90] baresip: rebuild against ffmpeg-5.0
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..2b375e17d197 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=1.1.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr
SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
From f1f61ddf2a7354b035efb49f6b1211dadea61f9e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/90] blender: rebuild against ffmpeg-5.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 7ee4def04563d657840b40ac5f9149efb34ae168 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/90] cantata: rebuild against ffmpeg-5.0
---
srcpkgs/cantata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 8ce1d756ace9..f685d5f985f7 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,7 +1,7 @@
# Template file for 'cantata'
pkgname=cantata
version=2.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
From c00db6434fdac356380897acae5b76a9cc769b65 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/90] ccextractor: rebuild against ffmpeg-5.0
---
srcpkgs/ccextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 9abcd82852b2..7fe2ba4f27b6 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
# Template file for 'ccextractor'
pkgname=ccextractor
version=0.93
-revision=1
+revision=2
build_wrksrc="linux"
build_style=gnu-configure
configure_args="--enable-ocr --enable-hardsubx"
From b635a9cd4abf079b3c7adecaba83b7b19dbd40a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/90] chromaprint: rebuild against ffmpeg-5.0
---
srcpkgs/chromaprint/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 7ef7838949f3..1f7bbc70a22c 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,7 +1,7 @@
# Template file for 'chromaprint'
pkgname=chromaprint
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TOOLS=ON"
make_check_target="check"
From 05bf882e3664d5f23247ed40625aa52b51c31ca2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 22/90] chromium: rebuild against ffmpeg-5.0
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f655d29f3ba0..956d42903d29 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=100.0.4896.127
-revision=1
+revision=2
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 4b936636ca0ffec6ef1f21b57ec0d8eed935097b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 23/90] cmus: rebuild against ffmpeg-5.0
---
srcpkgs/cmus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..81c867e53d38 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
version=2.9.1
-revision=2
+revision=3
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
From 30cc80706c96e4c167c9d278b9b313378fcd2a07 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/90] deadbeef: rebuild against ffmpeg-5.0
---
srcpkgs/deadbeef/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 159ad1ce38bc..9a1589dbb1d9 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,7 +1,7 @@
# Template file for 'deadbeef'
pkgname=deadbeef
version=1.8.8
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
From b60e5bb62d62e58111344394b166e6920a94f008 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/90] dolphin-emu: rebuild against ffmpeg-5.0
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 2b3a783943b8..91b02229a382 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.16101
-revision=1
+revision=2
_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
_mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
#Version/hash pair can be found at https://dolphin-emu.org/download/
From 40ffea4167e3e9c8bb959251d9919e5e3cb43ec5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/90] droidcam: rebuild against ffmpeg-5.0
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..2b2eec714633 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,7 +1,7 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
From 880b32de06c01a182af03215fa33a77fba089e60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/90] electron10: rebuild against ffmpeg-5.0
---
srcpkgs/electron10/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 05506dddcb37..986c96bf83f4 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -3,7 +3,7 @@ pkgname=electron10
version=10.4.7
_nodever=12.16.3
_chromiumver=85.0.4183.121
-revision=2
+revision=3
archs="x86_64* i686* aarch64*"
build_wrksrc="src"
create_wrksrc=yes
From 0f5ce104209f12be7f2c1592ca731eedfcbd0fdc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/90] electron13: rebuild against ffmpeg-5.0
---
srcpkgs/electron13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 1ceb6f788a62..77c7d5306cd6 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,7 +1,7 @@
# Template file for 'electron13'
pkgname=electron13
version=13.6.7
-revision=1
+revision=2
_nodever=14.16.0
_chromiumver=91.0.4472.164
archs="x86_64* i686* aarch64* ppc64le*"
From e951d5a21f066b84bd3ac500fcd04790520968af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 29/90] ffmpegthumbnailer: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbnailer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 039eea7622b3..27bba7e685a0 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbnailer'
pkgname=ffmpegthumbnailer
version=2.2.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
From 3065b2dd7e0f8f64cdc3e362ea21e5a5889bb7e8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 30/90] ffmpegthumbs: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..4e61fa2e51d7 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbs'
pkgname=ffmpegthumbs
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
pkg-config qt5-host-tools qt5-qmake gettext"
From adbb5a731bdac6c9d404dcb7eb0fca2d22caaab1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/90] ffms2: rebuild against ffmpeg-5.0
---
srcpkgs/ffms2/patches/ffmpeg-5.0.patch | 419 +++++++++++++++++++++++++
srcpkgs/ffms2/template | 2 +-
2 files changed, 420 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ffms2/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/ffms2/patches/ffmpeg-5.0.patch b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..86f1387d7f9d
--- /dev/null
+++ b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
@@ -0,0 +1,419 @@
+From 28fc493fda2fa2064afeeb0a5d85fdc42db05dcf Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ src/core/audiosource.cpp | 2 +-
+ src/core/indexing.cpp | 6 +++---
+ src/core/videosource.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
+index e4ce97cdb..ac0966636 100644
+--- a/src/core/audiosource.cpp
++++ b/src/core/audiosource.cpp
+@@ -469,7 +469,7 @@ void FFMS_AudioSource::OpenFile() {
+
+ LAVFOpenFile(SourceFile.c_str(), FormatContext, TrackNumber);
+
+- AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id);
++ auto *Codec = avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id);
+ if (Codec == nullptr)
+ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC,
+ "Audio codec not found");
+diff --git a/src/core/indexing.cpp b/src/core/indexing.cpp
+index e547c5abf..59fb4e8ea 100644
+--- a/src/core/indexing.cpp
++++ b/src/core/indexing.cpp
+@@ -384,7 +384,7 @@ FFMS_TrackType FFMS_Indexer::GetTrackType(int Track) {
+ }
+
+ const char *FFMS_Indexer::GetTrackCodec(int Track) {
+- AVCodec *codec = avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id);
++ auto *codec = avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id);
+ return codec ? codec->name : nullptr;
+ }
+
+@@ -402,7 +402,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() {
+ UseDTS);
+
+ if (IndexMask.count(i) && FormatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+- AVCodec *VideoCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id);
++ auto *VideoCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id);
+ if (!VideoCodec) {
+ FormatContext->streams[i]->discard = AVDISCARD_ALL;
+ IndexMask.erase(i);
+@@ -433,7 +433,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() {
+ IndexMask.insert(i);
+ }
+ } else if (IndexMask.count(i) && FormatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
+- AVCodec *AudioCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id);
++ auto *AudioCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id);
+ if (AudioCodec == nullptr)
+ throw FFMS_Exception(FFMS_ERROR_CODEC, FFMS_ERROR_UNSUPPORTED,
+ "Audio codec not found");
+diff --git a/src/core/videosource.cpp b/src/core/videosource.cpp
+index b889970e2..8956c2256 100644
+--- a/src/core/videosource.cpp
++++ b/src/core/videosource.cpp
+@@ -171,7 +171,7 @@ FFMS_VideoSource::FFMS_VideoSource(const char *SourceFile, FFMS_Index &Index, in
+
+ LAVFOpenFile(SourceFile, FormatContext, VideoTrack);
+
+- AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[VideoTrack]->codecpar->codec_id);
++ auto *Codec = avcodec_find_decoder(FormatContext->streams[VideoTrack]->codecpar->codec_id);
+ if (Codec == nullptr)
+ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC,
+ "Video codec not found");
diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template
index 68e8a0c14bce..2acfadac44b3 100644
--- a/srcpkgs/ffms2/template
+++ b/srcpkgs/ffms2/template
@@ -1,7 +1,7 @@
# Template file for 'ffms2'
pkgname=ffms2
version=2.40
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-static"
hostmakedepends="pkg-config autoconf automake libtool"
From 27ec208934a286c7da07d42dbabfbf99d122eced Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/90] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From 7aded20f13401f50e6b5e1873324a912cce896a1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/90] gerbera: rebuild against ffmpeg-5.0
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..4e0e2a94a9fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.6.4
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From dac7e05d36c3d58c2e3b3715ac18a25be59602cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/90] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From 09800fbee8ea6bbfa71aa90bb4b1d8aee3d44926 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/90] gst-libav: rebuild against ffmpeg-5.0
---
srcpkgs/gst-libav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 333636d0657a..3333c957fab0 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,7 +1,7 @@
# Template file for 'gst-libav'
pkgname=gst-libav
version=1.20.1
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=meson
hostmakedepends="pkg-config yasm"
From 39b7df8712edb320150c2115e72834e0a17f5322 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 36/90] guvcview: rebuild against ffmpeg-5.0
---
srcpkgs/guvcview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 345cf6006f24..d42fd38fa4ad 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,7 +1,7 @@
# Template file for 'guvcview'
pkgname=guvcview
version=2.0.7
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-static --disable-debian-menu"
From 0390ccb35fc12f2ad252bb930092ad57ec4f4e25 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 37/90] handbrake: rebuild against ffmpeg-5.0
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6ad7bd3ea798..7bff9580c310 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.5.1
-revision=1
+revision=2
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From 7bf4007b36b3cc74dde289aa3d16ae85ed73f3fb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/90] hedgewars: rebuild against ffmpeg-5.0
---
srcpkgs/hedgewars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 7060dbc37d95..36ca62d4fbbd 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=3
+revision=4
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
From 0b58697284838d2b944b4bb67fbd19d6056d211b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/90] idjc: rebuild against ffmpeg-5.0
---
srcpkgs/idjc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index ddabff2a4e74..df60318b3db9 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,7 +1,7 @@
# Template file for 'idjc'
pkgname=idjc
version=0.9.1
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
From 8c453d47a6113333eb3c0d8ac59237efb46b95be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/90] k3b: rebuild against ffmpeg-5.0
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..900f312e9338 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
qt5-host-tools kauth kdoctools kcoreaddons"
From d4387405f886091e4129c0a8ad8931ded0a846f6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/90] kfilemetadata5: rebuild against ffmpeg-5.0
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eb162fdff6d0..9e36331f50c4 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.93.0
-revision=1
+revision=2
wrksrc="${pkgname%5}-${version}"
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
From f811d0021f7d4ff5d129e632ce56607ab8a8d328 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/90] kid3: rebuild against ffmpeg-5.0
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 81633262dc03..456206d90e16 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From fb7b8e9653c698b113743fb3b2ae1193a36749d5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 43/90] kodi: rebuild against ffmpeg-5.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..fa671eb181ff 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=1
+revision=2
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 4ee19ba5188da784032fbb9a416bb6d7877a6059 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 44/90] libextractor: rebuild against ffmpeg-5.0
---
srcpkgs/libextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index 29d5b8df01f8..ddd4790f93e8 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,7 +1,7 @@
# Template file for 'libextractor'
pkgname=libextractor
version=1.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
From ad30ecda97b1a0e8617a2b76cb01c9db5be4f394 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/90] libopenshot: rebuild against ffmpeg-5.0
---
srcpkgs/libopenshot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 71dff12b5d61..662a54758232 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
# Template file for 'libopenshot'
pkgname=libopenshot
version=0.2.7
-revision=1
+revision=2
build_style=cmake
# Builds fail with Ruby-2.4.1
configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON"
From 90e4121ea8d909deb35903182e208bb9a379909f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/90] loudgain: rebuild against ffmpeg-5.0
---
srcpkgs/loudgain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index da4f2d56e94c..4d6bf29efb4f 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
# Template file for 'loudgain'
pkgname=loudgain
version=0.6.8
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libebur128-devel taglib-devel ffmpeg-devel"
From 889bc2b943f4eba8376da4648766bd9910d57bc3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/90] mediastreamer: rebuild against ffmpeg-5.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 42f7cf4824ea..40e6dcf95a99 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.1.20
-revision=1
+revision=2
wrksrc="mediastreamer2-${version}"
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 876426eff335259a80ddc3a26ab9816f5ba19abb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/90] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/patches/ffmpeg-5.0.patch | 117 ++++++++++++++++++++++++++
srcpkgs/mgba/template | 2 +-
2 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mgba/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/mgba/patches/ffmpeg-5.0.patch b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un
+ return true;
+ }
+
+- AVCodec* codec = avcodec_find_encoder_by_name(acodec);
++ const AVCodec* codec = avcodec_find_encoder_by_name(acodec);
+ if (!codec) {
+ return false;
+ }
+@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ return true;
+ }
+
+- AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
++ const AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
+ if (!codec) {
+ return false;
+ }
+@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ if (encoder->pixFormat == AV_PIX_FMT_NONE) {
+ return false;
+ }
+- if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) {
++ if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) {
+ return false;
+ }
+ encoder->videoCodec = vcodec;
+@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ }
+
+ bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) {
+- AVOutputFormat* oformat = av_guess_format(container, 0, 0);
++ const AVOutputFormat* oformat = av_guess_format(container, 0, 0);
+ if (!oformat) {
+ return false;
+ }
+@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) {
+ }
+
+ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) {
+ return false;
+ }
+@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+ }
+
+ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) {
+ return false;
+ }
+@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+ encoder->currentVideoFrame = 0;
+ encoder->skipResidue = 0;
+
+- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+ #ifndef USE_LIBAV
+- avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile);
++ avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile);
+ #else
+ encoder->context = avformat_alloc_context();
+ strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1);
diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template
index a9babfe5f8e0..a6dddada2602 100644
--- a/srcpkgs/mgba/template
+++ b/srcpkgs/mgba/template
@@ -1,7 +1,7 @@
# Template file for 'mgba'
pkgname=mgba
version=0.9.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake desktop-file-utils"
makedepends="SDL2-devel ffmpeg-devel libedit-devel libepoxy-devel libmagick-devel
From ed20c0a5ee1b5bc9f855531cf08c4affda86ff82 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/90] minidlna: rebuild against ffmpeg-5.0
---
srcpkgs/minidlna/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index da681f604300..e42ad491acf3 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,7 +1,7 @@
# Template file for 'minidlna'
pkgname=minidlna
version=1.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin
From a3971bd5f3ebd5af63bc45b471b2b0f6d9b35a36 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 50/90] mlt: rebuild against ffmpeg-5.0
---
srcpkgs/mlt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 8933eb4e7bb9..ed6b27503f9a 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
version=6.26.1
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
From d2f01a54461b1bc4e433c4e8bab8a2c65ef520ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 51/90] mlt7: rebuild against ffmpeg-5.0
---
srcpkgs/mlt7/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5aefa500dd8a..f8352c2fc3f3 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
# Template file for 'mlt7'
pkgname=mlt7
version=7.4.0
-revision=1
+revision=2
wrksrc="mlt-${version}"
build_style=cmake
configure_args="-DSWIG_PYTHON=ON"
From 2900eb27925d1ec09dd920f68d2f08570bc5a586 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/90] moc: rebuild against ffmpeg-5.0
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index c42be650a1d2..4b95426599bf 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 7cfdd8710c5d30875c2290ead98760775dd303ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/90] motion: rebuild against ffmpeg-5.0
---
srcpkgs/motion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template
index 14ebb0b32118..efda46aec518 100644
--- a/srcpkgs/motion/template
+++ b/srcpkgs/motion/template
@@ -1,7 +1,7 @@
# Template file for 'motion'
pkgname=motion
version=4.4.0
-revision=1
+revision=2
wrksrc="motion-release-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config gettext-devel tar"
From 46aab0de546d361950a15a28264382b4bc42a2ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/90] mpd: rebuild against ffmpeg-5.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..7a61651ab8fd 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.6
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From ec208de5967bf8bb0aeb8a1024ec830e7a5a2a24 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/90] mpv: rebuild against ffmpeg-5.0
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From fdc0f4ff13d0db030510ed4b04491e5ccd93f569 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 56/90] musikcube: rebuild against ffmpeg-5.0
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..1be832b772e5 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.97.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
From cc35cc02c174da237544e425a25aaf6b1526f84c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 57/90] notcurses: rebuild against ffmpeg-5.0
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 724e7b7f2475..22652caeaba9 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
# Template file for 'notcurses'
pkgname=notcurses
version=3.0.8
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
hostmakedepends="pkg-config $(vopt_if man pandoc)"
From b5eb443f21f6a6a82ee1dfb263127315bbafdba7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/90] obs: rebuild against ffmpeg-5.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index df6ee22e52ee..5c33b20aa58c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=27.2.4
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
wrksrc="obs-studio-${version}"
build_style=cmake
From 87a604225a73fc769cdb719a90fbb800b166e652 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/90] olive: rebuild against ffmpeg-5.0
---
srcpkgs/olive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..5290d8e5aacd 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,7 +1,7 @@
# Template file for 'olive'
pkgname=olive
version=0.1.2
-revision=2
+revision=3
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
From 47cd17e7b125d9447b64c579ec4cdf0696deabf4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/90] opencv: rebuild against ffmpeg-5.0
---
srcpkgs/opencv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..02cc923d2341 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
From 6811cd580e6a13af28090efea1b08a86e04c0c4d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/90] opencv4: rebuild against ffmpeg-5.0
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From 0d9f863dc433eb6b0317502ff712263eef44a616 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/90] openimageio: rebuild against ffmpeg-5.0
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..688552b0af21 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 561a84ed53940e1991e44b0aaaef9b861077cb7b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 63/90] openmw: rebuild against ffmpeg-5.0
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 5f6752c64097370bbcb0b36a48664506b9a124bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 64/90] osg: rebuild against ffmpeg-5.0
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
From f7f65a78b7ce7c6a4fec2e0be683090f4a6135a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/90] ppsspp: rebuild against ffmpeg-5.0
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 38308424f58b..c76458459ec2 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.12.3
-revision=1
+revision=2
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
From ad44337b7c6558a31b4651a7d6ccc790485c2991 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/90] pqiv: rebuild against ffmpeg-5.0
---
srcpkgs/pqiv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template
index 542fc27a2d32..9308d949b6a1 100644
--- a/srcpkgs/pqiv/template
+++ b/srcpkgs/pqiv/template
@@ -1,7 +1,7 @@
# Template file for 'pqiv'
pkgname=pqiv
version=2.12
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg-devel)
From 54857661001dfc4de2be7ecfeeb4a45ac9c864b3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/90] qmmp: rebuild against ffmpeg-5.0
---
srcpkgs/qmmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..4b9cc799ce69 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From a5e1ffd39709efbf89636da7e1e955c55a19d7d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/90] qt5-webengine: rebuild against ffmpeg-5.0
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 213672ab215c..af54e123bd8d 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.8
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From 335bf064268a3d95146e5e7a1c9b98a0a1d1af64 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 69/90] qtav: rebuild against ffmpeg-5.0
---
srcpkgs/qtav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 0d85ec076482..4f8e391dc210 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -1,7 +1,7 @@
# Template file for 'qtav'
pkgname=qtav
version=1.13.0
-revision=1
+revision=2
wrksrc="QtAV-${version}"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
From f20f324c6e003e1e899cc0aa9d2054757f07d5ed Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 70/90] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/patches/ffmpeg-5.0.patch | 79 +++++++++++++++++++++++++++
srcpkgs/qtox/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/qtox/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/qtox/patches/ffmpeg-5.0.patch b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..950dcd886ea6
--- /dev/null
+++ b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
@@ -0,0 +1,79 @@
+From 15673a52b6b4805d482b69281e21947fb7096e05 Mon Sep 17 00:00:00 2001
+From: Anthony Bilinski <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> openDevices;
+ static QMutex openDeviceLock, iformatLock;
+- static AVInputFormat *iformat, *idesktopFormat;
+ };
+diff --git a/src/video/camerasource.cpp b/src/video/camerasource.cpp
+index 134bc49afc..3a899f11d0 100644
+--- a/src/video/camerasource.cpp
++++ b/src/video/camerasource.cpp
+@@ -278,7 +278,6 @@ void CameraSource::openDevice()
+ }
+
+ // We need to create a new CameraDevice
+- AVCodec* codec;
+ device = CameraDevice::open(deviceName, mode);
+
+ if (!device) {
+@@ -322,7 +321,7 @@ void CameraSource::openDevice()
+ AVCodecParameters* cparams = device->context->streams[videoStreamIndex]->codecpar;
+ codecId = cparams->codec_id;
+ #endif
+- codec = avcodec_find_decoder(codecId);
++ const AVCodec* codec = avcodec_find_decoder(codecId);
+ if (!codec) {
+ qWarning() << "Codec not found";
+ emit openFailed();
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index f3fa78acb915..e90d434e370d 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.4
-revision=1
+revision=2
wrksrc="qTox-${version}"
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
From 7edde5416af29b7a463c8d0f188ff726aa4e1f6b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/90] retroarch: rebuild against ffmpeg-5.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..7b19803fbf41 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.2
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From 1ea1a543f902ac4503beb535a4847401f11b3578 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/90] scrcpy: rebuild against ffmpeg-5.0
---
srcpkgs/scrcpy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..490c0442c361 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,7 +1,7 @@
# Template file for 'scrcpy'
pkgname=scrcpy
version=1.23
-revision=1
+revision=2
build_style=meson
configure_args="-Dcompile_server=false
-Dprebuilt_server=/usr/share/scrcpy/scrcpy-server-v${version}"
From 61ff6a2ec881777d6864328430c0b75c4e1e6f58 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/90] siril: rebuild against ffmpeg-5.0
---
srcpkgs/siril/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..424baf48cf76 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
# Template file for 'siril'
pkgname=siril
version=0.9.12
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
From 4edfc0af2a1f808cd7b7bbfbaee38a1621737e6b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/90] spek-alternative: rebuild against ffmpeg-5.0
---
srcpkgs/spek-alternative/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template
index d65086b8f008..72747cbb0a02 100644
--- a/srcpkgs/spek-alternative/template
+++ b/srcpkgs/spek-alternative/template
@@ -1,7 +1,7 @@
# Template file for 'spek-alternative'
pkgname=spek-alternative
version=0.8.2.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common"
makedepends="ffmpeg-devel wxWidgets-gtk3-devel"
From 6aeea7c3714cef17f96409ca16a14de77708f24b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/90] ssr: rebuild against ffmpeg-5.0
---
srcpkgs/ssr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index a6439c742b22..37976b35d7f7 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,7 +1,7 @@
# Template file for 'ssr'
pkgname=ssr
version=0.4.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_QT5=ON"
hostmakedepends="pkg-config"
From 0e2eaef9a04c503962bc790a5ca06b0f51000ceb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 76/90] sumo: rebuild against ffmpeg-5.0
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From 59d53308ac8d17bf32bff8f6db15188668c44b5a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 77/90] synfig: rebuild against ffmpeg-5.0
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From a468f00ea5a5d6620fe88873c02a6e6a571df411 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/90] synfigstudio: rebuild against ffmpeg-5.0
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9d7c6495e11463f5335ed3dc6ac440bd241c8b5c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/90] telegram-desktop: rebuild against ffmpeg-5.0
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..4452e74b3a86 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=3.4.8
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From e1b054db5c34705eaed55ec63fe88718f6d2df3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/90] timg: rebuild against ffmpeg-5.0
---
srcpkgs/timg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 91f1516b2597..334443d3f9bb 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From bbcd79a00670369e6382984dc62f7ae18ec5d839 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/90] transcode: rebuild against ffmpeg-5.0
---
srcpkgs/transcode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template
index 775cd09fc4e3..47aec6ae1399 100644
--- a/srcpkgs/transcode/template
+++ b/srcpkgs/transcode/template
@@ -1,7 +1,7 @@
# Template file for 'transcode'
pkgname=transcode
version=1.1.7
-revision=4
+revision=5
wrksrc=mojaves-transcode-tcforge-70badbfe3674
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
From 124aec5b9bca6c3fd19a820144caac9034f86515 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/90] tvheadend: rebuild against ffmpeg-5.0
---
srcpkgs/tvheadend/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index 230ecb592571..4a4867b253e3 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=5
+revision=6
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
From bb6923d1a25bf0d03a785ecfd2b590dde7cee98a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 83/90] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..064cca88cc73 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,13 +1,13 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
homepage="https://www.flameeyes.eu/projects/unpaper"
-short_desc="A post-processing tool for scanned sheets of paper"
distfiles="https://www.flameeyes.eu/files/${pkgname}-${version}.tar.xz"
checksum=237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930
From 35cf68d3f81eb10d5d829aaa629c740b48b9610a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 84/90] vba-m: rebuild against ffmpeg-5.0
---
srcpkgs/vba-m/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 8e6447f5c6f5..d98b4d9fd930 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -2,7 +2,7 @@
pkgname=vba-m
reverts=1292_2
version=2.1.4
-revision=4
+revision=5
wrksrc="visualboyadvance-m-${version}"
build_style=cmake
configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
From 15b316fb386454da9a4b56a5c46e07f9ef541fcb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/90] vlc: rebuild against ffmpeg-5.0
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..800009314203 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 5cb0b13ddb0df65feccadc353584cf509aa1686c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/90] waypipe: rebuild against ffmpeg-5.0
---
srcpkgs/waypipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index 31be3b1a0914..f7190653a187 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,7 +1,7 @@
# Template file for 'waypipe'
pkgname=waypipe
version=0.8.2
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
# lto is off because it causes linking errors in armv6l and armv7l (due to NEON)
From 58bff2cf893e8a5d99cd1c45ea41d925c966d2d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/90] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From a9f3fe9f9e8a34b44c326df5861dab95c51d9bd3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 88/90] xine-lib: rebuild against ffmpeg-5.0
---
srcpkgs/xine-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index f713eff49b07..ef7bcca02b0a 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
# Template file for 'xine-lib'
pkgname=xine-lib
version=1.2.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
--disable-oss"
From dc51fd892ae3e8ee1bd21f6072432905ab046c7d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 89/90] xpra: rebuild against ffmpeg-5.0
---
srcpkgs/xpra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..91dddea47392 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
# Template file for 'xpra'
pkgname=xpra
version=4.3.2
-revision=1
+revision=2
build_style=python3-module
make_install_args="$(vopt_with docs)"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
From 7c68d93c2374e849f6badfa872eb5877fdc270ce Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 90/90] pianobar: rebuild against ffmpeg-5.0
---
srcpkgs/pianobar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index a9b29e91993f..81efcd122c4d 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,7 +1,7 @@
# Template file for 'pianobar'
pkgname=pianobar
version=2022.04.01
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="V=1"
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (15 preceding siblings ...)
2022-04-22 1:48 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-04-24 22:46 ` tibequadorian
2022-05-07 21:50 ` tibequadorian
` (5 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-04-24 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5596 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36158
- https://github.com/void-linux/void-packages/pull/36226
- https://github.com/void-linux/void-packages/pull/36317
- https://github.com/void-linux/void-packages/pull/36318
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
- https://github.com/void-linux/void-packages/pull/36605
- https://github.com/void-linux/void-packages/pull/36691
- https://github.com/void-linux/void-packages/pull/36800
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [x] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [ ] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [x] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 114975 bytes --]
From 3885811f283235d2ecfbb6337fc92b961188d5be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 01/90] mlt: update to 6.26.1.
---
srcpkgs/mlt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 857a88d3a3ce..8933eb4e7bb9 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
-version=6.22.1
-revision=3
+version=6.26.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
@@ -14,11 +14,11 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libvidstab-devel libatomic-devel"
depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 dc8b94d7a6ff94ea821d3126616b9a14f70aed8e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 02/90] New package: robin-hood-hashing-3.11.5
---
srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/robin-hood-hashing/template
diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+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 f655e651e05343413af0bbef1fecfd147aa05a02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 03/90] SPIRV-Tools: update to 2022.1.
---
srcpkgs/SPIRV-Tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..7a0e2e6d2646 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
# Template file for 'SPIRV-Tools'
pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
revision=1
build_style=cmake
configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 35c19e21fea78fe0f784f1cb0f5a316f94d930a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 04/90] SPIRV-Headers: update to 1.3.204.1.
---
srcpkgs/SPIRV-Headers/template | 8 +++++---
srcpkgs/SPIRV-Headers/update | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/SPIRV-Headers/update
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..c67315ceb63f 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,13 @@
# Template file for 'SPIRV-Headers'
pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
build_style=cmake
short_desc="Machine-readable files for the SPIR-V Registry"
maintainer="Orphaned <orphan@voidlinux.org>"
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 ec9e78ef1fe551a5c4d41654602a486df37b2f0b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 05/90] Vulkan-Headers: update to 1.3.204.1.
---
srcpkgs/Vulkan-Headers/template | 9 +++++----
srcpkgs/Vulkan-Headers/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..f26d72798a03 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
# Template file for 'Vulkan-Headers'
pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
build_style=cmake
short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 3a0638f985b21665a87f9ec00fce7b282019f64d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 06/90] Vulkan-Tools: update to 1.3.204.1.
---
srcpkgs/Vulkan-Tools/template | 12 ++++++------
srcpkgs/Vulkan-Tools/update | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..b577e832c73e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
# Template file for 'Vulkan-Tools'
pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
build_style=cmake
configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 58d5824f18a9df11f56a0d241cf784576b40c2d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 07/90] Vulkan-ValidationLayers: update to 1.3.204.1.
---
srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
srcpkgs/Vulkan-ValidationLayers/update | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/Vulkan-ValidationLayers/update
diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..9a2d58434d24 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
# Template file for 'Vulkan-ValidationLayers'
pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
hostmakedepends="pkg-config"
makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 c31e8d36ecde4a7e283f46a11d090b7f1278e245 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 08/90] vulkan-loader: update to 1.3.204.1.
---
srcpkgs/vulkan-loader/template | 10 +++++-----
srcpkgs/vulkan-loader/update | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..5b4f5366fe72 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
# Template file for 'vulkan-loader'
pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
build_style=cmake
configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
-DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
libXrandr-devel"
short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 cb7e364f868122c78efd040cce20f53f2e4121b1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 09/90] ffmpeg: update to 5.0.
---
common/shlibs | 17 ++++++++---------
srcpkgs/ffmpeg/template | 19 ++++++-------------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..2aa8c4e77ebd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -387,15 +387,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
libgif.so.7 giflib-5.1.0_1
libImlib2.so.1 imlib2-1.4.2_1
libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.58 libavdevice-4.0_1
-libavformat.so.58 libavformat-4.0_1
-libswscale.so.5 libswscale-4.0_1
-libswresample.so.3 libswresample-4.0_1
-libavresample.so.4 libavresample-4.0_1
-libpostproc.so.55 libpostproc-4.0_1
-libavcodec.so.58 libavcodec-4.0_1
-libavutil.so.56 libavutil-4.0_1
-libavfilter.so.7 libavfilter-4.0_1
+libavdevice.so.59 libavdevice-5.0_1
+libavformat.so.59 libavformat-5.0_1
+libswscale.so.6 libswscale-5.0_1
+libswresample.so.4 libswresample-5.0_1
+libpostproc.so.56 libpostproc-5.0_1
+libavcodec.so.59 libavcodec-5.0_1
+libavutil.so.57 libavutil-5.0_1
+libavfilter.so.8 libavfilter-5.0_1
libSDL-1.2.so.0 SDL-1.2.14_1
libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 213aae8bbfa0..d319619deeaf 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.1
-revision=2
+version=5.0
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
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 959c0ad6f0b2c3513a9526233e5397b472499839 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 10/90] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0923c53cfc05..63d7625925f5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -213,6 +213,7 @@ replaces="
key-mon<=1.17_5
laditools<=1.1.0_3
libapp<=20140527_2
+ libavresample<=4.4.1_1
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
From c49bd1760ed96a2cf7ee3c809386cfb2c03ca8d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 11/90] QMPlay2: rebuild against ffmpeg-5.0
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..335c130656d6 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=22.03.19
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 33a0b303aa779be3c6c15e4f3fafaf727ed625f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 12/90] alsa-plugins: rebuild against ffmpeg-5.0
---
srcpkgs/alsa-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..60066091b803 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
version=1.2.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
From ad93c6bfa48a19b7b714b550b15ce8e2aa2a7da3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 13/90] arcan: rebuild against ffmpeg-5.0
---
srcpkgs/arcan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f33db1fadeb8..e78d9dc76e2d 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,7 +1,7 @@
# Template file for 'arcan'
pkgname=arcan
version=0.6.1
-revision=1
+revision=2
build_wrksrc=src
build_style=cmake
make_cmd=make
From 4212c42e1ad94625cc68de1871e95074b01fd8df Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 14/90] attract: rebuild against ffmpeg-5.0
---
srcpkgs/attract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index ceff4287193d..dc471aea1968 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
# Template file for 'attract'
pkgname=attract
version=2.6.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="VERBOSE=1"
hostmakedepends="pkg-config"
From 3b90ace88c793bfc072a9da6e1ced6596175ad1c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 15/90] aubio: rebuild against ffmpeg-5.0
---
srcpkgs/aubio/patches/ffmpeg-5.0.patch | 25 +++++++++++++++++++++++++
srcpkgs/aubio/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/aubio/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..aace41a6e6d9
--- /dev/null
+++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
@@ -0,0 +1,25 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+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 e35bb225dedd73bb4b629c57fe584b19ef2619e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 16/90] audacious-plugins: rebuild against ffmpeg-5.0
---
.../patches/ffmpeg-5.0.patch | 31 +++++++++++++++++++
srcpkgs/audacious-plugins/template | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..617c11215b90
--- /dev/null
+++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
@@ -0,0 +1,31 @@
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+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 19ca2176140d6aa2b909de82c841e8b9bc15e1d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 17/90] baresip: rebuild against ffmpeg-5.0
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 203250ecebfe..2b375e17d197 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=1.1.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr
SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
From 7659e490f907068bc29eb538571a517ed615737e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 18/90] blender: rebuild against ffmpeg-5.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 3cbc6160be98af67c1d51975b1791309573b473c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 19/90] cantata: rebuild against ffmpeg-5.0
---
srcpkgs/cantata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 8ce1d756ace9..f685d5f985f7 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,7 +1,7 @@
# Template file for 'cantata'
pkgname=cantata
version=2.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
From 93060b374750ee900e7dcedd37d31654af2e3cb9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 20/90] ccextractor: rebuild against ffmpeg-5.0
---
srcpkgs/ccextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 9abcd82852b2..7fe2ba4f27b6 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
# Template file for 'ccextractor'
pkgname=ccextractor
version=0.93
-revision=1
+revision=2
build_wrksrc="linux"
build_style=gnu-configure
configure_args="--enable-ocr --enable-hardsubx"
From 5c7851f7b180e8f8f5d1ca102efd009153df1fc1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 21/90] chromaprint: rebuild against ffmpeg-5.0
---
srcpkgs/chromaprint/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 7ef7838949f3..1f7bbc70a22c 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,7 +1,7 @@
# Template file for 'chromaprint'
pkgname=chromaprint
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TOOLS=ON"
make_check_target="check"
From d3a054fdcafc68dfc2d0caa4beec217f1c2dc877 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 22/90] chromium: rebuild against ffmpeg-5.0
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f655d29f3ba0..956d42903d29 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=100.0.4896.127
-revision=1
+revision=2
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 3784e8af84cfaefb176fcb90328d4ecfe30639d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 23/90] cmus: rebuild against ffmpeg-5.0
---
srcpkgs/cmus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..81c867e53d38 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
version=2.9.1
-revision=2
+revision=3
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
From 04fc7a26ca5ba69ac3b8cdf1e363ac2b3c096914 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 24/90] deadbeef: rebuild against ffmpeg-5.0
---
srcpkgs/deadbeef/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 159ad1ce38bc..9a1589dbb1d9 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,7 +1,7 @@
# Template file for 'deadbeef'
pkgname=deadbeef
version=1.8.8
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
From 1e1a00c711275afc21ab37ee826e9cb01926b9a8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 25/90] dolphin-emu: rebuild against ffmpeg-5.0
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 2b3a783943b8..91b02229a382 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.16101
-revision=1
+revision=2
_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
_mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
#Version/hash pair can be found at https://dolphin-emu.org/download/
From b5a28ab6e464c63fcdc171358e729a8f09a08c88 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 26/90] droidcam: rebuild against ffmpeg-5.0
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..2b118b765ca9 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,7 +1,7 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
From 9ac1fa594daaa180825c9a26d1818b6afbb028d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 27/90] electron10: rebuild against ffmpeg-5.0
---
srcpkgs/electron10/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 05506dddcb37..986c96bf83f4 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -3,7 +3,7 @@ pkgname=electron10
version=10.4.7
_nodever=12.16.3
_chromiumver=85.0.4183.121
-revision=2
+revision=3
archs="x86_64* i686* aarch64*"
build_wrksrc="src"
create_wrksrc=yes
From f48eebf3b1c2876b787ba69a9a20eb6f4def625e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 28/90] electron13: rebuild against ffmpeg-5.0
---
srcpkgs/electron13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 1ceb6f788a62..77c7d5306cd6 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,7 +1,7 @@
# Template file for 'electron13'
pkgname=electron13
version=13.6.7
-revision=1
+revision=2
_nodever=14.16.0
_chromiumver=91.0.4472.164
archs="x86_64* i686* aarch64* ppc64le*"
From c97b6dc05270c7e1ce56965983f6cf15cf692ab6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 29/90] ffmpegthumbnailer: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbnailer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 039eea7622b3..27bba7e685a0 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbnailer'
pkgname=ffmpegthumbnailer
version=2.2.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
From d7d9a152b3fd7370339c405c68c1e031696a625e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 30/90] ffmpegthumbs: rebuild against ffmpeg-5.0
---
srcpkgs/ffmpegthumbs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..4e61fa2e51d7 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpegthumbs'
pkgname=ffmpegthumbs
version=21.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
pkg-config qt5-host-tools qt5-qmake gettext"
From 0602d6d41790e673ae7433e2811ac9def9c3140e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 31/90] ffms2: rebuild against ffmpeg-5.0
---
srcpkgs/ffms2/patches/ffmpeg-5.0.patch | 419 +++++++++++++++++++++++++
srcpkgs/ffms2/template | 2 +-
2 files changed, 420 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ffms2/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/ffms2/patches/ffmpeg-5.0.patch b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..86f1387d7f9d
--- /dev/null
+++ b/srcpkgs/ffms2/patches/ffmpeg-5.0.patch
@@ -0,0 +1,419 @@
+From 28fc493fda2fa2064afeeb0a5d85fdc42db05dcf Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 f38e6e8db4ac2470d3e721ef219e2307f4c07104 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 32/90] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From d8fb3b3e289c53492541b5f52007abd61d840d7b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 33/90] gerbera: rebuild against ffmpeg-5.0
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..4e0e2a94a9fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.6.4
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From cf4edee9c1993da40f505aa913e9bd02d844a1e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 34/90] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From a1c0d8bb8404ea7688a82e1ff6db7b513f9797e9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 35/90] gst-libav: rebuild against ffmpeg-5.0
---
srcpkgs/gst-libav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 333636d0657a..3333c957fab0 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,7 +1,7 @@
# Template file for 'gst-libav'
pkgname=gst-libav
version=1.20.1
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=meson
hostmakedepends="pkg-config yasm"
From c9483e9187491b3752e9cb6c3df76cc0a5a7d517 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 36/90] guvcview: rebuild against ffmpeg-5.0
---
srcpkgs/guvcview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 345cf6006f24..d42fd38fa4ad 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,7 +1,7 @@
# Template file for 'guvcview'
pkgname=guvcview
version=2.0.7
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-static --disable-debian-menu"
From aeb5549e66630eb9b690487879dc4801afc93382 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 37/90] handbrake: rebuild against ffmpeg-5.0
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6ad7bd3ea798..7bff9580c310 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.5.1
-revision=1
+revision=2
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From 7544fe8615adafbaacba49cc86a4f7c3873996b7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 38/90] hedgewars: rebuild against ffmpeg-5.0
---
srcpkgs/hedgewars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 7060dbc37d95..36ca62d4fbbd 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=3
+revision=4
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
From 3bff40629b99ad6229419bcce8d5e09368b1ebe2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 39/90] idjc: rebuild against ffmpeg-5.0
---
srcpkgs/idjc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index ddabff2a4e74..df60318b3db9 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,7 +1,7 @@
# Template file for 'idjc'
pkgname=idjc
version=0.9.1
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
From baba7f8f9cc5c16e19f087e25cabd7b7565edbf2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 40/90] k3b: rebuild against ffmpeg-5.0
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index c2eab8d7964d..4222aa163114 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=22.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
qt5-host-tools kauth kdoctools kcoreaddons"
From e3a1a7891da91e031ccf5128a0ca0bcaa93531f4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 41/90] kfilemetadata5: rebuild against ffmpeg-5.0
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eb162fdff6d0..9e36331f50c4 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.93.0
-revision=1
+revision=2
wrksrc="${pkgname%5}-${version}"
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
From 01829ba51b79fecfc2b7b354378a3022a35fad39 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 42/90] kid3: rebuild against ffmpeg-5.0
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 81633262dc03..456206d90e16 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 4780ad57f173e3a6b50c924176142a9fadc9dd66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 43/90] kodi: rebuild against ffmpeg-5.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..fa671eb181ff 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=1
+revision=2
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From b882c76c291d2ea00ba13510095c3b17ad18f0e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 44/90] libextractor: rebuild against ffmpeg-5.0
---
srcpkgs/libextractor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index 29d5b8df01f8..ddd4790f93e8 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,7 +1,7 @@
# Template file for 'libextractor'
pkgname=libextractor
version=1.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
From 5f1fea91bac8d51f2b93c68095c91302036047cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 45/90] libopenshot: rebuild against ffmpeg-5.0
---
srcpkgs/libopenshot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 71dff12b5d61..662a54758232 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
# Template file for 'libopenshot'
pkgname=libopenshot
version=0.2.7
-revision=1
+revision=2
build_style=cmake
# Builds fail with Ruby-2.4.1
configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON"
From 6e3821a8ac0175493d72edf6b217744b9a96ce4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 46/90] loudgain: rebuild against ffmpeg-5.0
---
srcpkgs/loudgain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index da4f2d56e94c..4d6bf29efb4f 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
# Template file for 'loudgain'
pkgname=loudgain
version=0.6.8
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libebur128-devel taglib-devel ffmpeg-devel"
From e5230d83a68c280d57eb2be767413def2d7a6814 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 47/90] mediastreamer: rebuild against ffmpeg-5.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 42f7cf4824ea..40e6dcf95a99 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.1.20
-revision=1
+revision=2
wrksrc="mediastreamer2-${version}"
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 798a891c03f1eecbc625b5825a704deb06cb4b0b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 48/90] mgba: rebuild against ffmpeg-5.0
---
srcpkgs/mgba/patches/ffmpeg-5.0.patch | 117 ++++++++++++++++++++++++++
srcpkgs/mgba/template | 2 +-
2 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mgba/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/mgba/patches/ffmpeg-5.0.patch b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/srcpkgs/mgba/patches/ffmpeg-5.0.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 e4ccd1a913dc6c41377dd1e7175db48491f0662c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 49/90] minidlna: rebuild against ffmpeg-5.0
---
srcpkgs/minidlna/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index da681f604300..e42ad491acf3 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,7 +1,7 @@
# Template file for 'minidlna'
pkgname=minidlna
version=1.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin
From 8d859023de375f378baa6d58f87c4f1d90b2b56f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 50/90] mlt: rebuild against ffmpeg-5.0
---
srcpkgs/mlt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 8933eb4e7bb9..ed6b27503f9a 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
# Template file for 'mlt'
pkgname=mlt
version=6.26.1
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
From 9104796fcfe5f81132e3f969699717cf55b05522 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 51/90] mlt7: rebuild against ffmpeg-5.0
---
srcpkgs/mlt7/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5aefa500dd8a..f8352c2fc3f3 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
# Template file for 'mlt7'
pkgname=mlt7
version=7.4.0
-revision=1
+revision=2
wrksrc="mlt-${version}"
build_style=cmake
configure_args="-DSWIG_PYTHON=ON"
From 7debec0ecf372f8791d599c4ad796fbd7e5fc6a9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 52/90] moc: rebuild against ffmpeg-5.0
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index c42be650a1d2..4b95426599bf 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 96643a7c4e5e90ea102dfc41bffba904fd05ee73 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 53/90] motion: rebuild against ffmpeg-5.0
---
srcpkgs/motion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template
index 14ebb0b32118..efda46aec518 100644
--- a/srcpkgs/motion/template
+++ b/srcpkgs/motion/template
@@ -1,7 +1,7 @@
# Template file for 'motion'
pkgname=motion
version=4.4.0
-revision=1
+revision=2
wrksrc="motion-release-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config gettext-devel tar"
From b049a6effe424fcf03378ca132b47979491571de Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 54/90] mpd: rebuild against ffmpeg-5.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..7a61651ab8fd 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.6
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From e899ca16217557fc861f06c480fc8dc124104443 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 55/90] mpv: rebuild against ffmpeg-5.0
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From 0083c75298f728c3e0f52e53b171c5eb5112123a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 56/90] musikcube: rebuild against ffmpeg-5.0
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..1be832b772e5 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.97.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
From 030cb91b80d620d0f09120192c2379693f5b8480 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 57/90] notcurses: rebuild against ffmpeg-5.0
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 724e7b7f2475..22652caeaba9 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
# Template file for 'notcurses'
pkgname=notcurses
version=3.0.8
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
hostmakedepends="pkg-config $(vopt_if man pandoc)"
From f406f59ddd850751b57c69b0a7284627901aa565 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 58/90] obs: rebuild against ffmpeg-5.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index df6ee22e52ee..5c33b20aa58c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=27.2.4
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
wrksrc="obs-studio-${version}"
build_style=cmake
From c88f7defbb2e0cf6192776da1b91c0382970a067 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 59/90] olive: rebuild against ffmpeg-5.0
---
srcpkgs/olive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..5290d8e5aacd 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,7 +1,7 @@
# Template file for 'olive'
pkgname=olive
version=0.1.2
-revision=2
+revision=3
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
From 918d9a87386c2f041b74eafda54c8c4d8d9f49ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 60/90] opencv: rebuild against ffmpeg-5.0
---
srcpkgs/opencv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..02cc923d2341 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
From 2e5afcec10fa23815edf31152e8189ec3d299a4d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 61/90] opencv4: rebuild against ffmpeg-5.0
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From 959a19b02b7faa0974b4f00ebbe6a9d6d9e03511 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 62/90] openimageio: rebuild against ffmpeg-5.0
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..688552b0af21 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 8a9224b8df52afb5f8571e1be2dfb5ff7bdf1d67 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 63/90] openmw: rebuild against ffmpeg-5.0
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From f062947815e256285da0b29fb1c368632e59667c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 64/90] osg: rebuild against ffmpeg-5.0
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
From 1610fb5cf65af5b385167b62770e0c710dcaab93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 65/90] ppsspp: rebuild against ffmpeg-5.0
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 38308424f58b..c76458459ec2 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.12.3
-revision=1
+revision=2
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
From 6e71655adefdc732a9cc4cdfbf93baf58cab8403 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 66/90] pqiv: rebuild against ffmpeg-5.0
---
srcpkgs/pqiv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template
index 542fc27a2d32..9308d949b6a1 100644
--- a/srcpkgs/pqiv/template
+++ b/srcpkgs/pqiv/template
@@ -1,7 +1,7 @@
# Template file for 'pqiv'
pkgname=pqiv
version=2.12
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg-devel)
From a09189d9994b3dbd608e3edaf4636c1da7bf6c65 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 67/90] qmmp: rebuild against ffmpeg-5.0
---
srcpkgs/qmmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..4b9cc799ce69 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
version=1.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 291cbfd729d7522d157ca934597ebb8a5307d450 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 68/90] qt5-webengine: rebuild against ffmpeg-5.0
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 213672ab215c..af54e123bd8d 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.8
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From 57372ff63003ac4bdc8487f96a6d600e94c9001e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 69/90] qtav: rebuild against ffmpeg-5.0
---
srcpkgs/qtav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 0d85ec076482..4f8e391dc210 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -1,7 +1,7 @@
# Template file for 'qtav'
pkgname=qtav
version=1.13.0
-revision=1
+revision=2
wrksrc="QtAV-${version}"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
From 2e6b1201591d920ef388d495761e805038d965b1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 70/90] qtox: rebuild against ffmpeg-5.0
---
srcpkgs/qtox/patches/ffmpeg-5.0.patch | 79 +++++++++++++++++++++++++++
srcpkgs/qtox/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/qtox/patches/ffmpeg-5.0.patch
diff --git a/srcpkgs/qtox/patches/ffmpeg-5.0.patch b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
new file mode 100644
index 000000000000..950dcd886ea6
--- /dev/null
+++ b/srcpkgs/qtox/patches/ffmpeg-5.0.patch
@@ -0,0 +1,79 @@
+From 15673a52b6b4805d482b69281e21947fb7096e05 Mon Sep 17 00:00:00 2001
+From: Anthony Bilinski <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 ebf3df51ad5def5835185de7f8ac766976587502 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 71/90] retroarch: rebuild against ffmpeg-5.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..7b19803fbf41 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.2
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From ed6e1b1eb01f46aa65639284b76158c0a40b48fd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 72/90] scrcpy: rebuild against ffmpeg-5.0
---
srcpkgs/scrcpy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..490c0442c361 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,7 +1,7 @@
# Template file for 'scrcpy'
pkgname=scrcpy
version=1.23
-revision=1
+revision=2
build_style=meson
configure_args="-Dcompile_server=false
-Dprebuilt_server=/usr/share/scrcpy/scrcpy-server-v${version}"
From bf6ea56208bf9c6c3debdaa65b33ea9d0d4b378b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 73/90] siril: rebuild against ffmpeg-5.0
---
srcpkgs/siril/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..424baf48cf76 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
# Template file for 'siril'
pkgname=siril
version=0.9.12
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
From af0bbe12dca1de7556da1ce5c59e5b4aa3673477 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 74/90] spek-alternative: rebuild against ffmpeg-5.0
---
srcpkgs/spek-alternative/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template
index d65086b8f008..72747cbb0a02 100644
--- a/srcpkgs/spek-alternative/template
+++ b/srcpkgs/spek-alternative/template
@@ -1,7 +1,7 @@
# Template file for 'spek-alternative'
pkgname=spek-alternative
version=0.8.2.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common"
makedepends="ffmpeg-devel wxWidgets-gtk3-devel"
From bf8e6215538a5d78f7e80878e3152b46c0f647a3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 75/90] ssr: rebuild against ffmpeg-5.0
---
srcpkgs/ssr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index a6439c742b22..37976b35d7f7 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,7 +1,7 @@
# Template file for 'ssr'
pkgname=ssr
version=0.4.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_QT5=ON"
hostmakedepends="pkg-config"
From 048eada29dad2a3abf41a54b2a0110e7b0ce2dcf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 76/90] sumo: rebuild against ffmpeg-5.0
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From f5f90ccf89165122739cb9d4f034448a89aca2cb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 77/90] synfig: rebuild against ffmpeg-5.0
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From d351221c14bf45a33b56990f786e5e44fd576073 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 78/90] synfigstudio: rebuild against ffmpeg-5.0
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 368cc601cf1ec2ddb50e59207ea95daca659f84a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 79/90] telegram-desktop: rebuild against ffmpeg-5.0
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..4452e74b3a86 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=3.4.8
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From 164c898f65aa940644fa52649533168b232da144 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 80/90] timg: rebuild against ffmpeg-5.0
---
srcpkgs/timg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 91f1516b2597..334443d3f9bb 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,7 +1,7 @@
# Template file for 'timg'
pkgname=timg
version=1.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
hostmakedepends="pkg-config git"
From f50c83bfeea06759257b0f3ac855f0e1c81f60e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 81/90] transcode: rebuild against ffmpeg-5.0
---
srcpkgs/transcode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template
index 775cd09fc4e3..47aec6ae1399 100644
--- a/srcpkgs/transcode/template
+++ b/srcpkgs/transcode/template
@@ -1,7 +1,7 @@
# Template file for 'transcode'
pkgname=transcode
version=1.1.7
-revision=4
+revision=5
wrksrc=mojaves-transcode-tcforge-70badbfe3674
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
From e506a233b2c1ae17c5fc6fc554a5d557201608da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 82/90] tvheadend: rebuild against ffmpeg-5.0
---
srcpkgs/tvheadend/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index 230ecb592571..4a4867b253e3 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=5
+revision=6
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
From 5e4da9af46df4cd7ac589b16484ed1f15fe02019 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 83/90] unpaper: rebuild against ffmpeg-5.0
---
srcpkgs/unpaper/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template
index 38ed47a58401..064cca88cc73 100644
--- a/srcpkgs/unpaper/template
+++ b/srcpkgs/unpaper/template
@@ -1,13 +1,13 @@
# Template file for 'unpaper'
pkgname=unpaper
version=6.1
-revision=3
+revision=4
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 ff2f2740b9c4591e7d0d317691b71241eef3c941 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 84/90] vba-m: rebuild against ffmpeg-5.0
---
srcpkgs/vba-m/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 8e6447f5c6f5..d98b4d9fd930 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -2,7 +2,7 @@
pkgname=vba-m
reverts=1292_2
version=2.1.4
-revision=4
+revision=5
wrksrc="visualboyadvance-m-${version}"
build_style=cmake
configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
From fe0e9c510bf819f42f20affb157aa1592313f4f5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 85/90] vlc: rebuild against ffmpeg-5.0
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index bdcf4ff726cd..69d14f330ed5 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 93c3fc5e903fc06c3f6fb5317c460f606e89f755 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 86/90] waypipe: rebuild against ffmpeg-5.0
---
srcpkgs/waypipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index 31be3b1a0914..f7190653a187 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,7 +1,7 @@
# Template file for 'waypipe'
pkgname=waypipe
version=0.8.2
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
# lto is off because it causes linking errors in armv6l and armv7l (due to NEON)
From 3e632c7f8678dfe335141a47763d5162858bf0f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 87/90] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From f985c7c0e774cab2bd6c13a8c3a7d2ef3dab4e91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 88/90] xine-lib: rebuild against ffmpeg-5.0
---
srcpkgs/xine-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index f713eff49b07..ef7bcca02b0a 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
# Template file for 'xine-lib'
pkgname=xine-lib
version=1.2.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
--disable-oss"
From cb0cbe37b6580ad66fa78744a7a8813fed79853f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 89/90] xpra: rebuild against ffmpeg-5.0
---
srcpkgs/xpra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..91dddea47392 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
# Template file for 'xpra'
pkgname=xpra
version=4.3.2
-revision=1
+revision=2
build_style=python3-module
make_install_args="$(vopt_with docs)"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
From af7ddbd3a91c28a42072f1569e2190a7a3f1d56a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 90/90] pianobar: rebuild against ffmpeg-5.0
---
srcpkgs/pianobar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index a9b29e91993f..81efcd122c4d 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,7 +1,7 @@
# Template file for 'pianobar'
pkgname=pianobar
version=2022.04.01
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="V=1"
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (16 preceding siblings ...)
2022-04-24 22:46 ` tibequadorian
@ 2022-05-07 21:50 ` tibequadorian
2022-07-23 18:48 ` Idesmi
` (4 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2022-05-07 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5190 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/36315
[WIP] Tracking: FFmpeg 5.0
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [x] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [x] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [x] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-36315.patch --]
[-- Type: text/x-diff, Size: 102103 bytes --]
From 89ce8980681a60005992a381163401130e452b13 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 16:35:12 +0100
Subject: [PATCH 01/81] 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 <diogo@diogoleal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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 a407d4d7b3d88912c8e64488a82a0e90bf74dd0a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:02:50 +0100
Subject: [PATCH 02/81] 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 784375c7c9aa..3e51c4e8c496 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -387,15 +387,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
libgif.so.7 giflib-5.1.0_1
libImlib2.so.1 imlib2-1.4.2_1
libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.58 libavdevice-4.0_1
-libavformat.so.58 libavformat-4.0_1
-libswscale.so.5 libswscale-4.0_1
-libswresample.so.3 libswresample-4.0_1
-libavresample.so.4 libavresample-4.0_1
-libpostproc.so.55 libpostproc-4.0_1
-libavcodec.so.58 libavcodec-4.0_1
-libavutil.so.56 libavutil-4.0_1
-libavfilter.so.7 libavfilter-4.0_1
+libavdevice.so.59 libavdevice-5.0_1
+libavformat.so.59 libavformat-5.0_1
+libswscale.so.6 libswscale-5.0_1
+libswresample.so.4 libswresample-5.0_1
+libpostproc.so.56 libpostproc-5.0_1
+libavcodec.so.59 libavcodec-5.0_1
+libavutil.so.57 libavutil-5.0_1
+libavfilter.so.8 libavfilter-5.0_1
libSDL-1.2.so.0 SDL-1.2.14_1
libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 213aae8bbfa0..d319619deeaf 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.1
-revision=2
+version=5.0
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
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 fb051a43a4dae314f2f6bcd6238889153faba991 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 6 Feb 2022 04:35:01 +0100
Subject: [PATCH 03/81] libavresample: remove
---
srcpkgs/libavresample | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 120000 srcpkgs/libavresample
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0923c53cfc05..63d7625925f5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -213,6 +213,7 @@ replaces="
key-mon<=1.17_5
laditools<=1.1.0_3
libapp<=20140527_2
+ libavresample<=4.4.1_1
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
From e3be4044c45b052c2116d63c93a4255458738d6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 04/81] 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 fe847d1a4f46b72c48f6ac456627370c5f0450d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 05/81] 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 a798108f35ff124dc53e191f11ac465de3d7ce42 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 06/81] 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 9f54db1d701c3c2fc30db84679412d072a35dcb2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 07/81] 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 35eee003f034a1a2097cd4557deb773eacb18f7b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:11 +0100
Subject: [PATCH 08/81] 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 <piem@piem.org>
+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 298aa371c56c2f52c25a33d9bdec4918b11cebdc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 09/81] 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 <john@jlindgren.net>
+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 7b533e76810b936f4901a03bc77fc93df3ad6b3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 10/81] 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 872ae173272424f2dc28d0cc4095fb5996a48c9c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 11/81] 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 557c0946720e4d0ef1e87d12d15192c6224578f4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 12/81] 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 768c1cec6d01fe97c9cc2041d9bcf334ef995890 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 13/81] 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 166ee9ebda52768c4096371b09445672d301af21 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:12 +0100
Subject: [PATCH 14/81] 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 1d4c8cb1ffd9095da5b0715ae7befe920f82e39b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 15/81] 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 0dce8772fdb8..ddb9ce2f20ee 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=101.0.4951.41
-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 <duncaen@voidlinux.org>"
From 9a8b5a4dcec4fbe8f41588e36b0f77a2c286bd9a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 16/81] 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 29af2625eafa47f8c4bf52654a3e51380b904639 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 17/81] 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 fdf53162ef89e9f6d105c4ea8a0de2622b695a60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 18/81] 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 4541eb7825074ecb0ae7233d3710994f0efac447 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 19/81] 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 1207bdec5cea..2b118b765ca9 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,7 +1,7 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
From 803ebb0cc4de62135414c03f4f91ea8313a6df60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 20/81] 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 a4cb06581691289031252ec20a60088f3d2e8f34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:13 +0100
Subject: [PATCH 21/81] 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 bd0d3aae99176a9ef1ad7f552ac55373bf8df1c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 22/81] 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 a96e528c48d5ba362ade071f348596f64f824192 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 23/81] 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 b0d91b1fd2189f5c51d9b1f9286b0dd8b567d916 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 24/81] 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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<int64_t> 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<FFMS_SampleFormat>(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<T> 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 <derek.buitenhuis@gmail.com>
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH 2/3] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ 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 <libavcodec/avcodec.h>
++ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- 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 <derek.buitenhuis@gmail.com>
+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 <derek.buitenhuis@gmail.com>
+---
+ 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 09e0a3b4aab5a5deb89d18a1c9c0b555448b0278 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 25/81] freerdp: rebuild against ffmpeg-5.0
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..c1393dbd59ba 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.6.1
-revision=1
+revision=2
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
From fa98bfbe70455cdff54a1b5997cf5a71de813c3f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 26/81] 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 bcd6eeb59362471cc271443396c126fbfdea600b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 27/81] goldendict: rebuild against ffmpeg-5.0
---
srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---
srcpkgs/goldendict/patches/ffmpeg5-1.patch | 167 +++++++++++++++++++++
srcpkgs/goldendict/patches/ffmpeg5-2.patch | 32 ++++
srcpkgs/goldendict/patches/ffmpeg5-3.patch | 25 +++
srcpkgs/goldendict/template | 2 +-
5 files changed, 225 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-1.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-2.patch
create mode 100644 srcpkgs/goldendict/patches/ffmpeg5-3.patch
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
- return false;
- }
-
-- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
- }
-
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
- {
- av_init_packet( &packet );
- int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-1.patch b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
new file mode 100644
index 000000000000..fdcd7c69be5a
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-1.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bdd..56e8f788e 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++ AVCodec * codec_;
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+ audioData_( audioData ),
+ audioDataStream_( audioData_ ),
+ formatContext_( NULL ),
++ codec_( NULL ),
+ codecContext_( NULL ),
+ avioContext_( NULL ),
+ audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+ if ( !avioBuffer )
+ {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ // Find audio stream, use the first audio stream if available
+ for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+ audioStream_ = formatContext_->streams[i];
+ break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+ codecContext_ = audioStream_->codec;
+- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+- if ( !codec )
++ codec_ = avcodec_find_decoder( codecContext_->codec_id );
++ if ( !codec_ )
+ {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+ return false;
+ }
++#else
++ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++ if ( !codec_ )
++ {
++ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++ return false;
++ }
++ codecContext_ = avcodec_alloc_context3( codec_ );
++ if ( !codecContext_ )
++ {
++ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++ return false;
++ }
++ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+
+- ret = avcodec_open2( codecContext_, codec, NULL );
++ ret = avcodec_open2( codecContext_, codec_, NULL );
+ if ( ret < 0 )
+ {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+ return false;
+ }
+
+- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+ codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+
+ // Closing a codec context without prior avcodec_open2() will result in
+ // a crash in ffmpeg
+- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++ if ( audioStream_ && codecContext_ && codec_ )
+ {
+ audioStream_->discard = AVDISCARD_ALL;
+- avcodec_close( audioStream_->codec );
++ avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++ avcodec_free_context( &codecContext_ );
++#endif
+ }
+
+ avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+ if ( packet.stream_index == audioStream_->index )
+ {
+ AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ int gotFrame = 0;
+ do
+ {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+ pack.data += len;
+ }
+ while( pack.size > 0 );
++#else
++ int ret = avcodec_send_packet( codecContext_, &pack );
++ /* read all the output frames (in general there may be any number of them) */
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame( codecContext_, frame);
++
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++
++ playFrame( frame );
++ }
++#endif
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+ if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+ codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+ {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+ playFrame( frame );
+ }
+ }
++#else
++ /* flush the decoder */
++ av_init_packet( &packet );
++ int ret = avcodec_send_packet(codecContext_, &packet );
++ while( ret >= 0 )
++ {
++ ret = avcodec_receive_frame(codecContext_, frame);
++ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++ break;
++ playFrame( frame );
++ }
++#endif
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-2.patch b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
new file mode 100644
index 000000000000..fc6da3bee00e
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-2.patch
@@ -0,0 +1,32 @@
+From 966f4a8b78e6324b930e5a50f2bb930bd87e565e Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 27 Sep 2019 17:00:52 +0300
+Subject: [PATCH] FFmpeg player: Fix some crashes on broken files
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 56e8f788e..415fc79cb 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -51,7 +51,9 @@ AudioService & AudioService::instance()
+
+ AudioService::AudioService()
+ {
++#if LIBAVFORMAT_VERSION_MAJOR < 58 || ( LIBAVFORMAT_VERSION_MAJOR == 58 && LIBAVFORMAT_VERSION_MINOR < 9 )
+ av_register_all();
++#endif
+ ao_initialize();
+ }
+
+@@ -438,6 +440,8 @@ bool DecoderContext::play( QString & errorString )
+ #else
+ /* flush the decoder */
+ av_init_packet( &packet );
++ packet.data = NULL;
++ packet.size = 0;
+ int ret = avcodec_send_packet(codecContext_, &packet );
+ while( ret >= 0 )
+ {
diff --git a/srcpkgs/goldendict/patches/ffmpeg5-3.patch b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
new file mode 100644
index 000000000000..72101903d1d1
--- /dev/null
+++ b/srcpkgs/goldendict/patches/ffmpeg5-3.patch
@@ -0,0 +1,25 @@
+From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Sun, 20 Feb 2022 12:28:05 +0800
+Subject: [PATCH] add support for ffmpeg 5.0
+
+---
+ ffmpegaudio.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index d550f4a77..7948d2187 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -94,7 +94,11 @@ struct DecoderContext
+ QByteArray audioData_;
+ QDataStream audioDataStream_;
+ AVFormatContext * formatContext_;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec * codec_;
++#else
++ const AVCodec * codec_;
++#endif
+ AVCodecContext * codecContext_;
+ AVIOContext * avioContext_;
+ AVStream * audioStream_;
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 7553e408d1a7..edb56dc72aa6 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,7 +1,7 @@
# Template file for 'goldendict'
pkgname=goldendict
version=1.5.0RC2
-revision=5
+revision=6
wrksrc="${pkgname}-${version/RC/-RC}"
build_style=qmake
configure_args="CONFIG+=zim_support"
From 4c1d3ca6ae503ff2c4d3d74766c6a505124e885d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:14 +0100
Subject: [PATCH 28/81] gst-libav: rebuild against ffmpeg-5.0
---
srcpkgs/gst-libav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 333636d0657a..3333c957fab0 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,7 +1,7 @@
# Template file for 'gst-libav'
pkgname=gst-libav
version=1.20.1
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=meson
hostmakedepends="pkg-config yasm"
From 217a56f364419a8cd53f6d5153463361176e51a6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 29/81] 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 c8ca5ef75accddb9b08c03b9d1712cd114b8cbcb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 30/81] 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 523c3fd217b6b9b1bf15d2f8448fdda6aba0b512 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 31/81] 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 b1c71914bc7199c19d19097eeba1be50fa149efe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 32/81] 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 c24fe7667bcc6a2560aff7473a3c97c99729c716 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 33/81] 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 c2eab8d7964d..4222aa163114 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=22.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
qt5-host-tools kauth kdoctools kcoreaddons"
From fcbd27dc62e7972c8ad0c5a8c6b831d46f4d3790 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 34/81] kfilemetadata5: rebuild against ffmpeg-5.0
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eb162fdff6d0..9e36331f50c4 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.93.0
-revision=1
+revision=2
wrksrc="${pkgname%5}-${version}"
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
From 7411c448106e80f84b3e0bcb5db4af129bf2e843 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:15 +0100
Subject: [PATCH 35/81] 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 a49e75dfa54b3139dec636b83bf99a7a61a1328e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 36/81] 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 a513adcc012a1478abdd7e256ae41a04699b5ce9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 37/81] 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 036813dd99206e9fd7cfd71913360427c2397976 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 38/81] 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 905b072fe4dc85088d77cbac22559c568ed8744e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 39/81] mediastreamer: rebuild against ffmpeg-5.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 42f7cf4824ea..40e6dcf95a99 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.1.20
-revision=1
+revision=2
wrksrc="mediastreamer2-${version}"
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 68e6ca7fd868be9e85f30c3e78e8f5668742120e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 40/81] 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 <ryan@nardis.ca>
+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 <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ 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 <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -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 f25e086651d4b002649342ffbc755ec832c4af12 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:16 +0100
Subject: [PATCH 41/81] 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 4d55ca645c5fffe79bfc369605d42a9323978ea1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 42/81] 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 3c52fba0f9557fe32d9d34d09d845a97046cca06 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 43/81] 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 f91dd9f6bd19b3064b487ae03fc972e3dedc8745 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 44/81] 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 8a751af427ecc62bd00d51b9fbfd8ee5c55e6ba5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 45/81] 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 793b7021c67355750297b94f9db977e9ee8379d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 46/81] 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 654a201f2ec00b3caa848fe3c91a76cc5c78f674 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:17 +0100
Subject: [PATCH 47/81] 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 de33e4cb1f27ae498be2261fa4be02f9a10eb8dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 48/81] musikcube: rebuild against ffmpeg-5.0
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..1be832b772e5 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.97.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
From 3a5ff3a42bcb5934521712d613e84eda0ee23caf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 49/81] notcurses: rebuild against ffmpeg-5.0
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 724e7b7f2475..22652caeaba9 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
# Template file for 'notcurses'
pkgname=notcurses
version=3.0.8
-revision=1
+revision=2
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
hostmakedepends="pkg-config $(vopt_if man pandoc)"
From ac23b576b02509068d7cfb212417544836ce7ce3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 50/81] obs: rebuild against ffmpeg-5.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index df6ee22e52ee..5c33b20aa58c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=27.2.4
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
wrksrc="obs-studio-${version}"
build_style=cmake
From a78dee954b32ccb43b9b0876a078665ff77f85e9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 51/81] 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 81b5095b1614cec108b87b3491ec20c05af6f062 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 52/81] 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 07d53a2cfc1c083ab6d64830226b516820f25ae6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 53/81] 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 c747e9d4ff6703357b340231aed52db479c12821 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:18 +0100
Subject: [PATCH 54/81] 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 9d8710500036464a5b5260b530a31a34f0b2cf74 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 55/81] 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 33735fdcd4da252b24357ba0be1076fbc89ea540 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 56/81] 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 d9a5a9985bd6c99cfc66fcb6a3a069a5c827ae3b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 57/81] 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 32aadd33d8f975918f500449ab911f06d64aeffb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 58/81] 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 cb68b71be48165de1609bb5fd7065dbafbaaff91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 59/81] 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 c91b61f49194787f44aa080c7d15e8f13e55ef73 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:19 +0100
Subject: [PATCH 60/81] 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 898aed9a3fe3eb591d701f093ac57659ceff04b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 61/81] 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 ac0af1a87fc8b786a460eb168e2454d0b9ba1c5f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 62/81] 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 <me@abilinski.com>
+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<QString, CameraDevice*> 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<QString, CameraDevice*> 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 63d1196bd1aa..97baf77054c2 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
wrksrc="qTox-${version}"
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
From 86357744ed657560604caa3b866c5aaa14cae379 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 63/81] retroarch: rebuild against ffmpeg-5.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..7b19803fbf41 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.10.2
-revision=1
+revision=2
wrksrc="RetroArch-$version"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
From 283841c4ab1299ba7396a767b9dbed305c7df5e6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 64/81] 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 3ce56aca52e2ca0380c5d79ec688265679729357 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 65/81] 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 8f4ea463a2f8f640f9c15c6e4679bfa5d1132e52 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 66/81] 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 feac98aad2f29e75a2286da14e76076eacafbdda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:20 +0100
Subject: [PATCH 67/81] 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 435cbc39e0b73ffcd941235368f98904eb5efc4a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 68/81] 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 5a18e0388b07b531fb161309a83022ffe33cff8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 69/81] 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 8677c12ffd2c958417c286b05413d35a807da0fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 70/81] 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 64399ce917ca18e6b68c8728dd9766f12ab8ab8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 71/81] 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 0199fe9ddceb..f49d957eaf92 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.7.3
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From 4706f154e3cf56820a1adbabbe61ea51d70caf9b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 72/81] 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 39aa4e96db54092bcee5ce4627c7bdb5cd31b9cf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 73/81] 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 1f125909e1aeaec840b0747ed9d21cb0b2d221fc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:21 +0100
Subject: [PATCH 74/81] 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 c24f661e57ce958c76edc9aff91c321cdd0748aa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 75/81] 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 <orphan@voidlinux.org>"
hostmakedepends="pkg-config libxslt"
makedepends="ffmpeg-devel"
-license="GPL-2"
+short_desc="Post-processing tool for scanned sheets of paper"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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 423d907adf16fc6f04b74b86a64c0a2639167846 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 76/81] 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 83cd0b8e26c7fac0a6e2c9f19c607ed5656ccb3b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 77/81] 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 367711f58e89375d9557f23072674bb38f7b2a82 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:22 +0100
Subject: [PATCH 78/81] wf-recorder: rebuild against ffmpeg-5.0
---
srcpkgs/wf-recorder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..a41f3d50c7eb 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,7 +1,7 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
version=0.2.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config ninja scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
From 63797428112afcc5079e574841c2040a92401a93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 79/81] 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 79adb303059afba11b74a11024632d107fbdae61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 18:40:23 +0100
Subject: [PATCH 80/81] 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 d9485ca78e2f..e5c024881d9c 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
# Template file for 'xpra'
pkgname=xpra
version=4.3.3
-revision=1
+revision=2
build_style=python3-module
make_install_args="$(vopt_with docs)"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
From b260395cc335dbd8c261c24d6223a3aa532c3fcd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 15:03:00 +0100
Subject: [PATCH 81/81] pianobar: rebuild against ffmpeg-5.0
---
srcpkgs/pianobar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index a9b29e91993f..81efcd122c4d 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,7 +1,7 @@
# Template file for 'pianobar'
pkgname=pianobar
version=2022.04.01
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="V=1"
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (17 preceding siblings ...)
2022-05-07 21:50 ` tibequadorian
@ 2022-07-23 18:48 ` Idesmi
2022-10-22 2:14 ` github-actions
` (3 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: Idesmi @ 2022-07-23 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by Idesmi on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1193171533
Comment:
5.1 released
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (18 preceding siblings ...)
2022-07-23 18:48 ` Idesmi
@ 2022-10-22 2:14 ` github-actions
2022-11-06 2:13 ` [PR PATCH] [Closed]: " github-actions
` (2 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: github-actions @ 2022-10-22 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1287582162
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Closed]: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (19 preceding siblings ...)
2022-10-22 2:14 ` github-actions
@ 2022-11-06 2:13 ` github-actions
2022-12-11 18:07 ` zlice
2022-12-11 20:18 ` paper42
22 siblings, 0 replies; 24+ messages in thread
From: github-actions @ 2022-11-06 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5023 bytes --]
There's a closed pull request on the void-packages repository
[WIP] Tracking: FFmpeg 5.0
https://github.com/void-linux/void-packages/pull/36315
Description:
[ci skip]
Depends on:
- https://github.com/void-linux/void-packages/pull/35431
- https://github.com/void-linux/void-packages/pull/36115
- https://github.com/void-linux/void-packages/pull/36361
Currently build successful against ffmpeg-5.0:
- [x] QMPlay2
- [x] alsa-plugins
- [ ] arcan - depends on vlc
- [ ] attract - fixed in master https://github.com/mickelson/attract/commit/c27312be47dfb7370456a878fc6284883650b7f2
- [x] aubio - patched https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3
- [x] audacious-plugins - patched https://github.com/audacious-media-player/audacious-plugins/commit/f60beb400eeb1e4778bbfd738bc4a4ccef3de539
- [x] baresip
- [ ] blender - depends on openimageio
- [ ] cantata - depends on vlc
- [ ] ccextractor https://github.com/CCExtractor/ccextractor/issues/1418
- [ ] chromaprint https://github.com/acoustid/chromaprint/issues/33
- [ ] chromium
- [x] cmus
- [ ] deadbeef https://github.com/DeaDBeeF-Player/deadbeef/issues/2758
- [x] dolphin-emu
- [x] droidcam
- [ ] electron10
- [ ] electron13
- [ ] ffmpegthumbnailer https://github.com/dirkvdb/ffmpegthumbnailer/issues/212
- [ ] ffmpegthumbs
- [x] ffms2 - patched https://github.com/FFMS/ffms2/pull/380
- [x] freerdp
- [x] gerbera
- [x] goldendict - patched https://github.com/goldendict/goldendict/commit/03bbe01b79a1f07a6780cb60f23a087104c5d77b, https://github.com/goldendict/goldendict/commit/966f4a8b78e6324b930e5a50f2bb930bd87e565e, https://github.com/goldendict/goldendict/commit/8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05
- [x] gst-libav
- [ ] guvcview
- [ ] handbrake
- [ ] hedgewars
- [ ] idjc
- [x] k3b https://invent.kde.org/multimedia/k3b/-/issues/1
- [x] kfilemetadata5
- [ ] kid3 - depends on chromaprint
- [ ] kodi
- [ ] libextractor
- [ ] libopenshot
- [ ] loudgain https://github.com/Moonbase59/loudgain/issues/49
- [ ] mediastreamer
- [x] mgba - patched https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
- [x] minidlna
- [ ] mlt
- [ ] mlt7 - depends on opencv4
- [ ] moc - unmaintained since 2016
- [x] motion
- [x] mpd
- [x] mpv
- [x] musikcube
- [x] notcurses
- [ ] obs - depends on vlc
- [ ] olive - fixed in master https://github.com/olive-editor/olive/commit/03f0ec9f641ebfdd1c643f4f908ae10fa587e54b
- [ ] opencv/opencv4 https://github.com/opencv/opencv/issues/20147
- [ ] openimageio - fixed in [2.3.13.0](https://github.com/OpenImageIO/oiio/releases/tag/v2.3.13.0)
- [ ] openmw - depends on osg
- [ ] osg https://github.com/openscenegraph/OpenSceneGraph/issues/1111
- [x] pianobar https://github.com/PromyLOPh/pianobar/issues/730
- [ ] ppsspp https://github.com/hrydgard/ppsspp/issues/15308
- [x] pqiv
- [x] qmmp
- [ ] qt5-webengine
- [ ] qtav https://github.com/wang-bin/QtAV/issues/1377
- [x] qtox - patched https://github.com/qTox/qTox/commit/15673a52b6b4805d482b69281e21947fb7096e05
- [x] retroarch
- [x] scrcpy
- [ ] siril - depends on opencv
- [ ] spek-alternative https://github.com/withmorten/spek-alternative/issues/15
- [ ] ssr https://github.com/MaartenBaert/ssr/issues/949
- [ ] sumo - depends on osg
- [ ] synfig - depends on mlt
- [ ] synfigstudio - depends on synfig
- [ ] telegram-desktop - fixed in 3.6.0 https://github.com/telegramdesktop/tdesktop/commit/436622ad7c41d45b8b56873c086d37d2eff4d493
- [x] timg
- [ ] transcode - upstream dead
- [ ] tvheadend
- [ ] unpaper - https://github.com/unpaper/unpaper/commit/584b460279658511d1079411b16d997f7b66d25e https://github.com/unpaper/unpaper/commit/22294ee2bfb35effeda62bf562c2509e0066af5e
- [ ] vba-m https://github.com/visualboyadvance-m/visualboyadvance-m/issues/912
- [ ] vlc - fixed in [4.0](https://code.videolan.org/videolan/vlc/-/merge_requests/1238)
- [x] waypipe
- [ ] wf-recorder https://github.com/ammen99/wf-recorder/commit/47a3905f670fe12ecbdfe4719df654df1cd183e2
- [x] xine-lib
- [ ] xpra - depends on opencv
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (20 preceding siblings ...)
2022-11-06 2:13 ` [PR PATCH] [Closed]: " github-actions
@ 2022-12-11 18:07 ` zlice
2022-12-11 20:18 ` paper42
22 siblings, 0 replies; 24+ messages in thread
From: zlice @ 2022-12-11 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1345620070
Comment:
Going down this rabbit hole as well (ffmpeg 5.1.2). So far the main blockers seem to be vlc, opencv/4, OpenSceneGraph/osg and OpenImageIO/OIIO (need gcc12? cmake fails to find pthread. Has a few deps as well).
My main concern is what to do about projects like ppsspp that seem to be unlikely to make changes for ffmpeg5?
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [WIP] Tracking: FFmpeg 5.0
2022-03-24 13:45 [PR PATCH] [WIP] Tracking: FFmpeg 5.0 tibequadorian
` (21 preceding siblings ...)
2022-12-11 18:07 ` zlice
@ 2022-12-11 20:18 ` paper42
22 siblings, 0 replies; 24+ messages in thread
From: paper42 @ 2022-12-11 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36315#issuecomment-1345647052
Comment:
Patch them, remove them or create separate packages with v4 libraries, but I think we might want to wait a bit.
^ permalink raw reply [flat|nested] 24+ messages in thread