diff options
| author | Sergey Trofimov <sarg@sarg.org.ru> | 2025-09-30 08:52:41 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-09-30 22:03:00 +0900 |
| commit | 80e9216b97e8a1c6d19b03716bebc4f78ff80041 (patch) | |
| tree | a8be30c8e25dde9a6369f3df435b2ce053acf694 | |
| parent | 3695857dabaf4836feea40a50fbad46de7c7ffdd (diff) | |
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>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/readymedia-ffmpeg7.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/upnp.scm | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f116a940237..2889c2e4bc5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/patches/readymedia-ffmpeg7.patch b/gnu/packages/patches/readymedia-ffmpeg7.patch new file mode 100644 index 00000000000..e1c9593e274 --- /dev/null +++ b/gnu/packages/patches/readymedia-ffmpeg7.patch @@ -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 diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index f9596e3331d..0cb9e597d6f 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -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 |