diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | udev.rules | 9 |
3 files changed, 13 insertions, 19 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri Aug 12 08:53:12 UTC 2016 +# Fri Aug 12 16:34:43 UTC 2016 pkgbase = dsview-git pkgdesc = GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc. pkgver = 0.95.r40.g7665ade @@ -12,12 +12,11 @@ pkgbase = dsview-git makedepends = cmake depends = boost-libs depends = qt5-base + depends = fftw depends = libsigrok4dsl-git depends = libsigrokdecode4dsl-git source = git://github.com/DreamSourceLab/DSView#branch=develop - source = udev.rules sha1sums = SKIP - sha1sums = 50f23061fcd03e0aafdefb3b676f1846c036c856 pkgname = dsview-git @@ -9,18 +9,21 @@ arch=(i686 x86_64) url='http://www.dreamsourcelab.com/' license=(GPL3) # Upstream added VCS dependency to libsigrokdecode :/ -depends=(boost-libs qt5-base libsigrok4dsl-git libsigrokdecode4dsl-git) +depends=(boost-libs qt5-base fftw libsigrok4dsl-git libsigrokdecode4dsl-git) makedepends=(boost cmake) -source=(git://github.com/DreamSourceLab/DSView#branch=develop - udev.rules) -sha1sums=('SKIP' - '50f23061fcd03e0aafdefb3b676f1846c036c856') +source=(git://github.com/DreamSourceLab/DSView#branch=develop) +sha1sums=('SKIP') pkgver() { cd DSView git describe --long | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' } +prepare() { + cd DSView/DSView + sed 's|/usr/local/|/usr/|' -i DSView.desktop +} + build() { cd DSView/DSView @@ -33,6 +36,7 @@ package() { make DESTDIR="$pkgdir" install - install -Dm644 icons/logo_color.png "$pkgdir/usr/share/pixmaps/dsview.png" - install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/20-dsview.rules" + #install -Dm644 icons/logo_color.png "$pkgdir/usr/share/pixmaps/dsview.png" + install -Dm644 "$pkgdir/etc/udev/rules.d/DreamSourceLab.rules" "$pkgdir/usr/lib/udev/rules.d/DreamSourceLab.rules" + rm "$pkgdir/etc/udev/rules.d/DreamSourceLab.rules" } diff --git a/udev.rules b/udev.rules deleted file mode 100644 index cc9ff932f1e3..000000000000 --- a/udev.rules +++ /dev/null @@ -1,9 +0,0 @@ -## DSLogic udev rules - -ATTR{idVendor}!="2a0e", GOTO="not_DreamStudio" -# Logic analyzer -ATTR{idProduct}=="0001", SYMLINK+="dslogic", MODE="0660", GROUP="plugdev", TAG+="uaccess" -ATTR{idProduct}=="0003", SYMLINK+="dslogic", MODE="0660", GROUP="plugdev", TAG+="uaccess" -# Oscilloscope -ATTR{idProduct}=="0002", SYMLINK+="dslogic_scope", MODE="0660", GROUP="plugdev", TAG+="uaccess" -LABEL="not_DreamStudio" |