update to 0.98
This commit is contained in:
Cody P Schafer
parent
0c7a2c68d8
commit
0b1bdc72ee
3 changed files with 8 additions and 80 deletions
12
.SRCINFO
12
.SRCINFO
|
|
@ -1,8 +1,6 @@
|
|||
# Generated by mksrcinfo v8
|
||||
# Tue Feb 2 22:18:13 UTC 2016
|
||||
pkgbase = dsview
|
||||
pkgdesc = Client software that supports the DreamSourceLab logic analyzer
|
||||
pkgver = 0.95
|
||||
pkgver = 0.98
|
||||
pkgrel = 1
|
||||
url = http://www.dreamsourcelab.com/
|
||||
install = dsview.install
|
||||
|
|
@ -12,16 +10,12 @@ pkgbase = dsview
|
|||
makedepends = boost
|
||||
depends = boost-libs
|
||||
depends = qt5-base
|
||||
depends = libsigrok4dsl
|
||||
depends = libsigrokdecode
|
||||
conflicts = dslogic
|
||||
replaces = dslogic
|
||||
source = git+https://github.com/DreamSourceLab/DSView.git#tag=0.95
|
||||
source = path.patch
|
||||
depends = fftw
|
||||
source = git+https://github.com/DreamSourceLab/DSView.git#tag=0.98
|
||||
source = udev.rules
|
||||
source = dsview.desktop
|
||||
md5sums = SKIP
|
||||
md5sums = f2b000eb19883bc16bca716b5da78da3
|
||||
md5sums = af6d97ba0fbea628e320bdb4b469b766
|
||||
md5sums = 095886809795b40d663bfe4b79395811
|
||||
|
||||
|
|
|
|||
16
PKGBUILD
16
PKGBUILD
|
|
@ -1,38 +1,32 @@
|
|||
# Maintainer: Thomas Krug <t.krug@elektronenpumpe.de>
|
||||
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
|
||||
# Maintainer: Cody Schafer <aur@codyps.com>
|
||||
|
||||
pkgname=dsview
|
||||
pkgver=0.95
|
||||
pkgver=0.98
|
||||
pkgrel=1
|
||||
pkgdesc="Client software that supports the DreamSourceLab logic analyzer"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.dreamsourcelab.com/"
|
||||
license=('GPL3')
|
||||
depends=('boost-libs' 'qt5-base' 'libsigrok4dsl' 'libsigrokdecode')
|
||||
depends=('boost-libs' 'qt5-base' 'libsigrokdecode' 'fftw')
|
||||
makedepends=('boost')
|
||||
conflicts=('dslogic')
|
||||
replaces=('dslogic')
|
||||
source=("git+https://github.com/DreamSourceLab/DSView.git#tag=0.95"
|
||||
'path.patch'
|
||||
|
||||
source=("git+https://github.com/DreamSourceLab/DSView.git#tag=$pkgver"
|
||||
'udev.rules'
|
||||
'dsview.desktop')
|
||||
md5sums=('SKIP'
|
||||
'f2b000eb19883bc16bca716b5da78da3'
|
||||
'af6d97ba0fbea628e320bdb4b469b766'
|
||||
'095886809795b40d663bfe4b79395811')
|
||||
install=dsview.install
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/DSView/DSView"
|
||||
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_SKIP_RPATH=1 .
|
||||
|
||||
patch -Np1 -i "$srcdir/path.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/DSView/DSView"
|
||||
|
||||
cmake .
|
||||
make
|
||||
}
|
||||
|
|
|
|||
60
path.patch
60
path.patch
|
|
@ -1,60 +0,0 @@
|
|||
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2016-02-02 12:46:46.432763024 +0100
|
||||
+++ b/CMakeLists.txt 2016-02-02 12:51:42.589433577 +0100
|
||||
@@ -352,21 +352,21 @@
|
||||
|
||||
# Install the executable.
|
||||
install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
|
||||
-install(FILES res/DSLogic.fw DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic33.bin DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic50.bin DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogicPro.fw DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogicPro.bin DESTINATION bin/res/)
|
||||
-install(FILES res/DSCope.fw DESTINATION bin/res/)
|
||||
-install(FILES res/DSCope.bin DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic0.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic0.def.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic1.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic1.def.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic2.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSLogic2.def.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSCope1.dsc DESTINATION bin/res/)
|
||||
-install(FILES res/DSCope1.def.dsc DESTINATION bin/res/)
|
||||
+install(FILES res/DSLogic.fw DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic33.bin DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic50.bin DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogicPro.fw DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogicPro.bin DESTINATION share/dsview/)
|
||||
+install(FILES res/DSCope.fw DESTINATION share/dsview/)
|
||||
+install(FILES res/DSCope.bin DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic0.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic0.def.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic1.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic1.def.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic2.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSLogic2.def.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSCope1.dsc DESTINATION share/dsview/)
|
||||
+install(FILES res/DSCope1.def.dsc DESTINATION share/dsview/)
|
||||
|
||||
#===============================================================================
|
||||
#= Packaging (handled by CPack)
|
||||
diff -Naur a/pv/devicemanager.cpp b/pv/devicemanager.cpp
|
||||
--- a/pv/devicemanager.cpp 2016-02-02 12:46:46.439429691 +0100
|
||||
+++ b/pv/devicemanager.cpp 2016-02-02 12:53:09.256101381 +0100
|
||||
@@ -103,12 +103,16 @@
|
||||
|
||||
// Check If DSL hardware driver
|
||||
if (strncmp(driver->name, "virtual", 7)) {
|
||||
+ /*
|
||||
QDir dir(QCoreApplication::applicationDirPath());
|
||||
if (!dir.cd("res"))
|
||||
return driver_devices;
|
||||
QString str = dir.absolutePath() + "/";
|
||||
QString str_utf8 = QString::fromLocal8Bit(str.toLocal8Bit());
|
||||
strcpy(config_path, str_utf8.toUtf8().data());
|
||||
+ */
|
||||
+ // dirty
|
||||
+ strcpy(config_path, "/usr/share/dsview/");
|
||||
}
|
||||
|
||||
// Do the scan
|
||||
Loading…
Add table
Add a link
Reference in a new issue