From 52196aea193f56f416a687b68e95228a8ef1eec4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 2 Apr 2017 20:14:11 -0400 Subject: [PATCH 01/18] gnu: tzdata: Update to 2017b. * gnu/packages/base.scm (tzdata): Update to 2017b. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c36b612f1..072f401fc3 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1001,7 +1001,7 @@ (define-public glibc/hurd-headers (define-public tzdata (package (name "tzdata") - (version "2017a") + (version "2017b") (source (origin (method url-fetch) (uri (string-append @@ -1009,7 +1009,7 @@ (define-public tzdata version ".tar.gz")) (sha256 (base32 - "1mmv4rvcs12lrvgghw4fidczvb69yv69cmzknghcvw1c196mqfnz")))) + "11l0s43vx33dcs78p80122i8s5s9l1sjwkzzwh66njd35r92l97q")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1057,7 +1057,7 @@ (define-public tzdata version ".tar.gz")) (sha256 (base32 - "1b1q7gnlsh5hjgs5065pvajd37rmbc3k9b8cgzad1vcrifswdwh2")))))) + "0h1d567gn8l3iqgyadcswwdy2yh07nhz3lfl8ds8saz2ajxka5sd")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) From 3cd959a4293b991bf74e5c5aa45a5dd6b3e0d378 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Mon, 3 Apr 2017 10:59:16 +0200 Subject: [PATCH 02/18] gnu: libsndfile: Update to 1.0.28. * gnu/packages/pulseaudio.scm (libsndfile): Update to 1.0.28. --- gnu/packages/pulseaudio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index a12f8d8494..16c77f1f28 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,14 +43,14 @@ (define-module (gnu packages pulseaudio) (define-public libsndfile (package (name "libsndfile") - (version "1.0.27") + (version "1.0.28") (source (origin (method url-fetch) (uri (string-append "http://www.mega-nerd.com/libsndfile/files/libsndfile-" version ".tar.gz")) (sha256 (base32 - "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3")))) + "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))) (build-system gnu-build-system) (inputs `(("libvorbis" ,libvorbis) From 0eb5c4bac7f053c4943fccf48f24b6b292281143 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Apr 2017 16:21:51 +0200 Subject: [PATCH 03/18] gnu: libva: Update to 1.8.0. * gnu/packages/video.scm (libva): Update to 1.8.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b29f6cc9f4..6b644e5c6d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -403,7 +403,7 @@ (define-public libdv (define-public libva (package (name "libva") - (version "1.7.3") + (version "1.8.0") (source (origin (method url-fetch) @@ -411,7 +411,7 @@ (define-public libva "https://www.freedesktop.org/software/vaapi/releases/libva/libva-" version".tar.bz2")) (sha256 - (base32 "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12")))) + (base32 "0n6ncbsx2x1iy92kfb3vqw9i2dii7ck7g0rlflsxz09rpvfg74pb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 9092633c7feb1f25ba86bcb942c9ecc1bd51d6c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:33:56 +0200 Subject: [PATCH 04/18] gnu: libpciaccess: Update to 0.13.5. * gnu/packages/xorg.scm (libpciaccess): Update to 0.13.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 635c1832a4..7857ac0a79 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1095,7 +1095,7 @@ (define-public libfs (define-public libpciaccess (package (name "libpciaccess") - (version "0.13.4") + (version "0.13.5") (source (origin (method url-fetch) @@ -1105,7 +1105,7 @@ (define-public libpciaccess ".tar.bz2")) (sha256 (base32 - "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07")))) + "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) From 3c81c4f90c519238bc86637fd05fdd0ca4053773 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:30:36 +0200 Subject: [PATCH 05/18] gnu: libdrm: Update to 2.4.77. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.77. * gnu/packages/patches/libdrm-symbol-check.patch: Adjust to upstream changes. --- .../patches/libdrm-symbol-check.patch | 25 ++++++++----------- gnu/packages/xdisorg.scm | 4 +-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/gnu/packages/patches/libdrm-symbol-check.patch b/gnu/packages/patches/libdrm-symbol-check.patch index 69c67e778d..0a77763a4f 100644 --- a/gnu/packages/patches/libdrm-symbol-check.patch +++ b/gnu/packages/patches/libdrm-symbol-check.patch @@ -174,26 +174,21 @@ mips64el-linux, armhf-linux and aarch64-linux. @@ -1,6 +1,6 @@ #!/bin/bash --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES +-# The following symbols (past the first nine) are taken from tegra.h. ++# The following symbols (past the first 12) are taken from tegra.h. FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init + ( grep -q "^$func$" || echo $func ) < Date: Thu, 6 Apr 2017 15:42:15 +0200 Subject: [PATCH 06/18] gnu: xorg-server: Update to 1.19.3. * gnu/packages/xorg.scm (xorg-server, xorg-server-xwayland): Update to 1.19.3. [native-inputs]: Remove FONT-UTIL, LIBTOOL, AUTOMAKE and AUTOCONF. [arguments]: Remove 'bootstrap' phase. --- gnu/packages/xorg.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7857ac0a79..983769e5d4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4985,7 +4985,7 @@ (define-public libxcb (define-public xorg-server (package (name "xorg-server") - (version "1.19.2") + (version "1.19.3") (source (origin (method url-fetch) @@ -4994,7 +4994,7 @@ (define-public xorg-server name "-" version ".tar.bz2")) (sha256 (base32 - "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg")))) + "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")))) (build-system gnu-build-system) (propagated-inputs `(("dri2proto" ,dri2proto) @@ -5053,12 +5053,7 @@ (define-public xorg-server ("xcb-util-wm" ,xcb-util-wm))) (native-inputs `(("python" ,python-minimal-wrapper) - ("pkg-config" ,pkg-config) - ;; XXX Bootstrapping inputs for 1.19.2. Remove for > 1.19.2. - ("font-util" ,font-util) - ("libtool" ,libtool) - ("autoconf" ,autoconf) - ("automake" ,automake))) + ("pkg-config" ,pkg-config))) (arguments `(#:parallel-tests? #f #:configure-flags @@ -5085,10 +5080,6 @@ (define-public xorg-server #:phases (modify-phases %standard-phases - ;; XXX The 1.19.2 release of xorg-server was not bootstrapped: - ;; - (add-before 'configure 'bootstrap - (lambda _ (zero? (system* "autoreconf" "-vfi")))) (add-before 'configure 'pre-configure (lambda _ From 3433413b18f02436eb8459d097947257ac6973f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:58:59 +0200 Subject: [PATCH 07/18] gnu: xorg-server@1.19.2: Update to 1.19.3. This is to adjust for the inputs and arguments change of xorg-server proper. * gnu/packages/xorg.scm (xorg-server-1.19.2): Rename to ... (xorg-server-1.19.3): ... this. Update version and origin. * gnu/packages/gtk.scm (gtk+)[native-inputs]: Adjust accordingly. [arguments]<#:disallowed-references>: Likewise. --- gnu/packages/gtk.scm | 4 ++-- gnu/packages/xorg.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 770a8c9160..93970b0392 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -691,9 +691,9 @@ (define-public gtk+ ("python-wrapper" ,python-wrapper) ;; By using a special xorg-server for GTK+'s tests, we reduce the impact ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-1.19.2))) + ("xorg-server" ,xorg-server-1.19.3))) (arguments - `(#:disallowed-references (,xorg-server-1.19.2) + `(#:disallowed-references (,xorg-server-1.19.3) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 983769e5d4..972ad73682 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5106,11 +5106,11 @@ (define-public xorg-server (license license:x11))) ;;; This package is intended to be used when building GTK+. -(define-public xorg-server-1.19.2 +(define-public xorg-server-1.19.3 (package (inherit xorg-server) (name "xorg-server") - (version "1.19.2") + (version "1.19.3") (source (origin (method url-fetch) @@ -5119,7 +5119,7 @@ (define-public xorg-server-1.19.2 name "-" version ".tar.bz2")) (sha256 (base32 - "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg")))))) + "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")))))) (define-public xorg-server-xwayland (package From e1f68c96685fd607fcf00f08edd2f9cdfafabe2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Apr 2017 17:34:09 +0200 Subject: [PATCH 08/18] gnu: libsamplerate: Update to 0.1.9. * gnu/packages/pulseaudio.scm (libsamplerate): Update to 0.1.9. --- gnu/packages/pulseaudio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 16c77f1f28..578a2a31ff 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -76,14 +76,14 @@ (define-public libsndfile (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (string-append "http://www.mega-nerd.com/SRC/libsamplerate-" version ".tar.gz")) (sha256 (base32 - "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck")))) + "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 79f93e2a4f628b3d16f0e16b228bd10c13844ec3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Apr 2017 17:43:50 +0200 Subject: [PATCH 09/18] gnu: libdrm: Update to 2.4.79. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.79. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 55862b4649..89830a628a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -277,7 +277,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.77") + (version "2.4.79") (source (origin (method url-fetch) @@ -287,7 +287,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "0v9vzgv8nb7q4q83c2402m6b7vifl52xwzzr9lmx19227b5f5mg8")) + "15xiwnicf7vl1l37k8nj0z496p7ln1qp8qws7q13ikiv54cz7an6")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs From f575efa12c5df9f9879b7be0fe3593a3106a346d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Apr 2017 01:27:11 +0200 Subject: [PATCH 10/18] gnu: libva: Update to 1.8.1. * gnu/packages/video.scm (libva): Update to 1.8.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6b644e5c6d..3a72887f83 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -403,7 +403,7 @@ (define-public libdv (define-public libva (package (name "libva") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) @@ -411,7 +411,7 @@ (define-public libva "https://www.freedesktop.org/software/vaapi/releases/libva/libva-" version".tar.bz2")) (sha256 - (base32 "0n6ncbsx2x1iy92kfb3vqw9i2dii7ck7g0rlflsxz09rpvfg74pb")))) + (base32 "0wswfznj93jpnxhc3jwdk5j3pmyki0rs6k9vk4vnzds0dddximf1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 2ff8deaeee5058372a518803b18e9b21a6ac67fc Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 15 Apr 2017 19:21:44 -0400 Subject: [PATCH 11/18] gnu: gdk-pixbuf: Update to 2.36.6. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.6. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 93970b0392..075273fdc9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -424,7 +424,7 @@ (define-public gtksourceview (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.3") + (version "2.36.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -432,7 +432,7 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj")) + "034279k49ydawnagqd7b1rz741n20k4y3grybzwp26zd146bjpj5")) (patches (search-patches "gdk-pixbuf-list-dir.patch")))) (build-system gnu-build-system) (arguments From 84080b4362c2e9abc932aa7bb6c916450d6080ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Apr 2017 20:46:27 +0200 Subject: [PATCH 12/18] gnu: libdrm: Update to 2.4.80. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.80. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 89830a628a..8d7f2195c2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -277,7 +277,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.79") + (version "2.4.80") (source (origin (method url-fetch) @@ -287,7 +287,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "15xiwnicf7vl1l37k8nj0z496p7ln1qp8qws7q13ikiv54cz7an6")) + "1wa9cnzf60xwx67zq9ay48xr3j3sn1z80q77jpbzmkg906b52am8")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs From 0315b20a2c5d68d6b6d53ecd0f80964c5ca91d70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Apr 2017 20:48:43 +0200 Subject: [PATCH 13/18] gnu: mesa: Update to 17.0.4. * gnu/packages/patches/mesa-skip-disk-cache-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gl.scm (mesa): Update to 17.0.4. [source]: Adapt URI to new directory structure. [arguments]: End phases on #t. Remove stray whitespaces. [home-page]: Use HTTPS. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 23 +++++++++++-------- .../patches/mesa-skip-disk-cache-test.patch | 20 ++++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/mesa-skip-disk-cache-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 82e94171b8..35f5cc64a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -773,6 +773,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \ %D%/packages/patches/metabat-remove-compilation-date.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bb2eb768ea..f43f464390 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -217,17 +217,20 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "13.0.5") + (version "17.0.4") (source (origin (method url-fetch) - (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz")) + (uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz")) + "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j")) (patches - (search-patches "mesa-wayland-egl-symbols-check-mips.patch")))) + (search-patches "mesa-wayland-egl-symbols-check-mips.patch" + "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) (propagated-inputs `(("glproto" ,glproto) @@ -281,7 +284,7 @@ (define-public mesa ;; Without floating point texture support, drivers such as Nouveau ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+. "--enable-texture-float" - + ;; Also enable the tests. "--enable-gallium-tests" @@ -301,7 +304,8 @@ (define-public mesa (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py" (("/usr/bin/env bash") (which "bash"))) (substitute* "src/intel/genxml/gen_pack_header.py" - (("/usr/bin/env python2") (which "python"))))) + (("/usr/bin/env python2") (which "python"))) + #t)) (add-before 'build 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) @@ -325,8 +329,9 @@ (define-public mesa ;; it's never installed since Mesa removed its ;; egl_gallium support. (("\"gbm_dri\\.so") - (string-append "\"" out "/lib/dri/gbm_dri.so"))))))))) - (home-page "http://mesa3d.org/") + (string-append "\"" out "/lib/dri/gbm_dri.so"))) + #t)))))) + (home-page "https://mesa3d.org/") (synopsis "OpenGL implementation") (description "Mesa is a free implementation of the OpenGL specification - a system for rendering interactive 3D graphics. A variety of device drivers diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/packages/patches/mesa-skip-disk-cache-test.patch new file mode 100644 index 0000000000..4377110475 --- /dev/null +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch @@ -0,0 +1,20 @@ +disk_cache_create() here looks up the users home directory from +which resolves to "/" in the build environment. I could not find an easy +way to set the home directory to something else, so we disable this test +for now. + +--- a/src/compiler/glsl/tests/cache_test.c ++++ b/src/compiler/glsl/tests/cache_test.c +@@ -137,11 +137,6 @@ + unsetenv("MESA_GLSL_CACHE_DIR"); + unsetenv("XDG_CACHE_HOME"); + +- cache = disk_cache_create(); +- expect_non_null(cache, "disk_cache_create with no environment variables"); +- +- disk_cache_destroy(cache); +- + /* Test with XDG_CACHE_HOME set */ + setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); + cache = disk_cache_create(); + From 40522a7e89bc169233ec724592c9439e8004f4ad Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 17 Apr 2017 21:25:17 -0400 Subject: [PATCH 14/18] gnu: gtk+: Update to 3.22.12. * gnu/packages/gtk.scm (gtk+): Update 3.22.12. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 075273fdc9..8f7a027d84 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -651,7 +651,7 @@ (define-public gtk+ (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.22.6") + (version "3.22.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -659,7 +659,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "0bqpx8825b1fdjmz14wq20zq58gq1yi1p5xjps8l6zqid8hmm9zb")) + "1359w81sxs2izkan2rni985x78s6zr1arf469qmyw4bazg7f1yl4")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) From fbdd3526a1cab61602da1fcbfbc3ff02d99b23fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Apr 2017 17:52:21 +0200 Subject: [PATCH 15/18] gnu: libsndfile: Fix build failure on armhf. * gnu/packages/patches/libsndfile-armhf-type-checks.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pulseaudio.scm (libsndfile)[source]: Use it. --- gnu/local.mk | 1 + .../libsndfile-armhf-type-checks.patch | 42 +++++++++++++++++++ gnu/packages/pulseaudio.scm | 1 + 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/libsndfile-armhf-type-checks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 552dd05498..e6dee58397 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -710,6 +710,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ diff --git a/gnu/packages/patches/libsndfile-armhf-type-checks.patch b/gnu/packages/patches/libsndfile-armhf-type-checks.patch new file mode 100644 index 0000000000..7e0c71c3f6 --- /dev/null +++ b/gnu/packages/patches/libsndfile-armhf-type-checks.patch @@ -0,0 +1,42 @@ +This is a regression in 1.0.28 that causes a test failure on armhf. + +Upstream bug URL: + +https://github.com/erikd/libsndfile/issues/229 + +Patch copied from upstream source repository: + +https://github.com/erikd/libsndfile/commit/9d470ee5577d3ccedb1c28c7e0a7295ba17feaf5 + +From 9d470ee5577d3ccedb1c28c7e0a7295ba17feaf5 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Sun, 16 Apr 2017 17:54:17 +1000 +Subject: [PATCH] src/rf64.c: Fix varargs related bug + +C's functionality isn't type checked so that passing an +`sf_count_t` (64 bits) by mistake in place of a `unit32_t` can cause +errors. This would be fine if it was an error on every architecture +and platform, but its not. This particular problem only manifested +on armhf and some other Arm architectures. It was not an issue on +32 bit x86. + +I have now fixed variants of this same bug several times. + +Closes: https://github.com/erikd/libsndfile/issues/229 +--- + src/rf64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rf64.c b/src/rf64.c +index b3d637f..02dd904 100644 +--- a/src/rf64.c ++++ b/src/rf64.c +@@ -742,7 +742,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) + + pad_size = psf->dataoffset - 16 - psf->header.indx ; + if (pad_size >= 0) +- psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ; ++ psf_binheader_writef (psf, "m4z", PAD_MARKER, (unsigned int) pad_size, make_size_t (pad_size)) ; + + if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES)) + psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ; diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index cd796525c0..8231ce07ec 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -50,6 +50,7 @@ (define-public libsndfile (method url-fetch) (uri (string-append "http://www.mega-nerd.com/libsndfile/files/libsndfile-" version ".tar.gz")) + (patches (search-patches "libsndfile-armhf-type-checks.patch")) (sha256 (base32 "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))) From 165d45540a879c4b1d8b8aeb5a3c79bda91b7641 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 18 Apr 2017 20:35:08 -0400 Subject: [PATCH 16/18] gnu: mesa: Fix build for 32-bit systems. * gnu/packages/patches/mesa-fix-32bit-test-failures.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gl.scm (mesa)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 3 +- .../mesa-fix-32bit-test-failures.patch | 58 +++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mesa-fix-32bit-test-failures.patch diff --git a/gnu/local.mk b/gnu/local.mk index e6dee58397..265157a319 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -776,6 +776,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/mesa-fix-32bit-test-failures.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \ %D%/packages/patches/metabat-remove-compilation-date.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f43f464390..40b756394e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,8 @@ (define-public mesa (base32 "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j")) (patches - (search-patches "mesa-wayland-egl-symbols-check-mips.patch" + (search-patches "mesa-fix-32bit-test-failures.patch" + "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) (propagated-inputs diff --git a/gnu/packages/patches/mesa-fix-32bit-test-failures.patch b/gnu/packages/patches/mesa-fix-32bit-test-failures.patch new file mode 100644 index 0000000000..e21e87cef6 --- /dev/null +++ b/gnu/packages/patches/mesa-fix-32bit-test-failures.patch @@ -0,0 +1,58 @@ +Fix a test failure when building for 32 bit architectures: + +http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00381.html + +Patch copied from upstream source repository: + +https://cgit.freedesktop.org/mesa/mesa/commit/?id=61bbb25a080e48a8ca897ba7f6e73cc6a8e9b5b8 + +From 61bbb25a080e48a8ca897ba7f6e73cc6a8e9b5b8 Mon Sep 17 00:00:00 2001 +From: Grazvydas Ignotas +Date: Thu, 9 Mar 2017 02:54:53 +0200 +Subject: [PATCH] util/disk_cache: fix size subtraction on 32bit + +Negating size_t on 32bit produces a 32bit result. This was effectively +adding values close to UINT_MAX to the cache size (the files are usually +small) instead of intended subtraction. +Fixes 'make check' disk_cache failures on 32bit. + +Signed-off-by: Grazvydas Ignotas +Reviewed-by: Timothy Arceri +--- + src/util/disk_cache.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c +index 5470688df3..facdcecf7c 100644 +--- a/src/util/disk_cache.c ++++ b/src/util/disk_cache.c +@@ -603,7 +603,7 @@ evict_random_item(struct disk_cache *cache) + free(dir_path); + + if (size) { +- p_atomic_add(cache->size, - size); ++ p_atomic_add(cache->size, - (uint64_t)size); + return; + } + +@@ -624,7 +624,7 @@ evict_random_item(struct disk_cache *cache) + free(dir_path); + + if (size) +- p_atomic_add(cache->size, - size); ++ p_atomic_add(cache->size, - (uint64_t)size); + } + + void +#@@ -646,7 +646,7 @@ disk_cache_remove(struct disk_cache *cache, const cache_key key) +# free(filename); +# +# if (sb.st_size) +#- p_atomic_add(cache->size, - sb.st_size); +#+ p_atomic_add(cache->size, - (uint64_t)sb.st_size); +# } +# +# /* From the zlib docs: +-- +2.12.2 + From 0802f3a034815576bf0e28c59c968400566b418b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Apr 2017 16:05:31 +0200 Subject: [PATCH 17/18] gnu: libsamplerate: Correct license after 0.1.9 update. This is a followup to e1f68c96685fd607fcf00f08edd2f9cdfafabe2e. * gnu/packages/pulseaudio.scm (libsamplerate)[license]: Change GPL2+ to BSD-2. --- gnu/packages/pulseaudio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8231ce07ec..c52f265cc1 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -112,7 +112,7 @@ (define-public libsamplerate signal-to-noise ratio of 145dB with -3dB passband extending from DC to 96% of the theoretical best bandwidth for a given pair of input and output sample rates.") - (license l:gpl2+))) + (license l:bsd-2))) (define-public pulseaudio (package From 803067939718be1c17a40fa33a75eb65a3cece2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Apr 2017 00:49:50 +0200 Subject: [PATCH 18/18] gnu: xorg-server@1.19.3: Correct hash. This hash got reset back to 1.19.2 when 1f49cd546ec was merged (1524851f58d). * gnu/packages/xorg.scm (xorg-server-1.19.3)[source]: Update sha256 checksum. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b9589dc8f3..3c9195b1bf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5122,7 +5122,7 @@ (define-public xorg-server-1.19.3 name "-" version ".tar.bz2")) (sha256 (base32 - "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"))))))) + "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"))))))) (define-public xorg-server-xwayland (package