autu: Update to 1.6.2.r12.g391f1f7-1

2 files changed, 28 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b5e2e03d79e..136a1533aaec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jul 23 20:32:51 UTC 2019
+# Thu Dec  5 04:32:35 UTC 2019
 pkgbase = evdi-git
 	pkgdesc = kernel module that enables management of multiple screens, primarily for DisplayLink USB VGA DVI HDMI DisplayPort video git version.
-	pkgver = 1.6.2.r2.g75536ec
+	pkgver = 1.6.2.r12.g391f1f7
 	pkgrel = 1
 	url = https://github.com/DisplayLink/evdi
 	install = evdi-git.install
@@ -16,11 +16,11 @@ pkgbase = evdi-git
 	provides = evdi=1.6.2
 	conflicts = evdi
 	source = git+https://github.com/DisplayLink/evdi/
-	source = relro.patch
+	source = https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch
 	md5sums = SKIP
-	md5sums = 05e64dd295a66c030139d0c8f6f7013b
+	md5sums = 7f6104e6e8df04574b2bf1f12d9a51ee
 	sha256sums = SKIP
-	sha256sums = ff03b5a804af826e6b0678cd4d821b5ecd2c5bf04ea7c465751f83b28e928786
+	sha256sums = 211f791455046c580277a86dfc129255268c033f87eee93bc0e72569f1df8aa8
 
 pkgname = evdi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 97f8d8a5d42b..31cae162c97d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 set -u
 pkgname='evdi-git'
-pkgver=1.6.2.r2.g75536ec
+pkgver=1.6.2.r12.g391f1f7
 _pkgver="${pkgver%%.r*}"
 pkgrel=1
 pkgdesc='kernel module that enables management of multiple screens, primarily for DisplayLink USB VGA DVI HDMI DisplayPort video'
@@ -22,12 +22,13 @@ changelog="${pkgname}.Changelog"
 _srcdir="${pkgname%-git}"
 source=(
   'git+https://github.com/DisplayLink/evdi/'
-  'relro.patch'
+  'https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch'
+  #'relro.patch'
 )
 md5sums=('SKIP'
-         '05e64dd295a66c030139d0c8f6f7013b')
+         '7f6104e6e8df04574b2bf1f12d9a51ee')
 sha256sums=('SKIP'
-            'ff03b5a804af826e6b0678cd4d821b5ecd2c5bf04ea7c465751f83b28e928786')
+            '211f791455046c580277a86dfc129255268c033f87eee93bc0e72569f1df8aa8')
 
 pkgver() {
   set -u
@@ -40,13 +41,16 @@ prepare() {
   set -u
   cd "${_srcdir}"
   local _src
-  for _src in "${source[@]}"; do
-    _src="${_src%%::*}"
+  for _src in "${source[@]%%::*}"; do
     _src="${_src##*/}"
     if [[ "${_src}" = *.patch ]]; then
+      set +u; msg2 "Patch ${_src}"; set -u
       patch -Np1 -i "../${_src}"
     fi
   done
+
+  # Fix build for kernel 5.4
+  sed -E -e 's:SUBDIRS=([^ ]+) :M=\1 &:g' -i 'module/Makefile'
   set +u
 }
 
@@ -63,7 +67,19 @@ build() {
 package() {
   set -u
   cd "${_srcdir}"
-  install -Dpm755 "library/lib${pkgname%-git}.so" -t "${pkgdir}/usr/lib/"
+  install -Dpm755 "library/lib${pkgname%-git}.so"* -t "${pkgdir}/usr/lib/"
+  pushd "${pkgdir}/usr/lib/" > /dev/null
+  local _libs=(*.so*)
+  if [ "${#_libs[@]}" -ne 1 ]; then
+    set +u
+    echo "Too many libs"
+    false
+  fi
+  _libs="${_libs[0]}"
+  local _libase="${_libs%.so*}.so"
+  ln -s "${_libs}" "${_libase}"
+  ln -s "${_libs}" "${_libase}.0" # bad soname
+  popd > /dev/null
 
   local _DKMS="${pkgdir}/usr/src/${pkgname%-git}-${_pkgver}"
   install -Dpm644 module/* -t "${_DKMS}/"