From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57302) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPEzF-00013U-2C for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPEzD-0004qZ-PP for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56392) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPEzD-0004qQ-Le for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPEzD-0005pc-Ja for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:03 -0400 Subject: [bug#40677] [PATCH 19/30] gnu: jami.scm: Untabify by emacs. Resent-Message-ID: From: Jan Wielkiewicz Date: Fri, 17 Apr 2020 02:34:22 +0200 Message-Id: <20200417003433.5608-19-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz --- gnu/packages/jami.scm | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2a5d282fdd..96969eb349 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -133,7 +133,7 @@ "CFLAGS=-fPIC" "CXXFLAGS=-fPIC") #:modules ((guix build utils) - ,@(@@ (guix build-system gnu) %default-modules)) + ,@(@@ (guix build-system gnu) %default-modules)) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -165,7 +165,7 @@ "ignore_ipv6_on_transport_check" "fix_turn_connection_failure" "disable_local_resolution" - "fix_assert_on_connection_attempt")) + "fix_assert_on_connection_attempt")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does @@ -225,7 +225,7 @@ "--enable-protocol=udp" "--enable-protocol=unix" "--enable-protocol=pipe" - ;; enable muxers/demuxers + ;; enable muxers/demuxers "--disable-demuxers" "--disable-muxers" "--enable-muxer=rtp" @@ -260,14 +260,14 @@ "--enable-demuxer=h263" "--enable-demuxer=h264" "--enable-demuxer=hevc" - ;; enable parsers + ;; enable parsers "--enable-parser=h263" "--enable-parser=h264" "--enable-parser=mpeg4video" "--enable-parser=vp8" "--enable-parser=vp9" "--enable-parser=opus" - ;; encoders/decoders + ;; encoders/decoders "--enable-encoder=adpcm_g722" "--enable-decoder=adpcm_g722" "--enable-encoder=rawvideo" @@ -297,7 +297,7 @@ "--enable-decoder=libspeex" "--enable-encoder=libopus" "--enable-decoder=libopus" - ;; decoders for ringtones and audio streaming + ;; decoders for ringtones and audio streaming "--enable-decoder=flac" "--enable-decoder=vorbis" "--enable-decoder=aac" @@ -331,7 +331,7 @@ "--enable-decoder=pcm_s8_planar" "--enable-decoder=pcm_u16be" "--enable-decoder=pcm_u16le" - ;; encoders/decoders for images + ;; encoders/decoders for images "--enable-encoder=gif" "--enable-decoder=gif" "--enable-encoder=jpegls" @@ -344,7 +344,7 @@ "--enable-decoder=bmp" "--enable-encoder=tiff" "--enable-decoder=tiff" - ;; filters + ;; filters "--enable-filter=scale" "--enable-filter=overlay" "--enable-filter=amix" @@ -355,7 +355,7 @@ "--enable-filter=fps" "--enable-filter=transpose" "--enable-filter=pad") - ;; platform specific options + ;; platform specific options (if (string-contains (%current-system) "linux") '("--enable-pic" "--extra-cxxflags=-fPIC --extra-cflags=-fPIC" @@ -375,34 +375,34 @@ "--enable-encoder=vp8_vaapi" "--enable-encoder=mjpeg_vaapi" )) - (cond ((string?= (%current-system) "i386") - '("--arch=x86" - "--enable-cuvid" - "--enable-ffnvcodec" - "--enable-nvdec" - "--enable-nvenc" - "--enable-hwaccel=h264_nvdec" - "--enable-hwaccel=hevc_nvdec" - "--enable-hwaccel=vp8_nvdec" - "--enable-hwaccel=mjpeg_nvdec" - "--enable-encoder=h264_nvenc" - "--enable-encoder=hevc_nvenc")) - ((string?= (%current-system) "x86_64") - '("--arch=x86_64" - "--enable-cuvid" - "--enable-ffnvcodec" - "--enable-nvdec" - "--enable-nvenc" - "--enable-hwaccel=h264_nvdec" - "--enable-hwaccel=hevc_nvdec" - "--enable-hwaccel=vp8_nvdec" - "--enable-hwaccel=mjpeg_nvdec" - "--enable-encoder=h264_nvenc" - "--enable-encoder=hevc_nvenc")) - ((string?= (%current-system) "aarch64-linux") '("--arch=aarch64")) - ((string?= (%current-system) "arm64-linux") '("--arch=aarch64")) - ((string?= (%current-system) "arm") '("--arch=arm")) - (else '())))) + (cond ((string?= (%current-system) "i386") + '("--arch=x86" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=h264_nvdec" + "--enable-hwaccel=hevc_nvdec" + "--enable-hwaccel=vp8_nvdec" + "--enable-hwaccel=mjpeg_nvdec" + "--enable-encoder=h264_nvenc" + "--enable-encoder=hevc_nvenc")) + ((string?= (%current-system) "x86_64") + '("--arch=x86_64" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=h264_nvdec" + "--enable-hwaccel=hevc_nvdec" + "--enable-hwaccel=vp8_nvdec" + "--enable-hwaccel=mjpeg_nvdec" + "--enable-encoder=h264_nvenc" + "--enable-encoder=hevc_nvenc")) + ((string?= (%current-system) "aarch64-linux") '("--arch=aarch64")) + ((string?= (%current-system) "arm64-linux") '("--arch=aarch64")) + ((string?= (%current-system) "arm") '("--arch=arm")) + (else '())))) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'make-git-checkout-writable -- 2.26.1