Arch Linux User Repository

Compiling a dependency on a missing git package results in an error when compiling the latest version. The extra build test from devtool is used.

# Maintainer: Anatol Pomozov
# Co-Maintainer: Abdelhak Bougouffa <abougouffa@fedoraproject.org>
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>

pkgname=dsview-git
pkgver=1.3.2.r24.g831fbe54
pkgrel=1
pkgdesc='GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.'
arch=(i686 x86_64)
url='http://www.dreamsourcelab.com/'
license=(GPL-3.0-only)
# Upstream added VCS dependency to libsigrokdecode :/
depends=(
  boost-libs
  hicolor-icon-theme
  libusb
  qt6-base
  fftw
  python)
makedepends=(boost
  cmake
  git
  qt6-tools
  ninja)
source=("${pkgname}::git+https://github.com/DreamSourceLab/DSView") #branch=develop
sha1sums=('SKIP')

pkgver() {
  cd "${srcdir}/${pkgname}"
  (
    set -o pipefail
    git describe --long --tag --abbrev=7 2>/dev/null | sed 's/^v//g;s/\([^-]*-g\)/r\1/;s/-/./g' ||
      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
  )
}

prepare() {
  git -C "${srcdir}/${pkgname}" clean -dfx
  cd "${srcdir}"/${pkgname}/
  sed -i 's#MODE="0666"#TAG+="uaccess"#' DSView/DreamSourceLab.rules

}

build() {
  cd "${srcdir}"/${pkgname}/
  # see：https://wiki.archlinux.org/title/CMake_package_guidelines
  cmake -DCMAKE_BUILD_TYPE=None \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_INSTALL_LIBDIR=lib \
    -DCMAKE_INSTALL_LIBEXECDIR=lib \
    -Wno-dev \
    -B build \
    -G Ninja

  ninja -C build
}

check() {
  cd "${srcdir}"/${pkgname}/
  ctest --test-dir build --output-on-failure
}

package() {
  DESTDIR="${pkgdir}" ninja -C "${srcdir}"/${pkgname}/build install
}

Thanks @anatolik

abougouffa, I added you as a com-maintainer. Please feel free to make the changes to the packages.

Hello,

First, as of this year, the git packages need to have git+https://REPO, the old git://REPO do not work anymore.

The package needs an update, as of commit DSView@7b94e61be the libsigrok4dsl-git and libsigrokdecode4dsl-git cannot be compiled (they deleted autogen.sh and Make related files), it seems that they updated the CMake files to search for these components in the project root.

This patch seems to work with the current version, it is a single package setting which will install related libsigrokdecode4dsl stuff.

diff --git a/PKGBUILD b/PKGBUILD
index c18df98..c5c3be6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 # Contributor: Thomas Krug <t.krug@elektronenpumpe.de>

 pkgname=dsview-git
-pkgver=1.12.r81.ga80c82d
+pkgver=1.12.r300.g0747624
 pkgrel=1
 pkgdesc='GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.'
 arch=(i686 x86_64)
 url='http://www.dreamsourcelab.com/'
 license=(GPL3)
 # Upstream added VCS dependency to libsigrokdecode :/
-depends=(boost-libs qt5-base fftw libsigrok4dsl-git libsigrokdecode4dsl-git)
+depends=(boost-libs qt5-base fftw)
 makedepends=(boost cmake)
-source=(git://github.com/DreamSourceLab/DSView) #branch=develop
+source=(git+https://github.com/DreamSourceLab/DSView) #branch=develop
 sha1sums=('SKIP')

 pkgver() {
@@ -20,20 +20,20 @@ pkgver() {
 }

 prepare() {
-  cd DSView/DSView
-  sed 's|/usr/local/|/usr/|' -i DSView.desktop
+  cd DSView
+  sed 's|/usr/local/|/usr/|' -i DSView/DSView.desktop
   sed 's| /lib/udev/rules.d| /usr/lib/udev/rules.d|' -i CMakeLists.txt
 }

 build() {
-  cd DSView/DSView
+  cd DSView

   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }

 package() {
-  cd DSView/DSView
+  cd DSView

   make DESTDIR="$pkgdir" install
   #install -Dm644 icons/logo_color.png "$pkgdir/usr/share/pixmaps/dsview.png"

dsview development practices are one of the most confusing I've ever seen.

It appears that someone working on this project is using dev-tai as their development branch, which contains bugfixes and new features, could we switch the upstream branch to this? The current master branch causes crashes due to an libusb bug, which was fixed in (https://github.com/DreamSourceLab/DSView/issues/473#issuecomment-1041362934)

Package builds successfully, but ends with error:

srd: Failed to load decoder ir_sirc: import by name failed:ImportError:cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py).
srd: Traceback (most recent call last):
  File "/usr/share/libsigrokdecode4DSL/decoders/ir_sirc/__init__.py", line 26, in <module>
    from .pd import Decoder
  File "/usr/share/libsigrokdecode4DSL/decoders/ir_sirc/pd.py", line 20, in <module>
    from common.srdhelper import bitpack_lsb
ImportError: cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py)

srd: Failed to load decoder sle44xx: import by name failed:ImportError:cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py).
srd: Traceback (most recent call last):
  File "/usr/share/libsigrokdecode4DSL/decoders/sle44xx/__init__.py", line 26, in <module>
    from .pd import Decoder
  File "/usr/share/libsigrokdecode4DSL/decoders/sle44xx/pd.py", line 20, in <module>
    from common.srdhelper import bitpack_lsb
ImportError: cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py)

srd: Failed to load decoder ir_sirc: import by name failed:ImportError:cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py).
srd: Traceback (most recent call last):
  File "/usr/share/libsigrokdecode4DSL/decoders/ir_sirc/__init__.py", line 26, in <module>
    from .pd import Decoder
  File "/usr/share/libsigrokdecode4DSL/decoders/ir_sirc/pd.py", line 20, in <module>
    from common.srdhelper import bitpack_lsb
