summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2017-01-16 17:25:37 +0100
committerChristopher Reimer2017-01-16 17:25:37 +0100
commitaccc4017e4354b698cf9874197d84e1e2b724ba3 (patch)
treeb1a1a9790f7ab7348e9d141d790dcb12a35b9e61
parent5fd544f4f33c294228f34e8355dcd4d800a7878d (diff)
downloadaur-accc4017e4354b698cf9874197d84e1e2b724ba3.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/8deb19ecca39597444a1be5bd8341f2ba8003286)
-rw-r--r--.SRCINFO6
-rw-r--r--99-serdisplib.rules2
-rw-r--r--PKGBUILD4
-rw-r--r--libusb_fix.diff22
4 files changed, 18 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9820bee3fa..9bd76afe8eb 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 1550166e2d9..e2737c0fcd8 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 02a64b2f713..2c027711227 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 475d00b0126..3d13f1925bb 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;
+ }