From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioH2x-00042Z-2W for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioH2u-0000oX-6g for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioH2u-0000oR-2z for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioH2t-0008PF-VO for guix-patches@gnu.org; Sun, 05 Jan 2020 20:19:03 -0500 Subject: [bug#38962] [PATCH 17/22] gnu: pjproject-jami: Remove unnecessary lambda, which came from doing rebase improperly; jami.scm: untabify, remove trailing whitespace. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:38109) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioH1x-0003jY-7D for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioH1u-0000P9-Dm for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:05 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:56891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioH1t-0000NF-Tq for guix-patches@gnu.org; Sun, 05 Jan 2020 20:18:02 -0500 From: Jan Wielkiewicz Date: Mon, 6 Jan 2020 02:11:47 +0100 Message-Id: <20200106011151.1902-17-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: 38962@debbugs.gnu.org Cc: Jan Wielkiewicz --- gnu/packages/jami.scm | 591 ++++++++++++++++++++---------------------- 1 file changed, 277 insertions(+), 314 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 92a89f8dc6..a9af081450 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -62,18 +62,18 @@ =20 (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) - (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux pat= ches")) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patche= s") - "-C" savoir-faire-linux-patches-directory - "--strip-components=3D5" - (string-append "ring-project/daemon/contrib/src/" - dep-name)) - (for-each + (let ((savoir-faire-linux-patches-directory "Savoir-faire Li= nux patches")) + (mkdir-p savoir-faire-linux-patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux= -patches") + "-C" savoir-faire-linux-patches-direct= ory + "--strip-components=3D5" + (string-append "ring-project/daemon/co= ntrib/src/" + dep-name)) + (for-each (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-directory "/" - file ".patch"))) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-d= irectory "/" + file ".patch"))) patches)))) =20 (define %jami-version "20191217.1.ce5f295") @@ -142,83 +142,48 @@ (for-each make-file-writable (find-files ".")) #t)) (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((savoir-faire-linux-patches-directory "Savoir-faire L= inux patches") - ;; Comes from - ;; "ring-project/daemon/contrib/src/pjproject/rules.m= ak". - ;; WARNING: These amount for huge changes in pjprojec= t. - (savoir-faire-linux-patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - ;; "uwp_vs" ; for windows - "disable_local_resolution"))) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linu= x-patches") - "-C" savoir-faire-linux-patches-directory - "--strip-components=3D5" - "ring-project/daemon/contrib/src/pjproject") - (for-each - (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-dire= ctory "/" - file ".patch"))) - savoir-faire-linux-patches)) - #t)) - (lambda* (#:key inputs #:allow-other-keys) - (let ((jami-apply-dependency-patches ,jami-apply-dependency-patc= hes)) - ;; 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 "pjproject" - #:patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - "disable_local_resolution")) - #t)) - ;; TODO: We could use substitute-keyword-arguments instead of - ;; repeating the phases from pjproject, but somehow it does - ;; not work. - (add-before 'build 'build-dep - (lambda _ (invoke "make" "dep"))) - (add-before 'patch-source-shebangs 'autoconf - (lambda _ - (invoke "autoconf" "-v" "-f" "-i" "-o" - "aconfigure" "aconfigure.ac"))) - (add-before 'autoconf 'disable-some-tests - ;; Three of the six test programs fail due to missing network - ;; access. - (lambda _ - (substitute* "Makefile" - (("selftest: pjlib-test pjlib-util-test pjnath-test pjmed= ia-test pjsip-test pjsua-test") - "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-= apply-dependency-patches)) + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjpro= ject/rules.mak". + ;; WARNING: These amount for huge changes= in pjproject. + (jami-apply-dependency-patches #:inputs i= nputs + #:dep-name= "pjproject" + #:patches + '("fix_tur= n_alloc_failure" + "rfc2466= " + "ipv6" + "multipl= e_listeners" + "pj_ice_= sess" + "fix_tur= n_fallback" + "fix_ioq= ueue_ipv6_sendto" + "add_dtl= s_transport" + "rfc6544= " + "ice_con= fig" + "sip_con= fig" + "fix_fir= st_packet_turn_tcp" + "fix_ebu= sy_turn" + "ignore_= ipv6_on_transport_check" + "fix_tur= n_connection_failure" + "disable= _local_resolution")) + #t))) + ;; TODO: We could use substitute-keyword-arguments = instead of + ;; repeating the phases from pjproject, but somehow= it does + ;; not work. + (add-before 'build 'build-dep + (lambda _ (invoke "make" "dep"))) + (add-before 'patch-source-shebangs 'autoconf + (lambda _ + (invoke "autoconf" "-v" "-f" "-i" "-o= " + "aconfigure" "aconfigure.ac")= )) + (add-before 'autoconf 'disable-some-tests + ;; Three of the six test programs fail = due to missing network + ;; access. + (lambda _ + (substitute* "Makefile" + (("selftest: pjlib-test = pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") + "selftest: pjlib-test p= jlib-util-test pjmedia-test")) + #t))))))) =20 (define-public gnutls-jami (package @@ -244,31 +209,31 @@ "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))= ) (arguments (substitute-keyword-arguments (package-arguments gnutls) - ((#:configure-flags '()) - '("--disable-gtk-doc" - "--without-p11-kit" - "--disable-cxx" - "--disable-srp-authentication" - "--disable-psk-authentication-FIXME" - "--with-included-libtasn1" - "--with-included-unistring" - "--disable-openpgp-authentication" - "--disable-openssl-compatibility" - "--disable-guile" - "--disable-nls" - "--disable-dtls-srtp-support" - "--without-libintl-prefix" - "--without-idn")) - ((#: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)) - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "gnutls" - #:patches - '("downgrade-gettext-requirement")) - #t))))))))) + ((#:configure-flags '()) + '("--disable-gtk-doc" + "--without-p11-kit" + "--disable-cxx" + "--disable-srp-authentication" + "--disable-psk-authentication-FIXME= " + "--with-included-libtasn1" + "--with-included-unistring" + "--disable-openpgp-authentication" + "--disable-openssl-compatibility" + "--disable-guile" + "--disable-nls" + "--disable-dtls-srtp-support" + "--without-libintl-prefix" + "--without-idn")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'a= pply-patches + (lambda* (= #:key inputs #:allow-other-keys) + (= let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + = (jami-apply-dependency-patches #:inputs inputs + = #:dep-name "gnutls" + = #:patches + = '("downgrade-gettext-requirement")) + = #t))))))))) =20 (define-public ffmpeg-jami (package @@ -278,9 +243,9 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://git.ffmpeg.org/ffmpeg.git") - (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) - (file-name (git-file-name "ffmpeg" version)) + (url "https://git.ffmpeg.org/ffmpeg.git") + (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) + (file-name (git-file-name "ffmpeg" version)) (sha256 (base32 "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))= ) @@ -292,202 +257,202 @@ (append '(#:tests? #f) (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 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((jami-apply-dependency-patches ,jami-apply-dependency-pat= ches)) - ;; 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 + ((#:configure-flags '()) + (append '("--disable-everything" + "--enable-zlib" + "--enable-gpl" + "--enable-swscale" + "--enable-bsfs" + "--disable-filters" + "--disable-programs" + "--disable-postproc" + "--disable-protocols" + "--enable-protocol=3Dcrypt= o" + "--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_s16b= e" + "--enable-muxer=3Dpcm_s16l= e" + "--enable-demuxer=3Drtp" + "--enable-demuxer=3Dmjpeg" + "--enable-demuxer=3Dmjpeg_= 2000" + "--enable-demuxer=3Dmpegvi= deo" + "--enable-demuxer=3Dgif" + "--enable-demuxer=3Dimage_= jpeg_pipe" + "--enable-demuxer=3Dimage_= png_pipe" + "--enable-demuxer=3Dimage_= webp_pipe" + "--enable-demuxer=3Dmatros= ka" + "--enable-demuxer=3Dm4v" + "--enable-demuxer=3Dmp3" + "--enable-demuxer=3Dogg" + "--enable-demuxer=3Dflac" + "--enable-demuxer=3Dwav" + "--enable-demuxer=3Dac3" + "--enable-demuxer=3Dg722" + "--enable-demuxer=3Dpcm_mu= law" + "--enable-demuxer=3Dpcm_al= aw" + "--enable-demuxer=3Dpcm_s1= 6be" + "--enable-demuxer=3Dpcm_s1= 6le" + "--enable-demuxer=3Dh263" + "--enable-demuxer=3Dh264" + "--enable-demuxer=3Dhevc" + "--enable-parser=3Dh263" + "--enable-parser=3Dh264" + "--enable-parser=3Dmpeg4vi= deo" + "--enable-parser=3Dvp8" + "--enable-parser=3Dvp9" + "--enable-parser=3Dopus" + "--enable-encoder=3Dadpcm_= g722" + "--enable-decoder=3Dadpcm_= g722" + "--enable-encoder=3Drawvid= eo" + "--enable-decoder=3Drawvid= eo" + "--enable-encoder=3Dlibx26= 4" + "--enable-decoder=3Dh264" + "--enable-encoder=3Dpcm_al= aw" + "--enable-decoder=3Dpcm_al= aw" + "--enable-encoder=3Dpcm_mu= law" + "--enable-decoder=3Dpcm_mu= law" + "--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=3Dlibspe= ex" + "--enable-decoder=3Dlibspe= ex" + "--enable-encoder=3Dlibopu= s" + "--enable-decoder=3Dlibopu= s" + "--enable-decoder=3Dflac" + "--enable-decoder=3Dvorbis= " + "--enable-decoder=3Daac" + "--enable-decoder=3Dac3" + "--enable-decoder=3Deac3" + "--enable-decoder=3Dmp3" + "--enable-decoder=3Dpcm_u2= 4be" + "--enable-decoder=3Dpcm_u2= 4le" + "--enable-decoder=3Dpcm_u3= 2be" + "--enable-decoder=3Dpcm_u3= 2le" + "--enable-decoder=3Dpcm_u8= " + "--enable-decoder=3Dpcm_f1= 6le" + "--enable-decoder=3Dpcm_f2= 4le" + "--enable-decoder=3Dpcm_f3= 2be" + "--enable-decoder=3Dpcm_f3= 2le" + "--enable-decoder=3Dpcm_f6= 4be" + "--enable-decoder=3Dpcm_f6= 4le" + "--enable-decoder=3Dpcm_s1= 6be" + "--enable-decoder=3Dpcm_s1= 6be_planar" + "--enable-decoder=3Dpcm_s1= 6le" + "--enable-decoder=3Dpcm_s1= 6le_planar" + "--enable-decoder=3Dpcm_s2= 4be" + "--enable-decoder=3Dpcm_s2= 4le" + "--enable-decoder=3Dpcm_s2= 4le_planar" + "--enable-decoder=3Dpcm_s3= 2be" + "--enable-decoder=3Dpcm_s3= 2le" + "--enable-decoder=3Dpcm_s3= 2le_planar" + "--enable-decoder=3Dpcm_s6= 4be" + "--enable-decoder=3Dpcm_s6= 4le" + "--enable-decoder=3Dpcm_s8= " + "--enable-decoder=3Dpcm_s8= _planar" + "--enable-decoder=3Dpcm_u1= 6be" + "--enable-decoder=3Dpcm_u1= 6le" + "--enable-encoder=3Dgif" + "--enable-decoder=3Dgif" + "--enable-encoder=3Djpegls= " + "--enable-decoder=3Djpegls= " + "--enable-encoder=3Dljpeg" + "--enable-decoder=3Djpeg20= 00" + "--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=3Daresamp= le" + "--enable-filter=3Dformat" + "--enable-filter=3Daformat= " + "--enable-filter=3Dfps" + "--enable-filter=3Dtranspo= se" + "--enable-filter=3Dpad") + (if (string-contains (%curre= nt-system) "linux") + '("--enable-pic" + "--extra-cxxflags=3D-f= PIC" + "--extra-cflags=3D-fPI= C" + "--target-os=3Dlinux" + "--enable-indev=3Dv4l2= " + "--enable-indev=3Dxcbg= rab" + "--enable-vdpau" + "--enable-hwaccel=3Dh2= 64_vdpau" + "--enable-hwaccel=3Dmp= eg4_vdpau" + "--enable-vaapi" + "--enable-hwaccel=3Dh2= 64_vaapi" + "--enable-hwaccel=3Dmp= eg4_vaapi" + "--enable-hwaccel=3Dh2= 63_vaapi" + "--enable-hwaccel=3Dvp= 8_vaapi" + "--enable-hwaccel=3Dmj= peg_vaapi" + "--enable-encoder=3Dh2= 64_vaapi" + "--enable-encoder=3Dvp= 8_vaapi" + "--enable-encoder=3Dmj= peg_vaapi" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=3Dh2= 64_nvdec" + "--enable-hwaccel=3Dhe= vc_nvdec" + "--enable-hwaccel=3Dvp= 8_nvdec" + "--enable-hwaccel=3Dmj= peg_nvdec" + "--enable-encoder=3Dh2= 64_nvenc" + "--enable-encoder=3Dhe= vc_nvenc")) + (if (string?=3D (%current-sy= stem) "aarch64-linux") + '("--arch=3Daarch64") + '()) + (if (string?=3D (%current-sy= stem) "arm64-linux") + '("--arch=3Daarch64") + '()))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack '= make-git-checkout-writable + (lambda _ + (for-ea= ch make-file-writable (find-files ".")) + #t)) + (add-after 'unpack '= apply-patches + (lambda* = (#:key inputs #:allow-other-keys) + = (let ((jami-apply-dependency-patches ,jami-apply-dependency-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 @@ -662,5 +627,3 @@ This package provides the Jami client for the GNOME d= esktop.") =20 (define-public jami-client-gnome (deprecated-package "jami-client-gnome" jami)) - - --=20 2.24.1