From 624ee211b0209858621f7a81a481f73298e51024 Mon Sep 17 00:00:00 2001
From: 宋文武
Date: Mon, 25 Jun 2018 21:04:31 +0800
Subject: gnu: alsa-plugins: Build jack plugin.

* gnu/packages/linux.scm (alsa-plugins)[outputs]: Add "jack".
[inputs]: Add jack-1.
[arguments]: Install jack plugin in the 'split' phase.
---
 gnu/packages/linux.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/linux.scm')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7e81f6387..6ea5becc3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages attr)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
@@ -1060,7 +1061,7 @@ MIDI functionality to the Linux-based operating system.")
     ;; TODO: Remove OSS related plugins, they add support to run native
     ;; ALSA applications on OSS however we do not offer OSS and OSS is
     ;; obsolete.
-    (outputs '("out" "pulseaudio"))
+    (outputs '("out" "pulseaudio" "jack"))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1068,9 +1069,17 @@ MIDI functionality to the Linux-based operating system.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Distribute the binaries to the various outputs.
              (let* ((out (assoc-ref outputs "out"))
+                    (jack (assoc-ref outputs "jack"))
+                    (jacklib (string-append jack "/lib/alsa-lib"))
                     (pua (assoc-ref outputs "pulseaudio"))
                     (pualib (string-append pua "/lib/alsa-lib"))
                     (puaconf (string-append pua "/share/alsa/alsa.conf.d")))
+               ;; For jack.
+               (mkdir-p jacklib)
+               (for-each (lambda (file)
+                           (rename-file file (string-append jacklib "/" (basename file))))
+                         (find-files out ".*jack\\.(la|so)"))
+               ;; For pluseaudio.
                (mkdir-p puaconf)
                (mkdir-p pualib)
                (chdir (string-append out "/share"))
@@ -1087,6 +1096,7 @@ MIDI functionality to the Linux-based operating system.")
                #t))))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
        ("speex" ,speex) ; libspeexdsp resampling plugin
        ("libsamplerate" ,libsamplerate) ; libsamplerate resampling plugin
        ("ffmpeg" ,ffmpeg) ; libavcodec resampling plugin, a52 plugin
-- 
cgit v1.3


From 887fe1fbde7d72788ec348ab4665e1df3d0d704f Mon Sep 17 00:00:00 2001
From: Marius Bakke
Date: Mon, 25 Jun 2018 22:32:35 +0200
Subject: Revert "gnu: efivar: Update to 36."

This may cause grub-install to fail to update EFI variables, yet complete
with a successful exit code:

Installing for x86_64-efi platform.
Could not prepare Boot variable: No such file or directory.
Installation finished. No error reported.

...causing existing boot entries to disappear.  Investigation pending.

This reverts commit 6e5a6e641a12319af35b51d44537cec1c158e099.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/linux.scm')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6ea5becc3..8f99dd297 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3939,7 +3939,7 @@ under OpenGL graphics workloads.")
 (define-public efivar
   (package
     (name "efivar")
-    (version "36")
+    (version "35")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rhinstaller/" name
@@ -3947,7 +3947,7 @@ under OpenGL graphics workloads.")
                                   "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0cqdikspdmj7imc646q0k7hhw10r8spxa22zm1w0ji49131crgwl"))))
+                "153k2ifyl4giz5fkryxhz8z621diqjy7v25hfga4z94rs32ks0qy"))))
     (build-system gnu-build-system)
     (arguments
      `(;; Tests require a UEFI system and is not detected in the chroot.
-- 
cgit v1.3


From fecbbc2820184824a0fc4a138299ee7465fd76dd Mon Sep 17 00:00:00 2001
From: Mark H Weaver
Date: Mon, 25 Jun 2018 18:10:40 -0400
Subject: gnu: linux-libre@4.14: Update to 4.14.51.

* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.51.
(%linux-libre-4.14-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/linux.scm')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8f99dd297..37b577ee0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -411,8 +411,8 @@ It has been modified to remove all non-free binary blobs.")
                     %linux-compatible-systems
                     #:configuration-file kernel-config))
 
-(define %linux-libre-4.14-version "4.14.50")
-(define %linux-libre-4.14-hash "19k7s33dyykm2vh1zpxxh3qrbjcx2p2md2r8s8z5mbv8yaldgvmj")
+(define %linux-libre-4.14-version "4.14.51")
+(define %linux-libre-4.14-hash "1ifczslgp3ng0948l5p0khcnfkv9i44mq0bzk1y8mwdhy4mik0b9")
 
 (define-public linux-libre-4.14
   (make-linux-libre %linux-libre-4.14-version
-- 
cgit v1.3