From 9be3ab7bbe41234d861062e0037d3bd24cbba274 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Mar 2020 22:53:07 -0400 Subject: gnu: Remove bctoolbox and ortp. * gnu/packages/telephony.scm (bctoolbox): Delete variable. (ortp): Delete variable. * gnu/packages/audio.scm (bluez-alsa)[inputs]: Update ortp reference. * gnu/packages/kde-internet.scm (kopete)[inputs]: Update ortp reference. Signed-off-by: Danny Milosavljevic --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 803efb5cd1..f368fedee7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -96,6 +96,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages telephony) + #:use-module (gnu packages linphone) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vim) ;xxd -- cgit v1.2.3 From 74c7f367daa554cedeb5f02a00d1cd02acf1584b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 5 Apr 2020 01:07:12 -0400 Subject: gsm: Add the -fPIC compiler option. This is necessary for building mediastream2 (a dependency of Linphone). * gnu/packages/audio.scm (gsm): Add the default CCFLAGS as a make flag, and prepend -fPIC to these. Pass INSTALL_ROOT as a make flag as well, which removes the need to use substitute* in a phase. --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f368fedee7..6d29184592 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 okapi -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2020 Maxim Cournoyer ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Brett Gilio ;;; Copyright © 2018, 2019 Marius Bakke @@ -3356,14 +3356,14 @@ code, used in @code{libtoxcore}.") (build-system gnu-build-system) (arguments `(#:test-target "tst" + #:make-flags '("INSTALL_ROOT=%output" + "CCFLAGS=-fPIC \ +-c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment") ;default options #:phases (modify-phases %standard-phases (add-before 'install 'pre-install (lambda _ (let ((out (assoc-ref %outputs "out"))) - (substitute* "Makefile" - (("INSTALL_ROOT\t=") - (string-append "INSTALL_ROOT\t=\t" out))) (mkdir-p (string-append out "/inc")) (mkdir-p (string-append out "/man")) (mkdir-p (string-append out "/man/man1")) -- cgit v1.2.3 From 4656c95c06ce047effc6464290dbd8a5bcdfab22 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 4 Apr 2020 21:31:49 +0100 Subject: gnu: redkite: Update to 0.8.0. * gnu/packages/audio.scm (redkite): Update to 0.8.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6d29184592..68cea0a693 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3882,7 +3882,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (define-public redkite (package (name "redkite") - (version "0.6.2") + (version "0.8.0") (source (origin (method git-fetch) @@ -3892,7 +3892,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (file-name (git-file-name name version)) (sha256 (base32 - "1i874izajbdhlfacwwj84qrsxf7g4y6nblzxalrkzaap9sa7d1r6")))) + "1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests included -- cgit v1.2.3 From 5b05f8e9654ea722270c45c0fd0eead369bc0daf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 5 Apr 2020 13:54:27 -0400 Subject: gnu: gsm: Fix installation directory. This is a follow-up commit to 74c7f367daa, which broke the installation of the bin, lib and share artifacts. * gnu/packages/audio.scm (gsm)[make-flags]: Programmatically build the INSTALL_ROOT make flag so that the %output variable gets properly expanded. Instead of repeating the default CCFLAGS values as a make flag... [phases]: ...add "-fPIC" using substitutes* in a new add-fpic-ccflag phase. --- gnu/packages/audio.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 68cea0a693..18982b7257 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3356,11 +3356,17 @@ code, used in @code{libtoxcore}.") (build-system gnu-build-system) (arguments `(#:test-target "tst" - #:make-flags '("INSTALL_ROOT=%output" - "CCFLAGS=-fPIC \ --c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment") ;default options + #:make-flags (list (string-append "INSTALL_ROOT=" %output)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'add-fpic-ccflag + (lambda _ + ;; The -fPIC compiler option is needed when building + ;; mediastreamer. + (substitute* "Makefile" + (("^CCFLAGS.*" all) + (string-append all "CCFLAGS += -fPIC"))) + #t)) (add-before 'install 'pre-install (lambda _ (let ((out (assoc-ref %outputs "out"))) -- cgit v1.2.3 From 5e16e4401f854d39f5fbebaf247750e554bd4a09 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 5 Apr 2020 14:13:33 -0400 Subject: gnu: gsm: Update to 1.0.19. * gnu/packages/audio.scm (gsm): Update to 1.0.19. Signed-off-by: Maxim Cournoyer --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 18982b7257..f415ff4a81 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3343,7 +3343,7 @@ code, used in @code{libtoxcore}.") (define-public gsm (package (name "gsm") - (version "1.0.18") + (version "1.0.19") (source (origin (method url-fetch) @@ -3352,7 +3352,7 @@ code, used in @code{libtoxcore}.") "-" version ".tar.gz")) (sha256 (base32 - "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4")))) + "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9")))) (build-system gnu-build-system) (arguments `(#:test-target "tst" -- cgit v1.2.3 From 391d12ff8127899db26be8adac9b31fd743742e6 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:31:53 +0200 Subject: gnu: alsa-modular-synth: Make some inputs native. * gnu/packages/audio.scm (alsa-modular-synth)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/audio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f415ff4a81..a4c21bedae 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Hartmt Goebel ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,10 +155,10 @@ ("jack" ,jack-1) ("ladspa" ,ladspa) ("liblo" ,liblo) - ("qtbase" ,qtbase) - ("qttools" ,qttools))) + ("qtbase" ,qtbase))) (native-inputs `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) ("gcc" ,gcc-5))) (home-page "http://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") -- cgit v1.2.3 From d5fc8518896f406da74a2e5b7c5ac95fabfe56c9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 1 Apr 2020 23:13:33 -0400 Subject: gnu: Add opencore-amr. * gnu/packages/audio.scm (opencore-amr): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/audio.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a4c21bedae..f9d5066ae9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -121,6 +121,26 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public opencore-amr + (package + (name "opencore-amr") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://sourceforge.net/projects/opencore-amr/files/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c")))) + (build-system gnu-build-system) + (synopsis "Adaptive Multi Rate Codec") + (description "OpenCore-AMR is a library of OpenCORE Framework +implementation of Adaptive Multi Rate Narrowband and Wideband +(AMR-NB and AMR-WB) speech codec.") + (home-page "https://sourceforge.net/projects/opencore-amr/") + (license license:asl2.0))) + (define-public alsa-modular-synth (package (name "alsa-modular-synth") -- cgit v1.2.3 From 62e9f00ce2391b062afa3ed96dfd34a3d0762af7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 1 Apr 2020 23:18:08 -0400 Subject: gnu: Add vo-amrwbenc. * gnu/packages/audio.scm (vo-amrwbenc): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/audio.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f9d5066ae9..2f25668f26 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -121,6 +121,25 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public vo-amrwbenc + (package + (name "vo-amrwbenc") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri + (string-append "https://sourceforge.net/projects/opencore-amr/files/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 "0klx3nkidc6b8aawchpk19n3xlrzgnc046w4gd0rdqphw28v6ljn")))) + (build-system gnu-build-system) + (synopsis "Adaptive Multi Rate Codec") + (description "VO-AMR is a library of VisualOn implementation of +Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.") + (home-page "https://sourceforge.net/projects/opencore-amr/") + (license license:asl2.0))) + (define-public opencore-amr (package (name "opencore-amr") -- cgit v1.2.3 From b6b07568c8afea8a1a7fb0fdbe3d8a57e6c7148a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 5 Apr 2020 22:55:31 -0400 Subject: gnu: gsm: Add a newline to the fPIC option substitute replacement. * gnu/packages/audio.scm (gsm): Add a trailing newline to the replacement text. This makes it more robust in the face of future changes. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2f25668f26..e602b002f2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3405,7 +3405,7 @@ code, used in @code{libtoxcore}.") ;; mediastreamer. (substitute* "Makefile" (("^CCFLAGS.*" all) - (string-append all "CCFLAGS += -fPIC"))) + (string-append all "CCFLAGS += -fPIC\n"))) #t)) (add-before 'install 'pre-install (lambda _ -- cgit v1.2.3