Merge branch 'master' into i486

10 files changed, 132 insertions, 53 deletions

diff --git a/extra/asp/PKGBUILD b/extra/asp/PKGBUILD
index 0b1c044f..0ff84047 100644
--- a/extra/asp/PKGBUILD
+++ b/extra/asp/PKGBUILD
@@ -1,21 +1,23 @@
 # we override almost everything
 
-pkgver=0.0
+pkgver=0.1
 pkgrel=1
 url='https://git.archlinux32.org/archlinux32/asp32/'
 license=(MIT)
-source=("https://sources.archlinux32.org/sources/${pkgname}32-v$pkgver.tar.gz"{,.sig})
-sha512sums=(
-  'eb51380220e47bfcb735ceae8c072c2a5798ccfb0a5f72a5c1d0788d6379a48b2197108c2ffad68c987c60412978929362969f4f7ea3fbd5916ec7e0f8d93f34'
-  'SKIP'
-)
+source=("https://sources.archlinux32.org/sources/${pkgname}32-$pkgver.tar.gz"{,.sig})
+sha512sums=('4e4a0e62a89e2b76f719823b269bd0895145ea5033abe4dec403e2b27f30b369edd28cbb2b10f1aea79ebdb71a8975d87dedce8cebae947e4aff62b8caba93d7'
+            'SKIP')
 validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
+unset md5sums
 unset sha256sums
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-       s/\('"${pkgname}"'\)-/\132-v/
+       /^\s*make /    s/-C asp/\032-$pkgver/
+       /^\s*install / {
+         s, asp\(/\S\+ .*/\)asp\(/\S\+$\), asp32-$pkgver\1asp32\2,
+       }
     '
 )"
diff --git a/extra/aspell/8089fa02122fed0a6394eba14bbedcb1d18e2384.patch b/extra/aspell/8089fa02122fed0a6394eba14bbedcb1d18e2384.patch
new file mode 100644
index 00000000..61ffabba
--- /dev/null
+++ b/extra/aspell/8089fa02122fed0a6394eba14bbedcb1d18e2384.patch
@@ -0,0 +1,37 @@
+From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Thu, 29 Dec 2016 00:50:31 -0500
+Subject: [PATCH] Compile Fixes for GCC 7.
+
+Closes #519.
+---
+ modules/filter/tex.cpp | 2 +-
+ prog/check_funs.cpp    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
+index a979539..19ab63c 100644
+--- a/modules/filter/tex.cpp
++++ b/modules/filter/tex.cpp
+@@ -174,7 +174,7 @@ namespace {
+ 
+     if (c == '{') {
+ 
+-      if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
++      if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
+ 	push_command(Parm);
+ 
+       top.in_what = Parm;
+diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
+index db54f3d..89ee09d 100644
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
+@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) {
+     }
+   }
+   if (i == width-1) {
+-    if (word == '\0')
++    if (*word == '\0')
+       put(out,' ');
+     else if (word[len] == '\0')
+       put(out, word, len);
diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
new file mode 100644
index 00000000..76302bd6
--- /dev/null
+++ b/extra/aspell/PKGBUILD
@@ -0,0 +1,9 @@
+# see https://github.com/GNUAspell/aspell/issues/519
+source+=('8089fa02122fed0a6394eba14bbedcb1d18e2384.patch')
+md5sums+=('5f81982bf5ba10d8f23e8086dfcca867')
+sha1sums+=('df5364a8472154452f4e1fe9db0891df457949e0')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/8089fa02122fed0a6394eba14bbedcb1d18e2384.patch"
+}
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 96976146..00924ef1 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 43d12d0306ae85803a356caabd0b384eb917c80e
+# upstream git revision: b77cb22b9c643c946fafe06d5c365e5a75543af1
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '8a852e70606513c77fc513d6ef970273345cc895d90e3f283ae103853bf50c41' ]; then
-    sha256sums[${i}]='0fa2c1eef3f46e1e0f22aa6a4da555cca6234bcd12c8aae84503ce5f6c178348'
+  if [ "${sha256sums[${i}]}" = '3dd1f340c20a43070bc14287521c28e2f818a9288419ceccb4e2eaa73bd3b848' ]; then
+    sha256sums[${i}]='92918d10d49271ae6d2ce6420240d9c167986ad4d5a8bf6be72392be2927b182'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index cc18ead9..4701f286 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.10-zen1 Kernel Configuration
+# Linux/x86 4.18.12-zen1 Kernel Configuration
 #
 
 #
