gnu: jack-2: Update to 1.9.13.

* gnu/packages/audio.scm (jack-2): Update to 1.9.13.
[arguments]: Don't build with python-2.
[inputs]: Replace python2-dbus with python-dbus.
This commit is contained in:
Ricardo Wurmus 2019-10-07 16:32:03 +02:00
parent fa4bbd9f34
commit fa984fa678
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 20 additions and 22 deletions

View File

@ -1532,7 +1532,7 @@ synchronous execution of all clients, and low latency operation.")
(define-public jack-2 (define-public jack-2
(package (inherit jack-1) (package (inherit jack-1)
(name "jack2") (name "jack2")
(version "1.9.12") (version "1.9.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/jackaudio/jack2/releases/" (uri (string-append "https://github.com/jackaudio/jack2/releases/"
@ -1541,40 +1541,38 @@ synchronous execution of all clients, and low latency operation.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0crf4y9a5j9miw8r5ji4l3w5w0y2frrf7xyfsfdgacnw6vwy5vyy")))) "1d1d403jn4366mqig6g8ghr8057b3rn7gs26b5p3rkal34j20qw2"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:tests? #f ; no check target
#:tests? #f ; no check target
#:configure-flags '("--dbus" #:configure-flags '("--dbus"
"--alsa") "--alsa")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before 'configure 'set-linkflags
'configure 'set-linkflags (lambda _
(lambda _ ;; Add $libdir to the RUNPATH of all the binaries.
;; Add $libdir to the RUNPATH of all the binaries. (substitute* "wscript"
(substitute* "wscript" ((".*CFLAGS.*-Wall.*" m)
((".*CFLAGS.*-Wall.*" m) (string-append m
(string-append m " conf.env.append_unique('LINKFLAGS',"
" conf.env.append_unique('LINKFLAGS'," "'-Wl,-rpath=" %output "/lib')\n")))
"'-Wl,-rpath=" %output "/lib')\n"))) #t))
#t))
(add-after 'install 'wrap-python-scripts (add-after 'install 'wrap-python-scripts
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'jack_control' runs with the correct PYTHONPATH. ;; Make sure 'jack_control' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH"))) (path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/jack_control") (wrap-program (string-append out "/bin/jack_control")
`("PYTHONPATH" ":" prefix (,path)))) `("PYTHONPATH" ":" prefix (,path))))
#t))))) #t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("dbus" ,dbus) ("dbus" ,dbus)
("expat" ,expat) ("expat" ,expat)
("libsamplerate" ,libsamplerate) ("libsamplerate" ,libsamplerate)
("opus" ,opus) ("opus" ,opus)
("python2-dbus" ,python2-dbus) ("python-dbus" ,python-dbus)
("readline" ,readline))) ("readline" ,readline)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))