Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/8deb19ecca39597444a1be5bd8341f2ba8003286)

4 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9820bee3fa0..9bd76afe8eb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.0.1
-# Wed Aug 17 16:24:17 UTC 2016
+# Mon Jan 16 16:25:36 UTC 2017
 pkgbase = serdisplib
 	pkgdesc = Library to drive displays with built-in controllers
 	pkgver = 1.97.9
-	pkgrel = 6
+	pkgrel = 7
 	url = http://serdisplib.sourceforge.net/
 	arch = x86_64
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = serdisplib
 	source = 99-serdisplib.rules
 	md5sums = 130552ec60d01e974712a60274f34de7
 	md5sums = 6661faa31c7bff7fe5138604dc9fd3b9
-	md5sums = f32b8a39b91b7badf14c22f189327803
+	md5sums = ee2c17141cec151a9acc68c56506f2d1
 
 pkgname = serdisplib
 
diff --git a/99-serdisplib.rules b/99-serdisplib.rules
index 1550166e2d9f..e2737c0fcd83 100644
--- a/99-serdisplib.rules
+++ b/99-serdisplib.rules
@@ -3,3 +3,5 @@
 #
 # SDC Megtron
 ATTRS{idVendor}=="152a", ATTRS{idProduct}=="8380", GROUP="uucp", MODE="0660"
+# Alphacool USB LCD
+ATTRS{idVendor}=="060c", ATTRS{idProduct}=="04eb", GROUP="uucp", MODE="0660"
diff --git a/PKGBUILD b/PKGBUILD
index 02a64b2f713a..2c0277112275 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=serdisplib
 pkgver=1.97.9
-pkgrel=6
+pkgrel=7
 pkgdesc="Library to drive displays with built-in controllers"
 url="http://serdisplib.sourceforge.net/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -14,7 +14,7 @@ source=("http://sourceforge.net/projects/serdisplib/files/serdisplib/$pkgver/$pk
         '99-serdisplib.rules')
 md5sums=('130552ec60d01e974712a60274f34de7'
          '6661faa31c7bff7fe5138604dc9fd3b9'
-         'f32b8a39b91b7badf14c22f189327803')
+         'ee2c17141cec151a9acc68c56506f2d1')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libusb_fix.diff b/libusb_fix.diff
index 475d00b01268..3d13f1925bbb 100644
--- a/libusb_fix.diff
+++ b/libusb_fix.diff
@@ -1,11 +1,11 @@
-Index: serdisplib/trunk/src/serdisp_connect_usb.c

-===================================================================

---- serdisplib/trunk/src/serdisp_connect_usb.c (revision 333)

-+++ serdisplib/trunk/src/serdisp_connect_usb.c (revision 335)

-@@ -1284,5 +1284,5 @@

-         }

-       }

--      if (!found) fp_usb_close(usb_dev);

-+      if (!found && usb_dev) fp_usb_close(usb_dev);

-      if (!found) dev = dev->next;

-     }

+Index: serdisplib/trunk/src/serdisp_connect_usb.c
+===================================================================
+--- serdisplib/trunk/src/serdisp_connect_usb.c (revision 333)
++++ serdisplib/trunk/src/serdisp_connect_usb.c (revision 335)
+@@ -1284,5 +1284,5 @@
+         }
+       }
+-      if (!found) fp_usb_close(usb_dev);
++      if (!found && usb_dev) fp_usb_close(usb_dev);
+      if (!found) dev = dev->next;
+     }