diff --git a/.SRCINFO b/.SRCINFO index b70077f..213e0f5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,27 +1,23 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.12 - pkgrel = 3 + pkgver = 1.3.2 + pkgrel = 2 + 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 + depends = libusb + source = DSView-1.3.2.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.2.tar.gz + source = 0001-strings.patch + sha384sums = afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed + sha384sums = 5a115bdebf0a0fd2db0ef79168d2f34f9a1e564bdfd4661db90afcaf380a05efc3073b9cbff89cfaee56c6c0ea98f3db pkgname = dsview diff --git a/.gitignore b/.gitignore index 071613b..39759df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ pkg/ src/ *.swp -*.pkg.tar.xz -*.tar.gz +*.pkg.tar.* +*.tar.* *.tar DSView/ diff --git a/0001-strings.patch b/0001-strings.patch new file mode 100644 index 0000000..eb311ac --- /dev/null +++ b/0001-strings.patch @@ -0,0 +1,45 @@ +commit 2018baf0e1add4f9971dd02271ee8e6773cebfac +Author: Lutz Freitag +Date: Wed May 22 21:29:54 2024 +0200 + + added missing includes and a define to compile it for recent machines + + I use arch btw + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d12bd0db..7b8cf57d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -668,6 +668,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) + ++ add_compile_definitions(_DEFAULT_SOURCE) ++ + if(IS_DIRECTORY /usr/lib/udev/rules.d) + install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) + elseif(IS_DIRECTORY /lib/udev/rules.d) +diff --git a/libsigrok4DSL/input/in_wav.c b/libsigrok4DSL/input/in_wav.c +index de16e513..7a130496 100644 +--- a/libsigrok4DSL/input/in_wav.c ++++ b/libsigrok4DSL/input/in_wav.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "../log.h" + #include + +diff --git a/libsigrok4DSL/strutil.c b/libsigrok4DSL/strutil.c +index 52cb01d8..6c02c6df 100644 +--- a/libsigrok4DSL/strutil.c ++++ b/libsigrok4DSL/strutil.c +@@ -21,6 +21,7 @@ + #include "libsigrok-internal.h" + #include + #include ++#include + #include + #include "log.h" + diff --git a/PKGBUILD b/PKGBUILD index 3d1b729..d8185da 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,62 +2,53 @@ # Maintainer: Jake # Contributor: Thomas Krug +# epoch 0: up to 1.11 +# epoch 1: 1.2.0 +epoch=1 pkgname=dsview -pkgver=1.12 +pkgver=1.3.2 pkgrel=3 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' 'libusb') +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' + "0001-strings.patch" ) -sha384sums=('52b9fc2dbd9853f33140c2c528d1b31187a185f5869dd4e7700da1da872fec0d2d03732e4f194f487a287107c3e9b0e0' - 'e20413c49f636fccdd1d9e107e1aeb52e0c8e8d2d3eecc4cff6e5f239391d512909512a52af768dc44ec3837b7da363c' - 'd7ab026223bf7633a1c7cc1e03a6a15db942f956751547675423abea34223ae6e84973b8c1229e1e6a0b619fa665d568' - 'c8811523d8712b4cfd2ee10661a36e6ec4ade8fe62384f2cfec9f419a9a50d55cc14c64f944fc82623fdbd955bd63a28' - '6c47f8b81858cfccc96a0e18dd56dbb23c72baa165650d145898eea8d8f3493a9179f7c8c9afd651ed99e713c9106238') - -_wdir() { - cd "$srcdir/DSView-$pkgver/DSView" -} +sha384sums=('afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed' + '5a115bdebf0a0fd2db0ef79168d2f34f9a1e564bdfd4661db90afcaf380a05efc3073b9cbff89cfaee56c6c0ea98f3db') 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" + + cd "DSView-${pkgver}" + # This patch is upstream 2018baf0e1add4f9971dd02271ee8e6773cebfac, should be removed with next release + patch --forward --strip=1 --input=../0001-strings.patch } build() { - _wdir - cmake . - make + cmake -B build -S "DSView-${pkgver}" \ + -GNinja \ + -DCMAKE_BUILD_TYPE='None' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -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: diff --git a/dsview.desktop b/dsview.desktop deleted file mode 100644 index 10cd630..0000000 --- a/dsview.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Exec=DSView -Name=DSView -Icon=dsview -Comment=GUI Program for DreamSourceLab USB-based Instruments -Type=Application -Categories=Development diff --git a/udev.rules b/udev.rules deleted file mode 100644 index 91fa0b1..0000000 --- a/udev.rules +++ /dev/null @@ -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"