Skip to content

Commit ff0bb80

Browse files
zlicezlice
committed
ffmpeg5 bumps
1 parent deb1b4d commit ff0bb80

File tree

116 files changed

+1753
-1994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1753
-1994
lines changed

‎srcpkgs/QMPlay2/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'QMPlay2'
22
pkgname=QMPlay2
33
version=23.02.05
4-
revision=1
4+
revision=2
55
build_style=cmake
66
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
77
makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel

‎srcpkgs/alsa-plugins/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'alsa-plugins'
22
pkgname=alsa-plugins
33
version=1.2.7.1
4-
revision=1
4+
revision=2
55
build_style=gnu-configure
66
configure_args="--disable-maemo-plugin"
77
hostmakedepends="pkg-config"

‎srcpkgs/arcan/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# !! keep synced with: acfgfs aclip aloadimage
33
pkgname=arcan
44
version=0.6.2.1
5-
revision=1
5+
revision=2
66
create_wrksrc=yes
77
build_wrksrc=arcan/src
88
build_style=cmake

‎srcpkgs/attract/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'attract'
22
pkgname=attract
33
version=2.6.2
4-
revision=1
4+
revision=2
55
build_style=gnu-makefile
66
make_build_args="VERBOSE=1"
77
make_use_env=yes

‎srcpkgs/aubio/patches/ffmpeg5.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
commit 35eee003f034a1a2097cd4557deb773eacb18f7b
2+
Author: tibequadorian <[email protected]>
3+
Date: Sat Mar 19 18:40:11 2022 +0100
4+
5+
aubio: rebuild against ffmpeg-5.0
6+
7+
diff --git a/srcpkgs/aubio/patches/ffmpeg-5.0.patch b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
8+
new file mode 100644
9+
index 0000000000..aace41a6e6
10+
--- /dev/null
11+
+++ b/srcpkgs/aubio/patches/ffmpeg-5.0.patch
12+
@@ -0,0 +1,25 @@
13+
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
14+
+From: Paul Brossier <[email protected]>
15+
+Date: Tue, 25 Jan 2022 18:30:27 +0100
16+
+Subject: [PATCH] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec >
17+
+ 59, thx @berolinux (closes gh-353)
18+
+
19+
+---
20+
+ src/io/source_avcodec.c | 4 ++++
21+
+ 1 file changed, 4 insertions(+)
22+
+
23+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
24+
+index e0ae93b5..1421bd9a 100644
25+
+--- a/src/io/source_avcodec.c
26+
++++ b/src/io/source_avcodec.c
27+
+@@ -68,6 +68,10 @@
28+
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
29+
+ #endif
30+
+
31+
++#if LIBAVCODEC_VERSION_MAJOR >= 59
32+
++#define FF_API_LAVF_AVCTX 1
33+
++#endif
34+
++
35+
+ struct _aubio_source_avcodec_t {
36+
+ uint_t hop_size;
37+
+ uint_t samplerate;

‎srcpkgs/aubio/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'aubio'
22
pkgname=aubio
33
version=0.4.9
4-
revision=1
4+
revision=2
55
build_style=waf3
66
# XXX lash, pure and swig support.
77
hostmakedepends="pkg-config txt2man"

‎srcpkgs/audacious-plugins/patches/ffmpeg5.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
commit 298aa371c56c2f52c25a33d9bdec4918b11cebdc
2+
Author: tibequadorian <[email protected]>
3+
Date: Sat Mar 19 18:40:12 2022 +0100
4+
5+
audacious-plugins: rebuild against ffmpeg-5.0
6+
7+
diff --git a/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
8+
new file mode 100644
9+
index 0000000000..617c11215b
10+
--- /dev/null
11+
+++ b/srcpkgs/audacious-plugins/patches/ffmpeg-5.0.patch
12+
@@ -0,0 +1,31 @@
13+
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
14+
+From: John Lindgren <[email protected]>
15+
+Date: Sat, 5 Mar 2022 12:05:34 -0500
16+
+Subject: [PATCH] Fix build with FFmpeg 5.0
17+
+
18+
+---
19+
+ src/ffaudio/ffaudio-core.cc | 4 ++--
20+
+ 1 file changed, 2 insertions(+), 2 deletions(-)
21+
+
22+
+diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
23+
+index 16dc63e3a..a2b95fd6c 100644
24+
+--- a/src/ffaudio/ffaudio-core.cc
25+
++++ b/src/ffaudio/ffaudio-core.cc
26+
+@@ -274,7 +274,7 @@ static AVInputFormat * get_format_by_content (const char * name, VFSFile & file)
27+
+ AVProbeData d = {name, buf, filled};
28+
+ score = target;
29+
+
30+
+- f = av_probe_input_format2 (& d, true, & score);
31+
++ f = (AVInputFormat *) av_probe_input_format2 (& d, true, & score);
32+
+ if (f)
33+
+ break;
34+
+
35+
+@@ -347,7 +347,7 @@ static bool find_codec (AVFormatContext * c, CodecInfo * cinfo)
36+
+ #endif
37+
+ if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
38+
+ {
39+
+- AVCodec * codec = avcodec_find_decoder (stream->codecpar->codec_id);
40+
++ AVCodec * codec = (AVCodec *) avcodec_find_decoder (stream->codecpar->codec_id);
41+
+
42+
+ if (codec)
43+
+ {

‎srcpkgs/audacious-plugins/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Keep in sync with audacious!
33
pkgname=audacious-plugins
44
version=4.2
5-
revision=1
5+
revision=2
66
build_style=gnu-configure
77
configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
88
hostmakedepends="gettext pkg-config glib-devel"

‎srcpkgs/audacity/template‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'audacity'
22
pkgname=audacity
33
version=2.4.1
4-
revision=2
4+
revision=3
55
build_style=gnu-configure
66
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
77
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
@@ -33,5 +33,4 @@ post_install() {
3333
vcopy plug-ins /usr/share/audacity
3434

3535
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
36-
vlicense LICENSE.txt LICENSE
3736
}

‎srcpkgs/avidemux/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'avidemux'
22
pkgname=avidemux
33
version=2.8.0
4-
revision=2
4+
revision=3
55
# Can't be compiled for aarch64, arm* or mips*
66
archs="x86_64* i686*"
77
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"

0 commit comments

Comments
 (0)