update to 1.2.0 (epoch=1)
dsview now includes a CMakeLists.txt that builds dsview, libsigrok4dsl, and libsigrokdecode4dsl in one shot, so this also drops the dependencies on those other libraries.
This commit is contained in:
Cody P Schafer
parent
96ff093cd6
commit
9918411b3b
5 changed files with 32 additions and 78 deletions
23
.SRCINFO
23
.SRCINFO
|
|
@ -1,27 +1,20 @@
|
|||
pkgbase = dsview
|
||||
pkgdesc = Client software that supports the DreamSourceLab logic analyzer
|
||||
pkgver = 1.12
|
||||
pkgrel = 3
|
||||
pkgver = 1.2.0
|
||||
pkgrel = 1
|
||||
epoch = 1
|
||||
url = http://www.dreamsourcelab.com/
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = GPL3
|
||||
makedepends = cmake
|
||||
makedepends = ninja
|
||||
makedepends = boost
|
||||
depends = boost-libs
|
||||
depends = hicolor-icon-theme
|
||||
depends = qt5-base
|
||||
depends = libsigrokdecode4dsl>=1.12
|
||||
depends = libsigrok4dsl>=1.12
|
||||
depends = fftw
|
||||
source = DSView-1.12.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.12.tar.gz
|
||||
source = qt5.15.patch::https://github.com/DreamSourceLab/DSView/commit/33e3d896a47e559de95b26b13121bef10827e88d.patch
|
||||
source = extern-c.patch::https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch
|
||||
source = udev.rules
|
||||
source = dsview.desktop
|
||||
sha384sums = 52b9fc2dbd9853f33140c2c528d1b31187a185f5869dd4e7700da1da872fec0d2d03732e4f194f487a287107c3e9b0e0
|
||||
sha384sums = e20413c49f636fccdd1d9e107e1aeb52e0c8e8d2d3eecc4cff6e5f239391d512909512a52af768dc44ec3837b7da363c
|
||||
sha384sums = d7ab026223bf7633a1c7cc1e03a6a15db942f956751547675423abea34223ae6e84973b8c1229e1e6a0b619fa665d568
|
||||
sha384sums = c8811523d8712b4cfd2ee10661a36e6ec4ade8fe62384f2cfec9f419a9a50d55cc14c64f944fc82623fdbd955bd63a28
|
||||
sha384sums = 6c47f8b81858cfccc96a0e18dd56dbb23c72baa165650d145898eea8d8f3493a9179f7c8c9afd651ed99e713c9106238
|
||||
depends = python
|
||||
source = DSView-1.2.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.0.tar.gz
|
||||
sha384sums = 076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530
|
||||
|
||||
pkgname = dsview
|
||||
|
|
|
|||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,8 +1,8 @@
|
|||
pkg/
|
||||
src/
|
||||
*.swp
|
||||
*.pkg.tar.xz
|
||||
*.tar.gz
|
||||
*.pkg.tar.*
|
||||
*.tar.*
|
||||
*.tar
|
||||
|
||||
DSView/
|
||||
|
|
|
|||
60
PKGBUILD
60
PKGBUILD
|
|
@ -2,62 +2,46 @@
|
|||
# Maintainer: Jake <aur@ja-ke.tech>
|
||||
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
|
||||
|
||||
# epoch 0: up to 1.11
|
||||
# epoch 1: 1.2.0
|
||||
epoch=1
|
||||
pkgname=dsview
|
||||
pkgver=1.12
|
||||
pkgrel=3
|
||||
pkgver=1.2.0
|
||||
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' "libsigrokdecode4dsl>=${pkgver}" "libsigrok4dsl>=${pkgver}" 'fftw')
|
||||
makedepends=('cmake' 'boost')
|
||||
depends=('hicolor-icon-theme' 'qt5-base' 'fftw' 'python')
|
||||
makedepends=('cmake' 'ninja' 'boost')
|
||||
|
||||
source=(
|
||||
"DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz"
|
||||
'qt5.15.patch::https://github.com/DreamSourceLab/DSView/commit/33e3d896a47e559de95b26b13121bef10827e88d.patch'
|
||||
'extern-c.patch::https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch'
|
||||
'udev.rules'
|
||||
'dsview.desktop'
|
||||
)
|
||||
sha384sums=('52b9fc2dbd9853f33140c2c528d1b31187a185f5869dd4e7700da1da872fec0d2d03732e4f194f487a287107c3e9b0e0'
|
||||
'e20413c49f636fccdd1d9e107e1aeb52e0c8e8d2d3eecc4cff6e5f239391d512909512a52af768dc44ec3837b7da363c'
|
||||
'd7ab026223bf7633a1c7cc1e03a6a15db942f956751547675423abea34223ae6e84973b8c1229e1e6a0b619fa665d568'
|
||||
'c8811523d8712b4cfd2ee10661a36e6ec4ade8fe62384f2cfec9f419a9a50d55cc14c64f944fc82623fdbd955bd63a28'
|
||||
'6c47f8b81858cfccc96a0e18dd56dbb23c72baa165650d145898eea8d8f3493a9179f7c8c9afd651ed99e713c9106238')
|
||||
|
||||
_wdir() {
|
||||
cd "$srcdir/DSView-$pkgver/DSView"
|
||||
}
|
||||
sha384sums=('076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/DSView-$pkgver"
|
||||
patch -Np1 < "$srcdir/qt5.15.patch"
|
||||
patch -Np1 < "$srcdir/extern-c.patch"
|
||||
|
||||
cd DSView
|
||||
sed -i 's#install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)##;
|
||||
s#install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)##;
|
||||
s#install(FILES DSView.desktop DESTINATION /usr/share/applications/)##' CMakeLists.txt
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_SKIP_RPATH=1 .
|
||||
sed -i 's#MODE="0666"#TAG+="uaccess"#' \
|
||||
"DSView-${pkgver}/DSView/DreamSourceLab.rules"
|
||||
}
|
||||
|
||||
build() {
|
||||
_wdir
|
||||
cmake .
|
||||
make
|
||||
cmake -B build -S "DSView-${pkgver}" \
|
||||
-GNinja \
|
||||
-DCMAKE_BUILD_TYPE='None' \
|
||||
-DCMAKE_INSTALL_PREFIX='/usr' \
|
||||
-Wno-dev
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
check() {
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
|
||||
package() {
|
||||
_wdir
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
|
||||
make DESTDIR="$pkgdir" PREFIX=/usr install
|
||||
|
||||
ln -s "/usr/bin/DSView" "${pkgdir}/usr/bin/${pkgname}"
|
||||
|
||||
install -Dm644 "$srcdir/dsview.desktop" "$pkgdir/usr/share/applications/dsview.desktop"
|
||||
install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/20-dsview.rules"
|
||||
|
||||
install -Dm644 icons/logo.svg "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.svg"
|
||||
ln -s "DSView" "${pkgdir}/usr/bin/${pkgname}"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Exec=DSView
|
||||
Name=DSView
|
||||
Icon=dsview
|
||||
Comment=GUI Program for DreamSourceLab USB-based Instruments
|
||||
Type=Application
|
||||
Categories=Development
|
||||
16
udev.rules
16
udev.rules
|
|
@ -1,16 +0,0 @@
|
|||
# DreamSourceLab DSLogic
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0001", TAG+="uaccess"
|
||||
# DreamSourceLab DSLogic Pro
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0003", TAG+="uaccess"
|
||||
# DreamSourceLab DScope
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0002", TAG+="uaccess"
|
||||
# DreamSourceLab DScope20
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0022", TAG+="uaccess"
|
||||
# DreamSourceLab DSLogic Plus
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0020", TAG+="uaccess"
|
||||
# DreamSourceLab DSLogic Basic
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0021", TAG+="uaccess"
|
||||
# DreamSourceLab DSLogic U3Pro16
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="002a", TAG+="uaccess"
|
||||
# DreamSourceLab DSLogic U3Pro32
|
||||
ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="002c", TAG+="uaccess"
|
||||
Loading…
Add table
Add a link
Reference in a new issue