ImportError: cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py)

srd: Failed to load decoder sle44xx: import by name failed:ImportError:cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py).
srd: Traceback (most recent call last):
  File "/usr/share/libsigrokdecode4DSL/decoders/sle44xx/__init__.py", line 26, in <module>
    from .pd import Decoder
  File "/usr/share/libsigrokdecode4DSL/decoders/sle44xx/pd.py", line 20, in <module>
    from common.srdhelper import bitpack_lsb
ImportError: cannot import name 'bitpack_lsb' from 'common.srdhelper' (/usr/share/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py)

Segmentation fault (core dumped)

Added issue to upstream project.

FuzzyCheese, could you please send your finding to the upstream project?

Hangs on my Arch system and on a fresh Antergos install but works on Ubuntu fresh install. Symptom: Stays at 100% completion and UI is frozen and must be killed when used with DSLogic hardware. Crude fix: Comment out libusb event handling in receive_data function in libsigrok4DSL/hardware/DSL/dslogic.c around line 2365. --- a/DSView-master/libsigrok4DSL/hardware/DSL/dslogic.c +++ b/DSView-master/libsigrok4DSL/hardware/DSL/dslogic.c @@ -2380,11 +2380,11 @@ usb = sdi->conn; tv.tv_sec = tv.tv_usec = 0; - libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv, &completed); +//fix libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv, &completed); if (devc->status == DSL_FINISH) { - if (libusb_try_lock_events(drvc->sr_ctx->libusb_ctx) == 0) { - if (libusb_event_handling_ok(drvc->sr_ctx->libusb_ctx)) { +//fix if (libusb_try_lock_events(drvc->sr_ctx->libusb_ctx) == 0) { +//fix if (libusb_event_handling_ok(drvc->sr_ctx->libusb_ctx)) { /* Stop GPIF acquisition */ usb = ((struct sr_dev_inst *)devc->cb_data)->conn; if ((ret = command_stop_acquisition (usb->devhdl)) != SR_OK) @@ -2393,9 +2393,9 @@ sr_info("%s: Sent acquisition stop command!", __func__); remove_sources(devc); - } - libusb_unlock_events(drvc->sr_ctx->libusb_ctx); - } +//fix } +//fix libusb_unlock_events(drvc->sr_ctx->libusb_ctx); +//fix } } return TRUE; Details: The hang occurs because of libusb event handling with multiple threads.?.? The following line(113) in libsigrok4DSL/hardware/command.c does not return at the end of final transfer: ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000, 0x0000, (unsigned char *)&cmd, sizeof(cmd), 3000); Used "export LIBUSB_DEBUG=4" to turn on libusb debug and "DSView -l 5" for application logging and it looks like the event is returned to another thread causing the current thread to wait on line 113. Log(trimmed): sr: finish_acquisition: send SR_DF_END packet sr: session: bus: Received SR_DF_END packet. [ 3.219458] [000042bf] libusb: debug [libusb_alloc_transfer] transfer 0x7f94fc000ed0 [ 3.219463] [000042bf] libusb: debug [libusb_submit_transfer] transfer 0x7f94fc000ed0 [ 3.219466] [000042bf] libusb: debug [add_to_flying_list] arm timerfd for timeout in 3000ms (first in line) [ 3.219491] [000042bf] libusb: debug [libusb_handle_events_timeout_completed] another thread is doing event handling ...repeats many times.... [ 6.298252] [000042be] libusb: debug [libusb_handle_events_timeout_completed] another thread is doing event handling [ 6.298330] [000042be] libusb: debug [libusb_cancel_transfer] transfer 0x7f94fc000ed0 [ 6.298338] [000042be] libusb: debug [discard_urbs] URB not found --> assuming ready to be reaped [ 6.298347] [000042be] libusb: debug [libusb_cancel_transfer] cancel transfer failed error -5 [ 6.298357] [000042be] libusb: warning [handle_timeout] async cancel failed -5 errno=22 [ 6.398431] [000042be] libusb: debug [libusb_handle_events_timeout_completed] another thread is doing event handling