[WIP] ffmpeg8 [skip ci] [ci skip] [no ci]

common/shlibs

@@ -397,25 +397,24 @@ 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.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
 libdispatch.so libdispatch-5.10.1_1
 libBlocksRuntime.so libdispatch-5.10.1_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.58 libavdevice4-4.4.6_1
+libavformat.so.58 libavformat4-4.4.6_1
+libswscale.so.5 libswscale4-4.4.6_1
+libswresample.so.3 libswresample4-4.4.6_1
+libavresample.so.4 libavresample4-4.4.6_1
+libpostproc.so.55 libpostproc4-4.4.6_1
+libavcodec.so.58 libavcodec4-4.4.6_1
+libavutil.so.56 libavutil4-4.4.6_1
+libavfilter.so.7 libavfilter4-4.4.6_1
+libavdevice.so.62 libavdevice-8.0.1_1
+libavformat.so.62 libavformat-8.0.1_1
+libswscale.so.9 libswscale-8.0.1_1
+libswresample.so.6 libswresample-8.0.1_1
+libavcodec.so.62 libavcodec-8.0.1_1
+libavutil.so.60 libavutil-8.0.1_1
+libavfilter.so.11 libavfilter-8.0.1_1
 libSDL-1.2.so.0 sdl12-compat-1.2.68_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.157 x264-20190507.2245_1
@@ -2951,8 +2950,8 @@ liblmdb.so.0 lmdb-0.9.18_2
 libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
-libqmmp.so.1 qmmp-1.1.4_1
-libqmmpui.so.1 qmmp-1.1.4_1
+libqmmp.so.2 qmmp-2.3.0_1
+libqmmpui.so.2 qmmp-2.3.0_1
 libalkimia6.so.8 libalkimia-8.2.1_2
 libpayeeidentifier_iban_bic_widgets.so.5 kmymoney-5.0.0_1
 libKDb3.so.4 kdb-3.1.0_1
@@ -3162,7 +3161,7 @@ libvalaccodegen.so libvala-0.44.0_1
 libphodav-3.0.so.0 phodav-3.0_1
 libgfshare.so.2 libgfshare-2.0.0_1
 libtacacs.so.1 tacacs-4.0.4.28_1
-libffms2.so.4 libffms2-2.23.1_1
+libffms2.so.5 libffms2-5.0.1_1
 libddcutil.so.5 ddcutil-2.1.4_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1

srcpkgs/Aegisub/template

@@ -7,8 +7,8 @@ configure_args="-Dsystem_luajit=true"
 hostmakedepends="pkg-config gettext meson ninja LuaJIT"
 makedepends="libass-devel zlib-devel icu-devel boost-devel-minimal
  libboost_locale libboost_thread
- wxWidgets-gtk3-devel MesaLib-devel LuaJIT-devel fontconfig-devel ffmpeg6
- ffmpeg6-devel libffms2-devel fftw-devel hunspell-devel uchardet-devel gtest-devel
+ wxWidgets-gtk3-devel MesaLib-devel LuaJIT-devel fontconfig-devel ffmpeg
+ ffmpeg-devel libffms2-devel fftw-devel hunspell-devel uchardet-devel gtest-devel
  pulseaudio-devel alsa-lib-devel libopenal-devel portaudio-devel libcurl-devel"
 short_desc="Cross-platform advanced subtitle editor"
 maintainer="Komeil Parseh <komeilparseh@disroot.org>"

srcpkgs/QMPlay2/template

@@ -1,10 +1,10 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
 version=25.09.11
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
+makedepends="alsa-lib-devel ffmpeg-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/alsa-plugins/template

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

srcpkgs/arcan/patches/ffmpeg8.patch

