summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatol Pomozov2015-06-19 18:48:33 -0700
committerAnatol Pomozov2015-06-21 05:48:58 -0700
commite913f44dcb6c1c0f20a13a1ebf067ba80284c62e (patch)
treed7f09049ebe9cc88b090ccb99d0341dceb52728c
parentc4c39767cf54ccbe81434e28d8f03496df8799e3 (diff)
downloadaur-e913f44dcb6c1c0f20a13a1ebf067ba80284c62e.tar.gz
DSView does not need root now
-rw-r--r--.SRCINFO6
-rw-r--r--0002-Instead-of-polluting-bin-use-usr-share-path-for-reso.patch2
-rw-r--r--PKGBUILD8
-rw-r--r--udev.rules12
4 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d2c97a718c..e164c71b827 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dsview-git
pkgdesc = GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.
- pkgver = 0.3.r54.g71d0f5a
+ pkgver = 0.93.r1.g71d0f5a
pkgrel = 1
url = http://www.dreamsourcelab.com/
install = dsview.install
@@ -20,8 +20,8 @@ pkgbase = dsview-git
source = dsview.desktop
md5sums = SKIP
md5sums = 1e65dd1e0a3154296f37429ff2f6e817
- md5sums = ee5cc08bff5f6a23ef4ba5fdfbf956a1
- md5sums = af6d97ba0fbea628e320bdb4b469b766
+ md5sums = da765c96fbe56910e32755995ec3616a
+ md5sums = 9a0a3d388369283019d7f0efa8d0c8a6
md5sums = 095886809795b40d663bfe4b79395811
pkgname = dsview-git
diff --git a/0002-Instead-of-polluting-bin-use-usr-share-path-for-reso.patch b/0002-Instead-of-polluting-bin-use-usr-share-path-for-reso.patch
index e7dacdfc858..037c7e9ff92 100644
--- a/0002-Instead-of-polluting-bin-use-usr-share-path-for-reso.patch
+++ b/0002-Instead-of-polluting-bin-use-usr-share-path-for-reso.patch
@@ -50,7 +50,7 @@ index e4a2b6e..b94cbf3 100644
strcpy(config_path, str.c_str());
+ */
+ // dirty
-+ strcpy(config_path, "/usr/share/dslogic/");
++ strcpy(config_path, "/usr/share/dsview/");
}
// Do the scan
diff --git a/PKGBUILD b/PKGBUILD
index d8c196cdff0..93d6ecfc3f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
pkgname=dsview-git
-pkgver=0.3.r54.g71d0f5a
+pkgver=0.93.r1.g71d0f5a
pkgrel=1
pkgdesc='GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.'
arch=(i686 x86_64)
@@ -17,8 +17,8 @@ source=(git://github.com/DreamSourceLab/DSView
dsview.desktop)
md5sums=('SKIP'
'1e65dd1e0a3154296f37429ff2f6e817'
- 'ee5cc08bff5f6a23ef4ba5fdfbf956a1'
- 'af6d97ba0fbea628e320bdb4b469b766'
+ 'da765c96fbe56910e32755995ec3616a'
+ '9a0a3d388369283019d7f0efa8d0c8a6'
'095886809795b40d663bfe4b79395811')
install=dsview.install
@@ -37,6 +37,8 @@ build() {
cd "$srcdir/DSView/DSView"
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_SKIP_RPATH=1 .
+
+ # for f in $(find . -type f -name "*.png"); do echo "Processing $f ..."; convert $f -strip $f; done
make
}
diff --git a/udev.rules b/udev.rules
index 443a1a99a83..139515b770b 100644
--- a/udev.rules
+++ b/udev.rules
@@ -1,6 +1,8 @@
-## DSLogic
-# 2a0e:0001
-ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0001", ENV{ID_MM_DEVICE_IGNORE}="1"
-ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0001", ENV{MTP_NO_PROBE}="1"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0001", GROUP="plugdev", MODE="0660"
+## DSLogic udev rules
+ATTR{idVendor}!="2a0e", GOTO="not_DreamStudio"
+# Logic analyzer
+ATTR{idProduct}=="0001", SYMLINK+="dslogic", MODE="0660", GROUP="plugdev", TAG+="uaccess"
+# Oscilloscope
+ATTR{idProduct}=="0002", SYMLINK+="dslogic_scope", MODE="0660", GROUP="plugdev", TAG+="uaccess"
+LABEL="not_DreamStudio"