ffmpeg6 split

common/shlibs

@@ -392,6 +392,17 @@ 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
+libmp3lame.so.0 lame-3.98.2_1
+libdispatch.so libdispatch-5.10.1_1
+libBlocksRuntime.so libdispatch-5.10.1_1
+libavdevice.so.60 libavdevice6-6.0_1
+libavformat.so.60 libavformat6-6.0_1
+libswscale.so.7 libswscale6-6.0_1
+libswresample.so.4 libswresample6-6.0_1
+libpostproc.so.57 libpostproc6-6.0_1
+libavcodec.so.60 libavcodec6-6.0_1
+libavutil.so.58 libavutil6-6.0_1
+libavfilter.so.9 libavfilter6-6.0_1
 libavdevice.so.58 libavdevice-4.0_1
 libavformat.so.58 libavformat-4.0_1
 libswscale.so.5 libswscale-4.0_1
@@ -2186,58 +2197,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.406 libopencv-4.6.0_1
-libopencv_reg.so.406 libopencv-4.6.0_1
-libopencv_surface_matching.so.406 libopencv-4.6.0_1
-libopencv_xphoto.so.406 libopencv-4.6.0_1
-libopencv_freetype.so.406 libopencv-4.6.0_1
-libopencv_fuzzy.so.406 libopencv-4.6.0_1
-libopencv_hfs.so.406 libopencv-4.6.0_1
-libopencv_img_hash.so.406 libopencv-4.6.0_1
-libopencv_line_descriptor.so.406 libopencv-4.6.0_1
-libopencv_saliency.so.406 libopencv-4.6.0_1
-libopencv_structured_light.so.406 libopencv-4.6.0_1
-libopencv_aruco.so.406 libopencv-4.6.0_1
-libopencv_bgsegm.so.406 libopencv-4.6.0_1
-libopencv_bioinspired.so.406 libopencv-4.6.0_1
-libopencv_ccalib.so.406 libopencv-4.6.0_1
-libopencv_face.so.406 libopencv-4.6.0_1
-libopencv_tracking.so.406 libopencv-4.6.0_1
-libopencv_xfeatures2d.so.406 libopencv-4.6.0_1
-libopencv_optflow.so.406 libopencv-4.6.0_1
-libopencv_ximgproc.so.406 libopencv-4.6.0_1
-libopencv_plot.so.406 libopencv-4.6.0_1
-libopencv_text.so.406 libopencv-4.6.0_1
-libopencv_ml.so.406 libopencv-4.6.0_1
-libopencv_objdetect.so.406 libopencv-4.6.0_1
-libopencv_dnn.so.406 libopencv-4.6.0_1
-libopencv_shape.so.406 libopencv-4.6.0_1
-libopencv_stitching.so.406 libopencv-4.6.0_1
-libopencv_photo.so.406 libopencv-4.6.0_1
-libopencv_video.so.406 libopencv-4.6.0_1
-libopencv_calib3d.so.406 libopencv-4.6.0_1
-libopencv_features2d.so.406 libopencv-4.6.0_1
-libopencv_flann.so.406 libopencv-4.6.0_1
-libopencv_highgui.so.406 libopencv-4.6.0_1
-libopencv_videoio.so.406 libopencv-4.6.0_1
-libopencv_imgcodecs.so.406 libopencv-4.6.0_1
-libopencv_imgproc.so.406 libopencv-4.6.0_1
-libopencv_core.so.406 libopencv-4.6.0_1
-libopencv_superres.so.406 libopencv-4.6.0_1
-libopencv_videostab.so.406 libopencv-4.6.0_1
-libopencv_gapi.so.406 libopencv-4.6.0_1
-libopencv_xobjdetect.so.406 libopencv-4.6.0_1
-libopencv_datasets.so.406 libopencv-4.6.0_1
-libopencv_dnn_objdetect.so.406 libopencv-4.6.0_1
-libopencv_dnn_superres.so.406 libopencv-4.6.0_1
-libopencv_dpm.so.406 libopencv-4.6.0_1
-libopencv_phase_unwrapping.so.406 libopencv-4.6.0_1
-libopencv_stereo.so.406 libopencv-4.6.0_1
-libopencv_rapid.so.406 libopencv-4.6.0_1
-libopencv_intensity_transform.so.406 libopencv-4.6.0_1
-libopencv_alphamat.so.406 libopencv-4.6.0_1
-libopencv_barcode.so.406 libopencv-4.6.0_1
-libopencv_mcc.so.406 libopencv-4.6.0_1
+libopencv_quality.so.407 libopencv-4.7.0_1
+libopencv_reg.so.407 libopencv-4.7.0_1
+libopencv_surface_matching.so.407 libopencv-4.7.0_1
+libopencv_xphoto.so.407 libopencv-4.7.0_1
+libopencv_freetype.so.407 libopencv-4.7.0_1
+libopencv_fuzzy.so.407 libopencv-4.7.0_1
+libopencv_hfs.so.407 libopencv-4.7.0_1
+libopencv_img_hash.so.407 libopencv-4.7.0_1
+libopencv_line_descriptor.so.407 libopencv-4.7.0_1
+libopencv_saliency.so.407 libopencv-4.7.0_1
+libopencv_structured_light.so.407 libopencv-4.7.0_1
+libopencv_aruco.so.407 libopencv-4.7.0_1
+libopencv_bgsegm.so.407 libopencv-4.7.0_1
+libopencv_bioinspired.so.407 libopencv-4.7.0_1
+libopencv_ccalib.so.407 libopencv-4.7.0_1
+libopencv_face.so.407 libopencv-4.7.0_1
+libopencv_tracking.so.407 libopencv-4.7.0_1
+libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
+libopencv_optflow.so.407 libopencv-4.7.0_1
+libopencv_ximgproc.so.407 libopencv-4.7.0_1
+libopencv_plot.so.407 libopencv-4.7.0_1
+libopencv_text.so.407 libopencv-4.7.0_1
+libopencv_ml.so.407 libopencv-4.7.0_1
+libopencv_objdetect.so.407 libopencv-4.7.0_1
+libopencv_dnn.so.407 libopencv-4.7.0_1
+libopencv_shape.so.407 libopencv-4.7.0_1
+libopencv_stitching.so.407 libopencv-4.7.0_1
+libopencv_photo.so.407 libopencv-4.7.0_1
+libopencv_video.so.407 libopencv-4.7.0_1
+libopencv_calib3d.so.407 libopencv-4.7.0_1
+libopencv_features2d.so.407 libopencv-4.7.0_1
+libopencv_flann.so.407 libopencv-4.7.0_1
+libopencv_highgui.so.407 libopencv-4.7.0_1
+libopencv_videoio.so.407 libopencv-4.7.0_1
+libopencv_imgcodecs.so.407 libopencv-4.7.0_1
+libopencv_imgproc.so.407 libopencv-4.7.0_1
+libopencv_core.so.407 libopencv-4.7.0_1
+libopencv_superres.so.407 libopencv-4.7.0_1
+libopencv_videostab.so.407 libopencv-4.7.0_1
+libopencv_gapi.so.407 libopencv-4.7.0_1
+libopencv_xobjdetect.so.407 libopencv-4.7.0_1
+libopencv_datasets.so.407 libopencv-4.7.0_1
+libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
+libopencv_dnn_superres.so.407 libopencv-4.7.0_1
+libopencv_dpm.so.407 libopencv-4.7.0_1
+libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
+libopencv_stereo.so.407 libopencv-4.7.0_1
+libopencv_rapid.so.407 libopencv-4.7.0_1
+libopencv_intensity_transform.so.407 libopencv-4.7.0_1
+libopencv_alphamat.so.407 libopencv-4.7.0_1
+libopencv_barcode.so.407 libopencv-4.7.0_1
+libopencv_mcc.so.407 libopencv-4.7.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
@@ -4201,10 +4212,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-libwayland-client++.so.0 libwaylandpp-0.2.8_1
-libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
-libwayland-egl++.so.0 libwaylandpp-0.2.8_1
-libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
 libspdlog.so.1.11 libspdlog-1.11.0_1
 libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1

