From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38162) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioH2v-00042N-45 for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioH2t-0000nm-I1 for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38866) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioH2t-0000nL-FB for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioH2t-0008P0-BR for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:03 -0500 Subject: [bug#38961] [PATCH 08/22] gnu: Add ffmpeg-jami. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:38081) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioH1u-0003i6-3j for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioH1s-0000Mg-8j for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:01 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:50880) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioH1r-0000LQ-Kv for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:00 -0500 From: Jan Wielkiewicz Date: Mon, 6 Jan 2020 02:11:38 +0100 Message-Id: <20200106011151.1902-8-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200106011151.1902-1-tona_kosmicznego_smiecia@interia.pl> References: <20200106011151.1902-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38961@debbugs.gnu.org Cc: Jan Wielkiewicz --- gnu/packages/jami.scm | 213 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index f257767a85..7320104c88 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -56,7 +56,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix git-download)) + #:use-module (guix git-download) + #:use-module (guix utils)) =20 (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) @@ -218,6 +219,216 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) =20 +(define-public ffmpeg-jami + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (version "4.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.ffmpeg.org/ffmpeg.git") + (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) + (file-name (git-file-name "ffmpeg" version)) + (sha256 + (base32 + "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))= ) + (native-inputs + `(("savoir-faire-linux-patches" ,(jami-source)) + ,@(package-native-inputs ffmpeg))) + (arguments + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags '()) + (append '("--disable-everything" + "--enable-zlib" + "--enable-gpl" + "--enable-swscale" + "--enable-bsfs" + "--disable-filters" + "--disable-programs" + "--disable-postproc" + "--disable-protocols" + "--enable-protocol=3Dcrypto" + "--enable-protocol=3Dfile" + "--enable-protocol=3Drtp" + "--enable-protocol=3Dsrtp" + "--enable-protocol=3Dtcp" + "--enable-protocol=3Dudp" + "--enable-protocol=3Dunix" + "--enable-protocol=3Dpipe" + "--disable-demuxers" + "--disable-muxers" + "--enable-muxer=3Drtp" + "--enable-muxer=3Dg722" + "--enable-muxer=3Dh263" + "--enable-muxer=3Dh264" + "--enable-muxer=3Dhevc" + "--enable-muxer=3Dwebm" + "--enable-muxer=3Dogg" + "--enable-muxer=3Dpcm_s16be" + "--enable-muxer=3Dpcm_s16le" + "--enable-demuxer=3Drtp" + "--enable-demuxer=3Dmjpeg" + "--enable-demuxer=3Dmjpeg_2000" + "--enable-demuxer=3Dmpegvideo" + "--enable-demuxer=3Dgif" + "--enable-demuxer=3Dimage_jpeg_pipe" + "--enable-demuxer=3Dimage_png_pipe" + "--enable-demuxer=3Dimage_webp_pipe" + "--enable-demuxer=3Dmatroska" + "--enable-demuxer=3Dm4v" + "--enable-demuxer=3Dmp3" + "--enable-demuxer=3Dogg" + "--enable-demuxer=3Dflac" + "--enable-demuxer=3Dwav" + "--enable-demuxer=3Dac3" + "--enable-demuxer=3Dg722" + "--enable-demuxer=3Dpcm_mulaw" + "--enable-demuxer=3Dpcm_alaw" + "--enable-demuxer=3Dpcm_s16be" + "--enable-demuxer=3Dpcm_s16le" + "--enable-demuxer=3Dh263" + "--enable-demuxer=3Dh264" + "--enable-demuxer=3Dhevc" + "--enable-parser=3Dh263" + "--enable-parser=3Dh264" + "--enable-parser=3Dmpeg4video" + "--enable-parser=3Dvp8" + "--enable-parser=3Dvp9" + "--enable-parser=3Dopus" + "--enable-encoder=3Dadpcm_g722" + "--enable-decoder=3Dadpcm_g722" + "--enable-encoder=3Drawvideo" + "--enable-decoder=3Drawvideo" + "--enable-encoder=3Dlibx264" + "--enable-decoder=3Dh264" + "--enable-encoder=3Dpcm_alaw" + "--enable-decoder=3Dpcm_alaw" + "--enable-encoder=3Dpcm_mulaw" + "--enable-decoder=3Dpcm_mulaw" + "--enable-encoder=3Dmpeg4" + "--enable-decoder=3Dmpeg4" + "--enable-encoder=3Dlibvpx_vp8" + "--enable-decoder=3Dvp8" + "--enable-decoder=3Dvp9" + "--enable-encoder=3Dh263" + "--enable-encoder=3Dh263p" + "--enable-decoder=3Dh263" + "--enable-encoder=3Dmjpeg" + "--enable-decoder=3Dmjpeg" + "--enable-decoder=3Dmjpegb" + "--enable-libspeex" + "--enable-libopus" + "--enable-libvpx" + "--enable-libx264" + "--enable-encoder=3Dlibspeex" + "--enable-decoder=3Dlibspeex" + "--enable-encoder=3Dlibopus" + "--enable-decoder=3Dlibopus" + "--enable-decoder=3Dflac" + "--enable-decoder=3Dvorbis" + "--enable-decoder=3Daac" + "--enable-decoder=3Dac3" + "--enable-decoder=3Deac3" + "--enable-decoder=3Dmp3" + "--enable-decoder=3Dpcm_u24be" + "--enable-decoder=3Dpcm_u24le" + "--enable-decoder=3Dpcm_u32be" + "--enable-decoder=3Dpcm_u32le" + "--enable-decoder=3Dpcm_u8" + "--enable-decoder=3Dpcm_f16le" + "--enable-decoder=3Dpcm_f24le" + "--enable-decoder=3Dpcm_f32be" + "--enable-decoder=3Dpcm_f32le" + "--enable-decoder=3Dpcm_f64be" + "--enable-decoder=3Dpcm_f64le" + "--enable-decoder=3Dpcm_s16be" + "--enable-decoder=3Dpcm_s16be_planar" + "--enable-decoder=3Dpcm_s16le" + "--enable-decoder=3Dpcm_s16le_planar" + "--enable-decoder=3Dpcm_s24be" + "--enable-decoder=3Dpcm_s24le" + "--enable-decoder=3Dpcm_s24le_planar" + "--enable-decoder=3Dpcm_s32be" + "--enable-decoder=3Dpcm_s32le" + "--enable-decoder=3Dpcm_s32le_planar" + "--enable-decoder=3Dpcm_s64be" + "--enable-decoder=3Dpcm_s64le" + "--enable-decoder=3Dpcm_s8" + "--enable-decoder=3Dpcm_s8_planar" + "--enable-decoder=3Dpcm_u16be" + "--enable-decoder=3Dpcm_u16le" + "--enable-encoder=3Dgif" + "--enable-decoder=3Dgif" + "--enable-encoder=3Djpegls" + "--enable-decoder=3Djpegls" + "--enable-encoder=3Dljpeg" + "--enable-decoder=3Djpeg2000" + "--enable-encoder=3Dpng" + "--enable-decoder=3Dpng" + "--enable-encoder=3Dbmp" + "--enable-decoder=3Dbmp" + "--enable-encoder=3Dtiff" + "--enable-decoder=3Dtiff" + "--enable-filter=3Dscale" + "--enable-filter=3Doverlay" + "--enable-filter=3Damix" + "--enable-filter=3Damerge" + "--enable-filter=3Daresample" + "--enable-filter=3Dformat" + "--enable-filter=3Daformat" + "--enable-filter=3Dfps" + "--enable-filter=3Dtranspose" + "--enable-filter=3Dpad") + (if (string-contains (%current-system) "linux") + '("--enable-pic" + "--extra-cxxflags=3D-fPIC" + "--extra-cflags=3D-fPIC" + "--target-os=3Dlinux" + "--enable-indev=3Dv4l2" + "--enable-indev=3Dxcbgrab" + "--enable-vdpau" + "--enable-hwaccel=3Dh264_vdpau" + "--enable-hwaccel=3Dmpeg4_vdpau" + "--enable-vaapi" + "--enable-hwaccel=3Dh264_vaapi" + "--enable-hwaccel=3Dmpeg4_vaapi" + "--enable-hwaccel=3Dh263_vaapi" + "--enable-hwaccel=3Dvp8_vaapi" + "--enable-hwaccel=3Dmjpeg_vaapi" + "--enable-encoder=3Dh264_vaapi" + "--enable-encoder=3Dvp8_vaapi" + "--enable-encoder=3Dmjpeg_vaapi" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=3Dh264_nvdec" + "--enable-hwaccel=3Dhevc_nvdec" + "--enable-hwaccel=3Dvp8_nvdec" + "--enable-hwaccel=3Dmjpeg_nvdec" + "--enable-encoder=3Dh264_nvenc" + "--enable-encoder=3Dhevc_nvenc")) + (if (string?=3D (%current-system) "aarch64-linux") + '("--arch=3Daarch64")) + (if (string?=3D (%current-system) "arm64-linux") + '("--arch=3Daarch64")))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependen= cy-patches)) + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time")) + #t)))))))))=20 + (define-public libring (package (name "libring") --=20 2.24.1