community/nymphcast: rebuild against ffmpeg6

2 files changed, 52 insertions, 1 deletions

diff --git a/community/nymphcast/APKBUILD b/community/nymphcast/APKBUILD
index 2a04183d5c5..7a605a47900 100644
--- a/community/nymphcast/APKBUILD
+++ b/community/nymphcast/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=nymphcast
 pkgver=0.1
-pkgrel=6
+pkgrel=7
 # armhf, s390x and riscv64 blocked by vlc
 arch="all !armhf !s390x !riscv64"
 url="http://nyanko.ws/product_nymphcast.php"
@@ -26,6 +26,7 @@ makedepends="
 	"
 subpackages="$pkgname-openrc $pkgname-client $pkgname-nftables"
 source="https://github.com/MayaPosch/NymphCast/archive/v$pkgver/nymphcast-v$pkgver.tar.gz
+	ffmpeg6.patch
 	gcc12.patch
 	60_nymphcast.nft
 	"
@@ -59,6 +60,7 @@ nftables() {
 
 sha512sums="
 c498623fc3506789876cffbd734b6ac39c2a937ad7c9d8d62f6ccc44860d3135d97276afdee3c9e207ad8f8ce0ddbd9770470a6ba935546028d307af3cfc71a4  nymphcast-v0.1.tar.gz
+40550af559230248f4a4a0f00c52e6ab6120ae6cdf5a3268d31abd57fd4bd6fd65f10c56669204896e74214559985bf93348632fb6d7a3b353ef40023833bef7  ffmpeg6.patch
 6628f67f9f778634d77a8bd42ff2ff39031c0ef3b873a22882f04f00892d129a22f1679f4518a8e0bf08a66477f161ea2ce927d39ece3c63b7904f0b8a5226d0  gcc12.patch
 fba04b7fc8c9a4cbab57b20ba2f8e7274e759165e5b0830590796da4a955f3c843b7516cf6bd34d8d82523328d95932610554b2f0decf051b1cc7022319f6b37  60_nymphcast.nft
 "
diff --git a/community/nymphcast/ffmpeg6.patch b/community/nymphcast/ffmpeg6.patch
new file mode 100644
index 00000000000..23789d4f17a
--- /dev/null
+++ b/community/nymphcast/ffmpeg6.patch
@@ -0,0 +1,49 @@
+https://github.com/FFmpeg/FFmpeg/commit/1ea365082318f06cd42a8b37dd0c7724b599c821
+diff --git a/ffplay_cpp/cmdutils.c b/ffplay_cpp/cmdutils.c
+index 49fe9f8..f843e82 100644
+--- a/ffplay_cpp/cmdutils.c
++++ b/ffplay_cpp/cmdutils.c
+@@ -718,7 +718,7 @@ static void init_parse_context(OptionParseContext *octx,
+     memset(octx, 0, sizeof(*octx));
+ 
+     octx->nb_groups = nb_groups;
+-    octx->groups    = av_mallocz_array(octx->nb_groups, sizeof(*octx->groups));
++    octx->groups    = av_calloc(octx->nb_groups, sizeof(*octx->groups));
+     if (!octx->groups)
+         exit_program(1);
+ 
+@@ -2155,7 +2155,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
+ 
+     if (!s->nb_streams)
+         return NULL;
+-    opts = av_mallocz_array(s->nb_streams, sizeof(*opts));
++    opts = av_calloc(s->nb_streams, sizeof(*opts));
+     if (!opts) {
+         av_log(NULL, AV_LOG_ERROR,
+                "Could not alloc memory for stream options.\n");
+diff --git a/src/server/ffplay/cmdutils.c.bak b/src/server/ffplay/cmdutils.c.bak
+index 0e8561a..ab0b166 100644
+--- a/src/server/ffplay/cmdutils.c.bak
++++ b/src/server/ffplay/cmdutils.c.bak
+@@ -719,7 +719,7 @@ static void init_parse_context(OptionParseContext *octx,
+     memset(octx, 0, sizeof(*octx));
+ 
+     octx->nb_groups = nb_groups;
+-    octx->groups    = av_mallocz_array(octx->nb_groups, sizeof(*octx->groups));
++    octx->groups    = av_calloc(octx->nb_groups, sizeof(*octx->groups));
+     if (!octx->groups)
+         exit_program(1);
+ 
+diff --git a/src/server/ffplay/stream_handler.cpp b/src/server/ffplay/stream_handler.cpp
+index f6db69a..27d9fcd 100644
+--- a/src/server/ffplay/stream_handler.cpp
++++ b/src/server/ffplay/stream_handler.cpp
+@@ -137,7 +137,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *cod
+     int i;
+     AVDictionary **opts;
+     if (!s->nb_streams) { return NULL; }
+-	opts = (AVDictionary**) av_mallocz_array(s->nb_streams, sizeof(*opts));
++	opts = (AVDictionary**) av_calloc(s->nb_streams, sizeof(*opts));
+     if (!opts) {
+         av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n");
+         return NULL;