@@ -3122,10 +3122,6 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
 CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
@@ -6635,11 +6631,11 @@ CONFIG_AC97_BUS=m
 #
 # HID support
 #
-CONFIG_HID=m
+CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_HID_GENERIC=y
 
 #
 # Special HID drivers
@@ -6750,25 +6746,19 @@ CONFIG_HID_ALPS=m
 #
 # USB HID support
 #
-CONFIG_USB_HID=m
+CONFIG_USB_HID=y
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 
 #
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
 # I2C HID support
 #
 CONFIG_I2C_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
+CONFIG_USB=y
 CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -6790,24 +6780,23 @@ CONFIG_USB_WUSB_CBAF=m
 # USB Host Controller Drivers
 #
 CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_FOTG210_HCD=m
 CONFIG_USB_MAX3421_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
@@ -6915,7 +6904,8 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y
 # USB port drivers
 #
 CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_AIRCABLE=m
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
new file mode 100644
index 00000000..7cf3826b
--- /dev/null
+++ b/extra/mono/PKGBUILD
@@ -0,0 +1,15 @@
+if [ "$CARCH" = 'i486' ]; then
+  # these atomics are unavailable on i486, but that is not detected (?)
+  eval "$(
+    declare -f prepare | \
+      sed '
+        /^}$/ i \
+          sed -i '"'"' \
+            /#define BROKEN_64BIT_ATOMICS_INTRINSIC 1/ { \
+              N \
+              s/\\(.*\\)\\n\\s*#endif/#endif\\n\\1/ \
+            } \
+          '"'"' mono/utils/atomic.h
+      '
+  )"
+fi
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
deleted file mode 100644
index 7364ef5d..00000000
--- a/extra/numactl/PKGBUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-source+=('numactl-2.0.11-minor-major.patch')
-sha256sums+=('952973eb92921a8510d75589c8e69eaace797750f8f011cc2117d482ce0c6367')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../numactl-2.0.11-minor-major.patch
-}
diff --git a/extra/numactl/numactl-2.0.11-minor-major.patch b/extra/numactl/numactl-2.0.11-minor-major.patch
deleted file mode 100644
index d95e5525..00000000
--- a/extra/numactl/numactl-2.0.11-minor-major.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rauN numactl-2.0.11/affinity.c numactl-2.0.11-minor-major-patch/affinity.c
---- numactl-2.0.11/affinity.c	2015-12-10 22:24:17.000000000 +0100
-+++ numactl-2.0.11-minor-major-patch/affinity.c	2018-09-26 18:17:54.138713285 +0200
-@@ -43,6 +43,7 @@
- #include <ctype.h>
- #include <assert.h>
- #include <regex.h>
-+#include <sys/sysmacros.h>
- #include "numa.h"
- #include "numaint.h"
- #include "sysfs.h"
diff --git a/extra/x265/0003-detect512-is-needed-on-all-architectures.patch b/extra/x265/0003-detect512-is-needed-on-all-architectures.patch
new file mode 100644
index 00000000..16aab240
--- /dev/null
+++ b/extra/x265/0003-detect512-is-needed-on-all-architectures.patch
@@ -0,0 +1,35 @@
+From: Adam Sampson <unknown@bitbucket>
+Date: Sun, 14 Oct 2018 14:04:18 +0200
+Subject: detect512 is needed on all architectures
+
+---
+ source/common/cpu.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp
+index 0681ff5..fa687da 100644
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -110,6 +110,11 @@ const cpu_name_t cpu_names[] =
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr);
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 70b20b4c..0dc3dc58 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -6,3 +6,12 @@ eval "$(
       s/cmake/cmake -DENABLE_ASSEMBLY=OFF/
     '
 )"
+# thanks, debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910963
+source+=('0003-detect512-is-needed-on-all-architectures.patch')
+sha256sum+=('+6baa25d11c81ad4ee49e9f2a367db4c770eb8cccf81f7bdaadb942621288a271')
+eval "$(
+  declare -f prepare | \
+    sed '
+      3 a patch -p1 -i "$srcdir/0003-detect512-is-needed-on-all-architectures.patch"
+    '
+)"