srcpkgs/QMPlay2/template

@@ -1,10 +1,10 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
 version=24.06.16
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel
+makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
  libsidplayfp-devel libva-glx-devel libXv-devel pulseaudio-devel
  qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel
  libcdio-paranoia-devel qt5-declarative-devel"

srcpkgs/actiona/template

@@ -1,7 +1,7 @@
 # Template file for 'actiona'
 pkgname=actiona
 version=3.10.1
-revision=2
+revision=3
 build_style=qmake
 configure_args="PKGCONFIG_OPENCV=opencv4"
 hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"

srcpkgs/alsa-plugins/template

@@ -1,11 +1,11 @@
 # Template file for 'alsa-plugins'
 pkgname=alsa-plugins
 version=1.2.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin"
 hostmakedepends="pkg-config"
-makedepends="ffmpeg-devel jack-devel libsamplerate-devel pulseaudio-devel"
+makedepends="ffmpeg6-devel jack-devel libsamplerate-devel pulseaudio-devel"
 short_desc="Advanced Linux Sound Architecture (ALSA) extra plugins"
 maintainer="Orphaned <[email protected]>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

srcpkgs/arcan/template

@@ -2,7 +2,7 @@
 # !! keep synced with: acfgfs aclip aloadimage
 pkgname=arcan
 version=0.6.2.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=arcan/src
 build_style=cmake
@@ -12,7 +12,7 @@ configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
-makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
+makedepends="MesaLib-devel ffmpeg6-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
  vlc-devel SDL2-devel xcb-util-devel xcb-util-wm-devel
  $(vopt_if tts 'libespeak-ng-devel')

srcpkgs/attract/template

@@ -1,12 +1,12 @@
 # Template file for 'attract'
 pkgname=attract
 version=2.7.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="VERBOSE=1"
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="SFML-devel ffmpeg-devel fontconfig-devel glu-devel libarchive-devel
+makedepends="SFML-devel ffmpeg6-devel fontconfig-devel glu-devel libarchive-devel
  libcurl-devel libjpeg-turbo-devel libXinerama-devel libXrandr-devel"
 short_desc="Attract-Mode is a graphical frontend for emulators"
 maintainer="Pedro Narciso García Revington <[email protected]>"

