Skip to content

Commit

Permalink
audacious-plugins: revbump for ffmpeg6
Browse files Browse the repository at this point in the history
  • Loading branch information
zlice committed Jul 24, 2024
1 parent 5973326 commit 3c19b98
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
43 changes: 43 additions & 0 deletions srcpkgs/audacious-plugins/patches/ffmpeg5.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
commit 298aa371c56c2f52c25a33d9bdec4918b11cebdc
Author: tibequadorian <tibequadorian@posteo.de>
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 <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)
+ {
4 changes: 2 additions & 2 deletions srcpkgs/audacious-plugins/template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3c19b98

Please sign in to comment.