From patchwork Tue Apr 21 16:10:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21391 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E77EB27BBEA; Tue, 21 Apr 2020 17:12:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E243627BBE4 for ; Tue, 21 Apr 2020 17:12:40 +0100 (BST) Received: from localhost ([::1]:60878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVo-0004GX-Fn for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52298) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVK-0003NK-39 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00045z-5b for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045s-O0 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVI-00061x-Iy for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 13/18] gnu: pjproject, pjproject-jami: Remove broken pjproject package. Make pjproject-jami package stand-alone by moving package code from pjproject into it. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551523043 (code B ref 40677); Tue, 21 Apr 2020 16:12:08 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:55 +0000 Received: from localhost ([127.0.0.1]:50606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUs-0005zH-Mw for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:54 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:56485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUX-0005vq-CX for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:15 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:27 +0200 Message-Id: <20200421161032.1847-13-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485476; bh=gYWQnbxyI4deI9ph06KkWsRz20YqajlUH03hEDGfRGc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=k8XWAp+xw/YFCtYhIQbuUv0JwXAoqYKQjErCgy8kkYKY3vpD6RGeoVgq99+V/+jZB 1ih4yqPYjphJLrik0MS+oF5QeHYswu2EkqcXs4Pjq+JbdVrPjOkSeZ+M5V/uD7UwuJ xplNdcvy+vTVWO4OBT7XvVAxJnq4/T2CtIfNY+eA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 65 ++++++++++++++++++++++++++-- gnu/packages/telephony.scm | 86 -------------------------------------- 2 files changed, 61 insertions(+), 90 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 534958df5d..95f34afa03 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -98,11 +98,64 @@ (define-public pjproject-jami (package - (inherit pjproject) (name "pjproject-jami") + (version "2.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject.git") + (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) + (modules '((guix build utils))) + (snippet + '(begin + (let ((third-party-directories + ;; Things we don't need: + ;; BaseClasses - contains libraries from Windows SDK + ;; we don't need it, at least not now. + (list "BaseClasses" "g7221" "ilbc" "milenage" + "speex" "threademulation" "yuv" "bdsound" + "gsm" "mp3" "resample" "srtp" "webrtc" + ;; Keep only resample, build and README.txt. + "build/baseclasses" "build/g7221" "build/gsm" + "build/ilbc" "build/milenage" "build/resample" + "build/samplerate" "build/speex" "build/srtp" + "build/webrtc" "build/yuv"))) + ;; Keep only Makefiles related to resample. + (for-each (lambda (directory) + (delete-file-recursively + (string-append "third_party/" directory))) + third-party-directories) + #t) + (let ((third-party-dirs + (list "gsm" "ilbc" "speex" "g7221" "srtp" + "portaudio" "resample"))) + (for-each + (lambda (dirs) + (substitute* "third_party/build/os-linux.mak" + (((string-append "DIRS += " dirs)) ""))) + third-party-dirs)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + (build-system gnu-build-system) + (inputs + `(("portaudio" ,portaudio))) + (propagated-inputs + ;; These packages are referenced in the Libs field of the pkg-config + ;; file that will be installed by pjproject. + `(("speex" ,speex) + ("libsrtp" ,libsrtp) + ("gnutls" ,gnutls) + ("resample", resample) + ("util-linux" ,util-linux))) (native-inputs - `(("SFL-patches" ,(jami-source)) - ,@(package-native-inputs pjproject))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("SFL-patches" ,(jami-source)))) (arguments `(#:tests? #f ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. @@ -187,7 +240,11 @@ (substitute* "Makefile" (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))))) + #t))))) + (home-page "https://www.pjsip.org") + (synopsis "SIP (protocol) stack used by Jami") + (description "Pjsip is a C library implementing the SIP protocol. This version is highly modified for use in GNU Jami.") + (license license:gpl2+))) (define-public ffmpeg-jami (let ((commit "59da9dcd7ef6277e4e04998ced71b05a6083c635") diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 59cd06f6f5..b3d2b8bc70 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -644,92 +644,6 @@ phone to IP phone communication or in a network using a SIP proxy to route your calls and messages") (license license:gpl2+))) -(define-public pjproject - (package - (name "pjproject") - (version "2.9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pjsip/pjproject.git") - (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) - (modules '((guix build utils))) - (snippet - '(begin - (let ((third-party-directories - ;; Things we don't need: - ;; BaseClasses - contains libraries from Windows SDK - ;; we don't need it, at least not now. - (list "BaseClasses" "g7221" "ilbc" "milenage" - "speex" "threademulation" "yuv" "bdsound" - "gsm" "mp3" "resample" "srtp" "webrtc" - ;; Keep only resample, build and README.txt. - "build/baseclasses" "build/g7221" "build/gsm" - "build/ilbc" "build/milenage" "build/resample" - "build/samplerate" "build/speex" "build/srtp" - "build/webrtc" "build/yuv"))) - ;; Keep only Makefiles related to resample. - (for-each (lambda (directory) - (delete-file-recursively - (string-append "third_party/" directory))) - third-party-directories) - #t) - (let ((third-party-dirs - (list "gsm" "ilbc" "speex" "g7221" "srtp" - "portaudio" "resample"))) - (for-each - (lambda (dirs) - (substitute* "third_party/build/os-linux.mak" - (((string-append "DIRS += " dirs)) ""))) - third-party-dirs)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) - (build-system gnu-build-system) - (inputs - `(("portaudio" ,portaudio))) - (propagated-inputs - ;; These packages are referenced in the Libs field of the pkg-config - ;; file that will be installed by pjproject. - `(("speex" ,speex) - ("libsrtp" ,libsrtp) - ("gnutls" ,gnutls) - ("resample", resample) - ("util-linux" ,util-linux))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool))) - (arguments - `( ;; FIXME make: No rule to make target - ;; 'pjlib-test-unknown-[something]-gnu'. - #:tests? #f - ;; #:test-target "selftest" - #:phases - (modify-phases %standard-phases - (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 pjlib-util-test pjmedia-test")) - #t))))) - (home-page "https://www.pjsip.org") - (synopsis "Session Initiation Protocol (SIP) stack") - (description "PJProject provides an implementation of the Session -Initiation Protocol (SIP) and a multimedia framework.") - (license license:gpl2+))) - (define-public libtgvoip (package (name "libtgvoip")