gnu: readymedia: Patch for newer ffmpeg.

* gnu/packages/patches/readymedia-ffmpeg7.patch: New patch.
* gnu/local.mk: Register the patch.
* gnu/packages/upnp.scm (readymedia): Enable the patch.

Change-Id: Icac48ec22704513f9fb8fddfe092fdcd7ac0047c
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
This commit is contained in:
Sergey Trofimov 2025-09-30 08:52:41 +02:00 committed by Maxim Cournoyer
parent 3695857dab
commit 80e9216b97
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 18 additions and 1 deletions

View file

@ -2238,6 +2238,7 @@ dist_patch_DATA = \
%D%/packages/patches/raptor2-libxml2.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/re2c-Use-maximum-alignment.patch \
%D%/packages/patches/readymedia-ffmpeg7.patch \
%D%/packages/patches/reduce-unbundle-libffi.patch \
%D%/packages/patches/remake-impure-dirs.patch \
%D%/packages/patches/restartd-update-robust.patch \

View file

@ -0,0 +1,15 @@
https://gitlab.archlinux.org/archlinux/packaging/packages/minidlna/-/raw/affcf0dd1e6f8e33d0ba90b2b0733736fa1aeb71/ffmpeg7.patch
diff --git a/libav.h b/libav.h
index b69752c..aed9d18 100644
--- a/libav.h
+++ b/libav.h
@@ -174,7 +174,7 @@ lav_get_interlaced(AVStream *s)
#define lav_codec_tag(s) s->codecpar->codec_tag
#define lav_sample_rate(s) s->codecpar->sample_rate
#define lav_bit_rate(s) s->codecpar->bit_rate
-#define lav_channels(s) s->codecpar->channels
+#define lav_channels(s) s->codecpar->ch_layout.nb_channels
#define lav_width(s) s->codecpar->width
#define lav_height(s) s->codecpar->height
#define lav_profile(s) s->codecpar->profile

View file

@ -148,7 +148,8 @@ and others.")
"v" (string-replace-substring version "." "_")))))
(file-name (git-file-name name version))
(sha256
(base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2"))))
(base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2"))
(patches (search-patches "readymedia-ffmpeg7.patch"))))
(build-system gnu-build-system)
(arguments
(list