commit: 4cb4e00e5c20a16ed72bf8edbf33aa5c17dc9eab Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Mon Sep 15 10:41:24 2025 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Mon Sep 15 10:42:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb4e00e
media-radio/qsstv: add 9.5.11_pre20250212 CLOSES: https://bugs.gentoo.org/961633 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> media-radio/qsstv/Manifest | 1 + .../files/qsstv-9.5.11-drop-debug-output.patch | 31 ++++++++++++++ .../files/qsstv-9.5.11-fix-broken-DRM-decode.patch | 29 +++++++++++++ media-radio/qsstv/qsstv-9.5.11_pre20250212.ebuild | 50 ++++++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest index ac97b646a2d9..6c1108627296 100644 --- a/media-radio/qsstv/Manifest +++ b/media-radio/qsstv/Manifest @@ -1 +1,2 @@ +DIST qsstv-9.5.11_pre20250212.tgz 6470285 BLAKE2B f5118e4d63d194635c8e97339d1b7c782479ecfa70e94ab8d75c07c647a1a50369114877eef03858548aef0e430ceeca10a1670f4a908040c758722fffc6dac9 SHA512 8c36c749ddbb984aa5196d4eae0d04d6a540ba6405f660fa962f9abc52efc1ceaf096a4efbbd2825fe5349b5a47c324d9864249ce8f4aff999d79f0aaad2d340 DIST qsstv_9.5.8.tar.gz 7468561 BLAKE2B 8bf1fda987b44643d88bdb69f11e723f8fa34a9dac13314d57ecac14c683d219349f1f31081cfd2df69cc67f2a7e5467704a4b78dbad58dc93b51915f84a0c57 SHA512 88e1bb62e3838d94c670397fceced7913ac4675e7fea93d78c2b2799ef172c27baad9ac7f7d119eb1130296d21b641164cdd0f53a93967305f632fa9bb3b4e6a diff --git a/media-radio/qsstv/files/qsstv-9.5.11-drop-debug-output.patch b/media-radio/qsstv/files/qsstv-9.5.11-drop-debug-output.patch new file mode 100644 index 000000000000..ba89afcce086 --- /dev/null +++ b/media-radio/qsstv/files/qsstv-9.5.11-drop-debug-output.patch @@ -0,0 +1,31 @@ +From ed933c456ed859bb82a617f46c3f5fc7b740137c Mon Sep 17 00:00:00 2001 +From: Thomas Beierlein <[email protected]> +Date: Mon, 15 Sep 2025 07:11:34 +0200 +Subject: [PATCH] Drop annoying debug output + +Each polling of hamlib frequendy is surrounded by a 'getFreq' and a 'got +Freq' output on command line. +If needed it should be done by the general logging facility. +--- + src/rig/rigcontrol.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rig/rigcontrol.cpp b/rig/rigcontrol.cpp +index c006eec..0e41205 100644 +--- a/rig/rigcontrol.cpp ++++ b/rig/rigcontrol.cpp +@@ -152,9 +152,9 @@ bool rigControl::getFrequency(double &frequency) + retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &frequency); + for(int i=0;i<RIGCMDTRIES;i++) + { +- qDebug() << "getFreq"; ++// qDebug() << "getFreq"; + retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &frequency); +- qDebug() << "got Freq"; ++// qDebug() << "got Freq"; + if (retcode==RIG_OK) + { + return true; +-- +2.49.1 + diff --git a/media-radio/qsstv/files/qsstv-9.5.11-fix-broken-DRM-decode.patch b/media-radio/qsstv/files/qsstv-9.5.11-fix-broken-DRM-decode.patch new file mode 100644 index 000000000000..663625494c04 --- /dev/null +++ b/media-radio/qsstv/files/qsstv-9.5.11-fix-broken-DRM-decode.patch @@ -0,0 +1,29 @@ +From 659ef0c02068d76d82622875e413aa362407b677 Mon Sep 17 00:00:00 2001 +From: Thomas Beierlein <[email protected]> +Date: Mon, 15 Sep 2025 08:27:30 +0200 +Subject: [PATCH] Fix broken DRM decode + +Pick up start of currentDataPacket.ba not only once but after each +advance() operation. +Qt documentation states that an address of a QByteArray obtained by +ba.data() gets invalidaded by an remove() actioni (part of advance() ). +With Qt5 it seems to work by accident, but fails with Qt6. +--- + src/drmrx/sourcedecoder.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drmrx/sourcedecoder.cpp b/drmrx/sourcedecoder.cpp +index 1605d67..35039cc 100644 +--- a/drmrx/sourcedecoder.cpp ++++ b/drmrx/sourcedecoder.cpp +@@ -342,6 +342,7 @@ bool sourceDecoder::addHeaderSegment() + + while(currentDataPacket.ba.count()) + { ++ dataPtr=(unsigned char *)currentDataPacket.ba.data(); + PLI=dataPtr[0]>>6; + paramID=dataPtr[0]&0x3F; + switch (PLI) +-- +2.49.1 + diff --git a/media-radio/qsstv/qsstv-9.5.11_pre20250212.ebuild b/media-radio/qsstv/qsstv-9.5.11_pre20250212.ebuild new file mode 100644 index 000000000000..3e4ab65ec9f5 --- /dev/null +++ b/media-radio/qsstv/qsstv-9.5.11_pre20250212.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="Amateur radio SSTV software" +HOMEPAGE="http://users.telenet.be/on4qz/"; +SRC_URI="https://dev.gentoo.org/~tomjbe/distfiles/${P}.tgz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +CDEPEND="dev-qt/qtbase:6[gui,network,ssl,widgets,xml] + media-libs/hamlib:= + media-libs/openjpeg:2 + media-libs/alsa-lib + media-libs/libv4l + sci-libs/fftw:3.0= + || ( + media-libs/libpulse + media-sound/apulse[sdk] + )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + x11-misc/xdg-utils" + +PATCHES=( "${FILESDIR}/${PN}-9.5.11-fix-broken-DRM-decode.patch" + "${FILESDIR}/${PN}-9.5.11-drop-debug-output.patch" ) + +src_prepare() { + eapply "${PATCHES[@]}" + eapply_user + # fix docdirectory, install path and hamlib search path + sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \ + -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \ + qsstv.pro || die +} + +src_configure() { + eqmake6 PREFIX="/usr" +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +}