srcpkgs/aubio/patches/ffmpeg5.patch

@@ -0,0 +1,25 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <[email protected]>
+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;

srcpkgs/aubio/patches/python3.12.patch

@@ -0,0 +1,21 @@
+--- a/waflib/Context.py	2024-06-04 07:49:13.399793819 -0400
++++ b/waflib/Context.py	2024-06-04 08:00:35.473824306 -0400
+@@ -2,7 +2,7 @@
+ # encoding: utf-8
+ # WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file
+
+-import os,re,imp,sys
++import os,re,types,sys
+ from waflib import Utils,Errors,Logs
+ import waflib.Node
+ HEXVERSION=0x2000e00
+@@ -344,7 +344,7 @@
+ 		return cache_modules[path]
+ 	except KeyError:
+ 		pass
+-	module=imp.new_module(WSCRIPT_FILE)
++	module=types.ModuleType(WSCRIPT_FILE)
+ 	try:
+ 		code=Utils.readf(path,m='r',encoding=encoding)
+ 	except EnvironmentError:
+

srcpkgs/aubio/template

@@ -1,11 +1,11 @@
 # 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"
-makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg-devel"
+makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg6-devel"
 short_desc="Library for audio labelling"
 maintainer="Orphaned <[email protected]>"
 license="GPL-3.0-or-later"

srcpkgs/audacious-plugins/patches/ffmpeg5.patch

@@ -0,0 +1,43 @@
+commit 298aa371c56c2f52c25a33d9bdec4918b11cebdc
+Author: tibequadorian <[email protected]>
+Date:   Sat Mar 19 18:40:12 2022 +0100
+
+    audacious-plugins: rebuild against ffmpeg-5.0
+
+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 0000000000..617c11215b
+--- /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 <[email protected]>
++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)
++             {

srcpkgs/audacious-plugins/template

@@ -2,12 +2,12 @@
 # Keep in sync with audacious and audacious-base
 pkgname=audacious-plugins
 version=4.4
-revision=1
+revision=2
 build_style=meson
 configure_args="$(vopt_bool gtk) $(vopt_bool qt)"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if qt qt6-tools)"
 makedepends="audacious-base-devel alsa-lib-devel pulseaudio-devel jack-devel
- lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel
+ lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg6-devel
  libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
  libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel opus-devel opusfile-devel
  libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel libopenmpt-devel pipewire-devel

srcpkgs/audacity/patches/hscroll.patch

@@ -0,0 +1,26 @@
+--- a/libraries/lib-viewport/Viewport.cpp	2024-06-01 09:25:58.915855057 -0400
++++ b/libraries/lib-viewport/Viewport.cpp	2024-06-01 11:06:08.779799589 -0400
+@@ -326,10 +326,10 @@
+    bool newvstate = panelHeight < totalHeight;
+
+    // Hide scrollbar thumbs and buttons if not scrollable
+-   if (mpCallbacks) {
+-      mpCallbacks->ShowHorizontalScrollbar(newhstate);
+-      mpCallbacks->ShowVerticalScrollbar(newvstate);
+-   }
++   //if (mpCallbacks) {
++   //   mpCallbacks->ShowHorizontalScrollbar(newhstate);
++   //   mpCallbacks->ShowVerticalScrollbar(newvstate);
++   //}
+
+    // When not scrollable in either axis, align viewport to top or left and
+    // repaint it later
+@@ -378,7 +378,7 @@
+          totalHeight / scrollStep,
+          panelHeight / scrollStep, true);
+
+-   rescroll = (rescroll &&
++   rescroll = (rescroll ||
+        (viewInfo.GetScreenEndTime() - viewInfo.hpos) < total);
+    Publish({ (refresh || rescroll),
+       (oldhstate != newhstate || oldvstate != newvstate), false });

srcpkgs/audacity/template

@@ -1,6 +1,6 @@
 # Template file for 'audacity'
 pkgname=audacity
-version=3.4.2
+version=3.5.1
 revision=1
 build_style=cmake
 build_helper="cmake-wxWidgets-gtk3 qemu"
@@ -12,7 +12,7 @@ configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
  -Daudacity_has_updates_check=OFF -DAUDACITY_BUILD_LEVEL=2"
 hostmakedepends="pkg-config gettext python3"
 makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
- libsoxr-devel portaudio-devel sqlite-devel ffmpeg-devel
+ libsoxr-devel portaudio-devel sqlite-devel ffmpeg6-devel
  libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
  libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
  sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
 homepage="https://www.audacityteam.org"
 changelog="https://github.com/audacity/audacity/raw/master/CHANGELOG.txt"
 distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
-checksum=f28dd718d2c5a2aa9f207b8351443a90c1f02b65378ca94bcc7febda42635e48
+checksum=8786a1be8d63f4793fc3f2a5f1f61c441e0a4b9a7ed9137d59277ad5f72bd512
 
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"