Got rid of internal libevdi and use external one for now in hopes of making this package easier to maintain.

4 files changed, 31 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7204c1bc4b7..745ee3ee92c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 # Generated by mksrcinfo v8
-# Thu May 19 07:49:00 UTC 2016
+# Fri Sep 16 08:34:15 UTC 2016
 pkgbase = displaylink
-	pkgdesc = DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux
+	pkgdesc = Linux driver for DL-5xxx, DL-41xx and DL-3x00
 	pkgver = 1.1.62
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.displaylink.com/downloads/ubuntu.php
-	install = displaylink.install
 	changelog = release-note.txt
 	arch = i686
 	arch = x86_64
 	license = custom
 	license = GPL2
 	license = LGPL2.1
-	depends = dkms
+	depends = evdi
+	depends = ldconfig
+	depends = grep
+	depends = awk
 	source = displaylink-driver-1.1.62.zip::http://www.displaylink.com/downloads/file?id=607
 	source = 99-displaylink.rules
 	source = displaylink.service
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ed7b9c3d775a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.swp
+*.tar.gz
+*.tar.xz
+*.zip
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 990d20226a2e..e5c14e8dcf60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,22 @@
 # Maintainer: PlusMinus
+# Contributor: rhabbachi
 
 pkgname=displaylink
 pkgver=1.1.62
-pkgrel=2
-pkgdesc="DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"
+pkgrel=3
+pkgdesc="Linux driver for DL-5xxx, DL-41xx and DL-3x00"
 arch=('i686' 'x86_64')
 url="http://www.displaylink.com/downloads/ubuntu.php"
 license=('custom' 'GPL2' 'LGPL2.1')
-depends=('dkms')
-install=${pkgname}.install
+depends=('evdi' 'glibc' 'grep' 'gawk')
+install=
 changelog="release-note.txt"
 source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file\?id\=607
-        99-displaylink.rules displaylink.service 
+        99-displaylink.rules 
+	displaylink.service 
         displaylink-sleep.sh)
+
+# Update with > updpkgsums
 md5sums=('85879b750b26c464bd0f564fb76f398f'
          '37e076a16be49985f1d6800f960d16b4'
          'c141a15e973481c7d961f8e135627ca4'
@@ -25,21 +29,17 @@ package() {
   echo "Installing DLM systemd service"
   install -D -m644 displaylink.service "$pkgdir/usr/lib/systemd/system/displaylink.service"
   install -D -m755 displaylink-sleep.sh "$pkgdir/usr/lib/systemd/system-sleep/displaylink.sh"
+  
+  COREDIR="$pkgdir/usr/lib/displaylink"
+  install -d -m755 $COREDIR
+  install -d -m750 "$pkgdir/var/log/displaylink"
 
   echo "Extracting DisplayLink Driver Package"
+  cd $srcdir
   chmod +x displaylink-driver-$pkgver.run
   ./displaylink-driver-$pkgver.run --target $pkgname-$pkgver --noexec
   cd "$pkgname-$pkgver"
   
-  COREDIR="$pkgdir/usr/lib/displaylink"
-  install -d -m755 $COREDIR
-  install -d -m750 "$pkgdir/var/log/displaylink"
-  
-  echo "Configuring EVDI DKMS module"
-  SRCDIR="$pkgdir/usr/src/evdi-$pkgver"
-  mkdir -p $SRCDIR
-  tar xf evdi-$pkgver-src.tar.gz -C $SRCDIR
-
   if [ "$CARCH" == "i686" ]; then
     ARCH="x86"
   elif [ "$CARCH" == "x86_64" ]; then
@@ -49,7 +49,10 @@ package() {
   install -D -m755 $ARCH/DisplayLinkManager $COREDIR/DisplayLinkManager
 
   echo "Installing libraries"
-  install -D -m755 $ARCH/libevdi.so $COREDIR/libevdi.so
+  ln -s $(ldconfig -p | grep libevdi | awk '{print $4}') $COREDIR/libevdi.so
+  
+  # This is using the libusb that is shipping with the displaylink archive.
+  # Maybe we could get rid of this  
   install -D -m755 $ARCH/libusb-1.0.so.0.1.0 $COREDIR/libusb-1.0.so.0.1.0
 
   ln -s /usr/lib/displaylink/libusb-1.0.so.0.1.0 $COREDIR/libusb-1.0.so.0
@@ -61,4 +64,3 @@ package() {
   echo "Installing license file"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
diff --git a/displaylink.install b/displaylink.install
deleted file mode 100644
index 082dbc17f60a..000000000000
--- a/displaylink.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# old version (without -$pkgrel): ${1%%-*}
-# new version (without -$pkgrel): ${2%%-*}
-
-post_install() {
-    dkms install evdi/${1%%-*}
-}
-
-pre_upgrade() {
-    pre_remove ${2%%-*}
-}
-
-post_upgrade() {
-    post_install ${1%%-*}
-}
-
-pre_remove() {
-    dkms remove evdi/${1%%-*} --all
-}