amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ffmpeg-jami: Relocate to (gnu packages video).

Browse source 
To avoid Guile module dependency cycles, inherited packages must be defined in
the same module.  Use this opportunity to simplify the patches applying
mechanism, versioning custom patches the same as for other packages.

* gnu/packages/patches/ffmpeg-jami-change-RTCP-ratio.patch: New file.
* gnu/packages/patches/ffmpeg-jami-rtp_ext_abs_send_time.patch: Likewise.
* gnu/packages/patches/ffmpeg-jami-libopusdec-enable-FEC.patch: Likewise.
* gnu/packages/patches/ffmpeg-jami-libopusenc-enable-FEC.patch: Likewise.
* gnu/packages/patches/ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch:
Likewise.
* gnu/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch: Likewise.
* gnu/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/jami.scm (jami-apply-custom-patches): Delete procedure.
(%ffmpeg-default-configure-flags): Delete variable.
(ffmpeg-compose-configure-flags): Delete procedure.
(ffmpeg-jami): Move to...
* gnu/packages/video.scm (ffmpeg-jami): ... here.  Apply patches to origin and
repatriate configure flags.

Change-Id: Id374fae18240cd76b224915d80b61422635ccb77
This commit is contained in:
Maxim Cournoyer 2024-01-07 13:16:17 -05:00
parent 5a38120c67
commit de002b93db
No known key found for this signature in database
GPG key ID: 1260E46482E63562
10 changed files with 901 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch Normal file
View file

@ -0,0 +1,26 @@
From c557a6211f5a29d89fc2ab561e0fb3d8878fb6ad Mon Sep 17 00:00:00 2001
From: philippegorley <gorley.philippe@gmail.com>
Date: Mon, 17 Dec 2018 15:27:57 -0500
Subject: [PATCH] remove mjpeg log
---
libavcodec/mjpegdec.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d1dca84d36..4a26c23cd4 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2294,9 +2294,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
"restart marker: %d\n", start_code & 0x0f);
/* APP fields */
} else if (start_code >= APP0 && start_code <= APP15) {
- if ((ret = mjpeg_decode_app(s)) < 0)
- av_log(avctx, AV_LOG_ERROR, "unable to decode APP fields: %s\n",
- av_err2str(ret));
+ ret = mjpeg_decode_app(s);
/* Comment */
} else if (start_code == COM) {
ret = mjpeg_decode_com(s);
--
2.17.1