@@ -0,0 +1,34 @@
+--- a/arcan/src/frameserver/encode/default/encode_presets.c
++++ b/arcan/src/frameserver/encode/default/encode_presets.c
+@@ -63,7 +63,6 @@
+ 		dst->storage.video.codec, NULL) != 0){
+ 		dst->storage.video.codec   = NULL;
+ 		dst->storage.video.context = NULL;
+-		avcodec_close(dst->storage.video.context);
+ 		return false;
+ 	}
+
+@@ -91,7 +90,6 @@
+
+ 	if (avcodec_open2(
+ 		dst->storage.audio.context, dst->storage.audio.codec, NULL) != 0){
+-		avcodec_close(dst->storage.audio.context);
+ 		dst->storage.audio.context = NULL;
+ 		dst->storage.audio.codec   = NULL;
+ 		return false;
+@@ -181,7 +179,6 @@
+
+ 	if (avcodec_open2(dst->storage.video.context,
+ 		dst->storage.video.codec, &opts) != 0){
+-		avcodec_close(dst->storage.video.context);
+ 		dst->storage.video.context = NULL;
+ 		dst->storage.video.codec   = NULL;
+ 		return false;
+@@ -247,7 +244,6 @@
+ 		width, height, fps, vbr / 1024);
+ 	if (avcodec_open2(dst->storage.video.context,
+ 		dst->storage.video.codec, &opts) != 0){
+-		avcodec_close(dst->storage.video.context);
+ 		dst->storage.video.context = NULL;
+ 		dst->storage.video.codec   = NULL;
+ 		return false;

srcpkgs/arcan/template

@@ -2,7 +2,7 @@
 # !! keep synced with: acfgfs aclip aloadimage
 pkgname=arcan
 version=0.7.0.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=arcan/src
 build_style=cmake
@@ -12,7 +12,7 @@ configure_args="-DDISTR_TAG='VoidLinux' -DVIDEO_PLATFORM=egl-dri
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
-makedepends="MesaLib-devel ffmpeg6-devel file-devel freetype-devel liblzma-devel
+makedepends="MesaLib-devel ffmpeg-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 mupdf-devel
  $(vopt_if tts 'libespeak-ng-devel')

srcpkgs/attract/patches/ffmpeg8.patch

@@ -0,0 +1,84 @@
+--- a/src/media.cpp
++++ b/src/media.cpp
+@@ -61,6 +61,9 @@
+   #define FORMAT_CTX_URL m_imp->m_format_ctx->filename
+ #endif
+
++#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100))
++#define HAVE_DURATION (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 2, 100))
++
+ void try_hw_accel( AVCodecContext *&codec_ctx, FeAVCodec *&dec );
+
+ std::string g_decoder;
+@@ -323,7 +326,7 @@
+ {
+ 	int data_size = av_samples_get_buffer_size(
+ 		NULL,
+-		codec_ctx->channels,
++		codec_ctx->ch_layout.nb_channels,
+ 		frame->nb_samples,
+ 		codec_ctx->sample_fmt, 1);
+
+@@ -349,17 +352,16 @@
+ 				return false;
+ 			}
+
+-			int64_t channel_layout = frame->channel_layout;
+-			if ( !channel_layout )
+-			{
+-				channel_layout = av_get_default_channel_layout(
+-						codec_ctx->channels );
+-			}
++			AVChannelLayout layout;
++      av_channel_layout_copy(&layout, &frame->ch_layout);
++      if (!av_channel_layout_check(&layout) ) {
++        av_channel_layout_default(&layout, codec_ctx->ch_layout.nb_channels);
++      }
++      av_opt_set_chlayout(resample_ctx, "in_chlayout", &layout, 0);
++      av_opt_set_chlayout(resample_ctx, "out_chlayout", &layout, 0);
+
+-			av_opt_set_int( resample_ctx, "in_channel_layout", channel_layout, 0 );
+ 			av_opt_set_int( resample_ctx, "in_sample_fmt", frame->format, 0 );
+ 			av_opt_set_int( resample_ctx, "in_sample_rate", frame->sample_rate, 0 );
+-			av_opt_set_int( resample_ctx, "out_channel_layout", channel_layout, 0 );
+ 			av_opt_set_int( resample_ctx, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0 );
+ 			av_opt_set_int( resample_ctx, "out_sample_rate", frame->sample_rate, 0 );
+
+@@ -384,7 +386,7 @@
+ 			int out_linesize;
+ 			av_samples_get_buffer_size(
+ 				&out_linesize,
+-				codec_ctx->channels,
++				codec_ctx->ch_layout.nb_channels,
+ 				frame->nb_samples,
+ 				AV_SAMPLE_FMT_S16, 0 );
+
+@@ -402,8 +404,8 @@
+ 				FeLog() << "Error performing audio conversion." << std::endl;
+ 				return false;
+ 			}
+-			offset += out_samples * codec_ctx->channels;
+-			data.sampleCount += out_samples * codec_ctx->channels;
++			offset += out_samples * codec_ctx->ch_layout.nb_channels;
++			data.sampleCount += out_samples * codec_ctx->ch_layout.nb_channels;
+ 			data.samples = audio_buff;
+ 		}
+ 	}
+@@ -760,7 +762,7 @@
+
+ 						// Track pts and duration if we need to correct next frame
+ 						prev_pts = raw_frame->pts;
+-						prev_duration = raw_frame->pkt_duration;
++						prev_duration = raw_frame->duration;
+ #endif
+
+ 						detached_frame = raw_frame;
+@@ -1066,7 +1068,7 @@
+ 					+ codec_ctx->sample_rate );
+
+ 				sf::SoundStream::initialize(
+-					codec_ctx->channels,
++					codec_ctx->ch_layout.nb_channels,
+ 					codec_ctx->sample_rate );
+
+ 				sf::SoundStream::setLoop( false );

srcpkgs/attract/template

@@ -1,12 +1,12 @@
 # Template file for 'attract'
 pkgname=attract
 version=2.7.0
-revision=3
+revision=4
 build_style=gnu-makefile
 make_build_args="VERBOSE=1"
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="SFML-devel ffmpeg6-devel fontconfig-devel glu-devel libarchive-devel
+makedepends="SFML-devel ffmpeg-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 <p.revington@gmail.com>"