diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-09-19 13:01:00 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-09-19 13:01:00 +0000 |
commit | b2e5755eb8260645c1601d3b2f26c3298ff0e858 (patch) | |
tree | 28d1874e1dbd4cb62d6fbf7efe56d0063931b0ab /comms | |
parent | d8402760d93fe0876980bd6fe8578526f9254179 (diff) | |
download | ports-b2e5755eb8260645c1601d3b2f26c3298ff0e858.tar.gz ports-b2e5755eb8260645c1601d3b2f26c3298ff0e858.zip |
Notes
Diffstat (limited to 'comms')
-rw-r--r-- | comms/Makefile | 3 | ||||
-rw-r--r-- | comms/congruity/Makefile | 28 | ||||
-rw-r--r-- | comms/congruity/distinfo | 2 | ||||
-rw-r--r-- | comms/congruity/files/patch-Makefile | 45 | ||||
-rw-r--r-- | comms/congruity/pkg-descr | 3 | ||||
-rw-r--r-- | comms/congruity/pkg-plist | 28 | ||||
-rw-r--r-- | comms/libbtbb/Makefile | 27 | ||||
-rw-r--r-- | comms/libbtbb/distinfo | 3 | ||||
-rw-r--r-- | comms/libbtbb/files/patch-lib_CMakeLists.txt | 11 | ||||
-rw-r--r-- | comms/libbtbb/files/patch-lib_src_pcap-common.h | 11 | ||||
-rw-r--r-- | comms/libbtbb/files/patch-lib_src_pcap.c | 38 | ||||
-rw-r--r-- | comms/libbtbb/pkg-descr | 5 | ||||
-rw-r--r-- | comms/libbtbb/pkg-plist | 6 | ||||
-rw-r--r-- | comms/quisk/Makefile | 42 | ||||
-rw-r--r-- | comms/quisk/distinfo | 3 | ||||
-rw-r--r-- | comms/quisk/files/patch-afedrinet_afedrinet__io.c | 10 | ||||
-rw-r--r-- | comms/quisk/files/patch-microphone.c | 11 | ||||
-rw-r--r-- | comms/quisk/files/patch-quisk.c | 11 | ||||
-rw-r--r-- | comms/quisk/files/patch-quisk.py | 16 | ||||
-rw-r--r-- | comms/quisk/files/patch-quisk__widgets.py | 19 | ||||
-rw-r--r-- | comms/quisk/files/patch-sdriqpkg_sdriq.c | 41 | ||||
-rw-r--r-- | comms/quisk/files/patch-setup.py | 61 | ||||
-rw-r--r-- | comms/quisk/pkg-descr | 10 |
23 files changed, 0 insertions, 434 deletions
diff --git a/comms/Makefile b/comms/Makefile index 47c4555ffb3b..d1750970a14e 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -22,7 +22,6 @@ SUBDIR += chu SUBDIR += comserv SUBDIR += concordance - SUBDIR += congruity SUBDIR += conserver-com SUBDIR += cqrlog SUBDIR += cubicsdr @@ -75,7 +74,6 @@ SUBDIR += kb SUBDIR += kermit SUBDIR += klog - SUBDIR += libbtbb SUBDIR += libconcord SUBDIR += libfap SUBDIR += libfec @@ -154,7 +152,6 @@ SUBDIR += qt5-serialbus SUBDIR += qt5-serialport SUBDIR += qtel - SUBDIR += quisk SUBDIR += redsea SUBDIR += remserial SUBDIR += rtl-sdr diff --git a/comms/congruity/Makefile b/comms/congruity/Makefile deleted file mode 100644 index 19036c8e87b4..000000000000 --- a/comms/congruity/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: Stephen Hurd <shurd@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= congruity -PORTVERSION= 18 -PORTREVISION= 7 -CATEGORIES= comms -MASTER_SITES= SF - -MAINTAINER= shurd@FreeBSD.org -COMMENT= GUI Logitech Harmony configuration tool - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord@${PY_FLAVOR} - -USES= desktop-file-utils gmake tar:bzip2 python:2.7 shebangfix -MAKE_ARGS= MANDIR=${PREFIX}/man -USE_WX= 3.0+ -WX_COMPS= python -SHEBANG_FILES= congruity mhgui -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/comms/congruity/distinfo b/comms/congruity/distinfo deleted file mode 100644 index 26d65fadda78..000000000000 --- a/comms/congruity/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (congruity-18.tar.bz2) = 16cee522b3e0b2c76ae4527110cb517af015aa8d56b1e72b7cbfa9df06739878 -SIZE (congruity-18.tar.bz2) = 199393 diff --git a/comms/congruity/files/patch-Makefile b/comms/congruity/files/patch-Makefile deleted file mode 100644 index 596c86ce7aed..000000000000 --- a/comms/congruity/files/patch-Makefile +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.orig 2014-03-29 10:20:02.000000000 -0700 -+++ Makefile 2014-05-31 01:38:42.000000000 -0700 -@@ -17,27 +17,27 @@ - @echo "Nothing to build, run 'make install' as root" - - install: -- mkdir -p --mode=755 $(DESTDIR)$(BINDIR) -+ mkdir -p -m 755 $(DESTDIR)$(BINDIR) - sed -e "s:/usr/share/congruity:${APPSHAREDIR}:" < congruity > congruity.patched -- $(INSTALL) --mode=755 congruity.patched $(DESTDIR)$(BINDIR)/congruity -+ $(INSTALL) -m 755 congruity.patched $(DESTDIR)$(BINDIR)/congruity - rm -f congruity.patched - sed -e "s:/usr/share/congruity:${APPSHAREDIR}:" < mhgui > mhgui.patched -- $(INSTALL) --mode=755 mhgui.patched $(DESTDIR)$(BINDIR)/mhgui -+ $(INSTALL) -m 755 mhgui.patched $(DESTDIR)$(BINDIR)/mhgui - rm -f mhgui.patched -- mkdir -p --mode=755 $(DESTDIR)$(APPSHAREDIR) -- $(INSTALL) --mode=644 *.gif $(DESTDIR)$(APPSHAREDIR) -- $(INSTALL) --mode=644 *.png $(DESTDIR)$(APPSHAREDIR) -- $(INSTALL) --mode=644 harmony.wsdl $(DESTDIR)$(APPSHAREDIR) -- $(INSTALL) --mode=644 *.xsd $(DESTDIR)$(APPSHAREDIR) -+ mkdir -p -m 755 $(DESTDIR)$(APPSHAREDIR) -+ $(INSTALL) -m 644 *.gif $(DESTDIR)$(APPSHAREDIR) -+ $(INSTALL) -m 644 *.png $(DESTDIR)$(APPSHAREDIR) -+ $(INSTALL) -m 644 harmony.wsdl $(DESTDIR)$(APPSHAREDIR) -+ $(INSTALL) -m 644 *.xsd $(DESTDIR)$(APPSHAREDIR) - sed -e "s:/usr/share/congruity:${APPSHAREDIR}:" < mhmanager.py > mhmanager.py.patched -- $(INSTALL) --mode=644 mhmanager.py.patched $(DESTDIR)$(APPSHAREDIR)/mhmanager.py -+ $(INSTALL) -m 644 mhmanager.py.patched $(DESTDIR)$(APPSHAREDIR)/mhmanager.py - rm -f mhmanager.py.patched -- mkdir -p --mode=755 $(DESTDIR)$(MAN1DIR) -- $(INSTALL) --mode=644 congruity.1 $(DESTDIR)$(MAN1DIR) -- $(INSTALL) --mode=644 mhgui.1 $(DESTDIR)$(MAN1DIR) -- mkdir -p --mode=755 $(DESTDIR)$(DESKTOPDIR) -- $(INSTALL) --mode=644 congruity.desktop $(DESTDIR)$(DESKTOPDIR) -- $(INSTALL) --mode=644 mhgui.desktop $(DESTDIR)$(DESKTOPDIR) -+ mkdir -p -m 755 $(DESTDIR)$(MAN1DIR) -+ $(INSTALL) -m 644 congruity.1 $(DESTDIR)$(MAN1DIR) -+ $(INSTALL) -m 644 mhgui.1 $(DESTDIR)$(MAN1DIR) -+ mkdir -p -m 755 $(DESTDIR)$(DESKTOPDIR) -+ $(INSTALL) -m 644 congruity.desktop $(DESTDIR)$(DESKTOPDIR) -+ $(INSTALL) -m 644 mhgui.desktop $(DESTDIR)$(DESKTOPDIR) - ifeq ($(RUN_UPDATE_DESKTOP_DB),1) - $(UPDATE_DESKTOP_DB) > /dev/null 2>&1 || : - endif diff --git a/comms/congruity/pkg-descr b/comms/congruity/pkg-descr deleted file mode 100644 index f49aaa24125c..000000000000 --- a/comms/congruity/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -congruity is a GUI application for programming Logitech(R) Harmony(TM) -remote controls. congruity builds upon the work of the concordance project, -which provides the underlying communication. diff --git a/comms/congruity/pkg-plist b/comms/congruity/pkg-plist deleted file mode 100644 index d76c1b664d95..000000000000 --- a/comms/congruity/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -bin/congruity -bin/mhgui -man/man1/congruity.1.gz -man/man1/mhgui.1.gz -share/applications/congruity.desktop -share/applications/mhgui.desktop -%%DATADIR%%/account.xsd -%%DATADIR%%/activity.xsd -%%DATADIR%%/am_data.xsd -%%DATADIR%%/arrays.xsd -%%DATADIR%%/button_mapping.xsd -%%DATADIR%%/data.xsd -%%DATADIR%%/discovery.xsd -%%DATADIR%%/dm_operation.xsd -%%DATADIR%%/harmony.wsdl -%%DATADIR%%/icon-complete.png -%%DATADIR%%/icon-failed.png -%%DATADIR%%/icon-in-progress.png -%%DATADIR%%/icon-unstarted.png -%%DATADIR%%/ir_data.xsd -%%DATADIR%%/mhmanager.py -%%DATADIR%%/operation.xsd -%%DATADIR%%/product.xsd -%%DATADIR%%/remote.png -%%DATADIR%%/search_match.xsd -%%DATADIR%%/serialization.xsd -%%DATADIR%%/throbber.gif -%%DATADIR%%/user_feature.xsd diff --git a/comms/libbtbb/Makefile b/comms/libbtbb/Makefile deleted file mode 100644 index 9c6484261123..000000000000 --- a/comms/libbtbb/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: George V. Neville-Neil <gnn@freebsd.org> -# $FreeBSD$ - -PORTNAME= libbtbb -PORTVERSION= 201812R1 -PORTREVISION= 2 -CATEGORIES= comms - -MAINTAINER= ports@FreeBSD.org -COMMENT= Bluetooth Baseband Library - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - -BUILD_DEPENDS= ${PYNUMPY} - -USES= cmake \ - python:2.7,build - -USE_GITHUB= yes -GH_ACCOUNT= greatscottgadgets -GH_TAGNAME= 2018-08-R1 - -.include <bsd.port.mk> diff --git a/comms/libbtbb/distinfo b/comms/libbtbb/distinfo deleted file mode 100644 index a96431a91035..000000000000 --- a/comms/libbtbb/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546423352 -SHA256 (greatscottgadgets-libbtbb-201812R1-2018-08-R1_GH0.tar.gz) = 86c5f0c432ae36fd4e69be20e6422ef408c71b2fd2f536786a9cb726c1c28ef0 -SIZE (greatscottgadgets-libbtbb-201812R1-2018-08-R1_GH0.tar.gz) = 310542 diff --git a/comms/libbtbb/files/patch-lib_CMakeLists.txt b/comms/libbtbb/files/patch-lib_CMakeLists.txt deleted file mode 100644 index cbf58292e4d6..000000000000 --- a/comms/libbtbb/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CMakeLists.txt.orig 2019-07-19 07:29:49 UTC -+++ lib/CMakeLists.txt -@@ -32,7 +32,7 @@ add_definitions( -DVERSION="${VERSION}" ) - - if(NOT MSVC) - add_definitions(-Wall) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89") - endif() - - add_subdirectory(src) diff --git a/comms/libbtbb/files/patch-lib_src_pcap-common.h b/comms/libbtbb/files/patch-lib_src_pcap-common.h deleted file mode 100644 index 32cf081db7ec..000000000000 --- a/comms/libbtbb/files/patch-lib_src_pcap-common.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/src/pcap-common.h.orig 2018-09-03 16:11:15 UTC -+++ lib/src/pcap-common.h -@@ -37,7 +37,7 @@ - #define htole16 EndianU16_NtoL - #define htole32 EndianU32_NtoL - #else --#include <endian.h> -+#include <sys/endian.h> - #endif - - #if !defined( htole16 ) /* will be defined under Linux when endian.h already included */ diff --git a/comms/libbtbb/files/patch-lib_src_pcap.c b/comms/libbtbb/files/patch-lib_src_pcap.c deleted file mode 100644 index dca5ed2e50c7..000000000000 --- a/comms/libbtbb/files/patch-lib_src_pcap.c +++ /dev/null @@ -1,38 +0,0 @@ ---- lib/src/pcap.c.orig 2018-09-03 16:11:24 UTC -+++ lib/src/pcap.c -@@ -110,7 +110,7 @@ typedef struct { - pcap_bluetooth_bredr_bb_header bredr_bb_header; - } pcap_bredr_packet; - --void btbb_pcap_dump(FILE *file, pcaprec_hdr_t *pcap_header, u_char *data) { -+void btbb_pcap_dump(FILE *file, pcaprec_hdr_t *pcap_header, char *data) { - fwrite(pcap_header, sizeof(*pcap_header), 1, file); - fwrite(data, pcap_header->incl_len, 1, file); - fflush(file); -@@ -202,7 +202,7 @@ btbb_pcap_append_packet(btbb_pcap_handle * h, const ui - btbb_packet_get_header_packed(pkt), - flags, - payload_bytes ); -- btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (u_char *)&pcap_pkt.bredr_bb_header); -+ btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (char *)&pcap_pkt.bredr_bb_header); - return 0; - } - return -PCAP_INVALID_HANDLE; -@@ -331,7 +331,7 @@ lell_pcap_append_packet(lell_pcap_handle * h, const ui - refAA, - flags, - &pkt->symbols[0] ); -- btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (u_char *)&pcap_pkt.le_ll_header); -+ btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (char *)&pcap_pkt.le_ll_header); - return 0; - } - return -PCAP_INVALID_HANDLE; -@@ -410,7 +410,7 @@ lell_pcap_append_ppi_packet(lell_pcap_handle * h, cons - pcap_pkt.le_ll_ppi_header.rssi_avg = rssi_avg; - pcap_pkt.le_ll_ppi_header.rssi_count = rssi_count; - (void) memcpy( &pcap_pkt.le_packet[0], &pkt->symbols[0], incl_len); -- btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (u_char *)&pcap_pkt.ppi_packet_header); -+ btbb_pcap_dump(h->pcap_file, &pcap_pkt.pcap_header, (char *)&pcap_pkt.ppi_packet_header); - return 0; - } - return -PCAP_INVALID_HANDLE; diff --git a/comms/libbtbb/pkg-descr b/comms/libbtbb/pkg-descr deleted file mode 100644 index 5749b01dccf3..000000000000 --- a/comms/libbtbb/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ - A Bluetooth baseband decoding library - -This is a Bluetooth baseband decoding library. It can be used to -extract Bluetooth packet and piconet information from Ubertooth -devices as well as GR-Bluetooth/USRP. diff --git a/comms/libbtbb/pkg-plist b/comms/libbtbb/pkg-plist deleted file mode 100644 index cf957e54d56c..000000000000 --- a/comms/libbtbb/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/btaptap -include/btbb.h -lib/libbtbb.so -lib/libbtbb.so.1 -lib/libbtbb.so.1.0 -libdata/pkgconfig/libbtbb.pc diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile deleted file mode 100644 index 6837335af9d3..000000000000 --- a/comms/quisk/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Created by: Stephen Hurd <shurd@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= quisk -DISTVERSION= 4.1.40 -PORTREVISION= 6 -CATEGORIES= comms hamradio -MASTER_SITES= CHEESESHOP - -MAINTAINER= hamradio@FreeBSD.org -COMMENT= Software Defined Radio (SDR) - -LICENSE= GPLv2 - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - -BROKEN_i386= strip: elf_update() failed: Invalid data buffer descriptor (bug#238131) - -LIB_DEPENDS= libfftw3.so:math/fftw3 \ - libportaudio.so:audio/portaudio \ - libasound.so:audio/alsa-lib \ - libpulse.so:audio/pulseaudio - -USES= python:2.7 -USE_PYTHON= distutils noflavors autoplist -USE_WX= 3.0+ - -WX_COMPS= python - -post-extract: - @${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so \ - ${WRKSRC}/freedvpkg/libcodec2_32.so \ - ${WRKSRC}/freedvpkg/libcodec2_64.so - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py - -post-stage: - @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} - -.include <bsd.port.mk> diff --git a/comms/quisk/distinfo b/comms/quisk/distinfo deleted file mode 100644 index 13626c0c4856..000000000000 --- a/comms/quisk/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1560098886 -SHA256 (quisk-4.1.40.tar.gz) = de9d0c7e0d4ee0c160c779c97aebd1bb4b2c4178eeec326f82016cfa6d34c3b3 -SIZE (quisk-4.1.40.tar.gz) = 3034312 diff --git a/comms/quisk/files/patch-afedrinet_afedrinet__io.c b/comms/quisk/files/patch-afedrinet_afedrinet__io.c deleted file mode 100644 index 30861820aa37..000000000000 --- a/comms/quisk/files/patch-afedrinet_afedrinet__io.c +++ /dev/null @@ -1,10 +0,0 @@ ---- afedrinet/afedrinet_io.c.orig 2019-05-23 04:31:28 UTC -+++ afedrinet/afedrinet_io.c -@@ -15,6 +15,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <unistd.h> -+#include <netinet/in.h> - #endif - - #ifdef MS_WINDOWS diff --git a/comms/quisk/files/patch-microphone.c b/comms/quisk/files/patch-microphone.c deleted file mode 100644 index 286255e7ed3e..000000000000 --- a/comms/quisk/files/patch-microphone.c +++ /dev/null @@ -1,11 +0,0 @@ ---- microphone.c.orig 2019-05-09 20:49:44 UTC -+++ microphone.c -@@ -76,7 +76,7 @@ static int reverse_tx_sideband; - - static int doTxCorrect = 0; // Corrections for UDP sample transmit - static double TxCorrectLevel; --static complex TxCorrectDc; -+static complex double TxCorrectDc; - - // Used for the Hermes protocol - #define HERMES_TX_BUF_SAMPLES 4800 // buffer size in I/Q samples (two shorts) diff --git a/comms/quisk/files/patch-quisk.c b/comms/quisk/files/patch-quisk.c deleted file mode 100644 index 4d2a8084c849..000000000000 --- a/comms/quisk/files/patch-quisk.c +++ /dev/null @@ -1,11 +0,0 @@ ---- quisk.c.orig 2019-05-09 20:50:36 UTC -+++ quisk.c -@@ -4352,7 +4352,7 @@ static PyObject * get_bandscope(void) // Called by the - j2 = floor(d2); - sample = (j1 + 1 - d1) * bandscopeAverage[j1]; - for (j = j1 + 1; j < j2; j++) -- sample += cabs(bandscopeAverage[j]); -+ sample += fabs(bandscopeAverage[j]); - sample += (d2 - j2) * bandscopeAverage[j2]; - sample = sample / frac; - // Normalize to max == 1 diff --git a/comms/quisk/files/patch-quisk.py b/comms/quisk/files/patch-quisk.py deleted file mode 100644 index 528a179c413e..000000000000 --- a/comms/quisk/files/patch-quisk.py +++ /dev/null @@ -1,16 +0,0 @@ ---- quisk.py.orig 2019-06-18 23:38:53 UTC -+++ quisk.py -@@ -23,6 +23,13 @@ os.chdir(os.path.normpath(os.path.dirnam - if sys.path[0] != "'.'": # Make sure the current working directory is on path - sys.path.insert(0, '.') - -+# Hack to ensure unicode is available. -+import locale -+locale.setlocale(locale.LC_ALL, '') -+cloc = locale.getdefaultlocale() -+if locale.nl_langinfo(locale.CODESET) != 'UTF-8': -+ locale.setlocale(locale.LC_ALL, (cloc[0], 'UTF-8')) -+ - import wx, wx.html, wx.lib.stattext, wx.lib.colourdb, wx.grid, wx.richtext - import math, cmath, time, traceback, string, select, subprocess - import threading, pickle, webbrowser diff --git a/comms/quisk/files/patch-quisk__widgets.py b/comms/quisk/files/patch-quisk__widgets.py deleted file mode 100644 index 4137747f96ac..000000000000 --- a/comms/quisk/files/patch-quisk__widgets.py +++ /dev/null @@ -1,19 +0,0 @@ ---- quisk_widgets.py.orig 2019-05-28 12:22:59 UTC -+++ quisk_widgets.py -@@ -248,7 +248,15 @@ class SliderBoxH: - else: - self.text_ctrl = wx.StaticText(parent, -1, t, pos=pos) - w2, h2 = self.text_ctrl.GetSize() -- self.slider = wx.Slider(parent, -1, init, themin, themax, (pos[0] + w2, pos[1]), (width - w2, h2)) -+ self.slider = wx.Slider(parent, -1, init, themin, themax) -+ w3, h3 = self.slider.GetSize() -+ p2 = pos[1] -+ if h3 > h2: -+ p2 -= (h3 - h2) / 2 -+ else: -+ p2 += (h2 - h3) / 2 -+ self.slider.SetSize((width - w2, h3)) -+ self.slider.SetPosition((pos[0] + w2, p2)) - self.slider.Bind(wx.EVT_SCROLL, self.OnScroll) - self.text_ctrl.SetForegroundColour(parent.GetForegroundColour()) - self.OnScroll() diff --git a/comms/quisk/files/patch-sdriqpkg_sdriq.c b/comms/quisk/files/patch-sdriqpkg_sdriq.c deleted file mode 100644 index 63e3ee660350..000000000000 --- a/comms/quisk/files/patch-sdriqpkg_sdriq.c +++ /dev/null @@ -1,41 +0,0 @@ ---- sdriqpkg/sdriq.c.orig 2018-08-02 14:01:30 UTC -+++ sdriqpkg/sdriq.c -@@ -629,14 +658,14 @@ static void quisk_open_sdriq_dev(const c - { - struct termios newtio; - -- if (!strncmp(name, "/dev/ttyUSB", 11)) { // use ftdi_sio driver -- quisk_sdriq_fd = open(name, O_RDWR | O_NOCTTY); -- if (quisk_sdriq_fd < 0) { -- strncpy(buf, "Open SDR-IQ : ", bufsize); -- strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); -- quisk_sdriq_fd = INVALID_HANDLE_VALUE; -- return; -- } -+ quisk_sdriq_fd = open(name, O_RDWR | O_NOCTTY | O_NONBLOCK); -+ if (quisk_sdriq_fd < 0) { -+ strncpy(buf, "Open SDR-IQ : ", bufsize); -+ strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); -+ quisk_sdriq_fd = INVALID_HANDLE_VALUE; -+ return; -+ } -+ if (isatty(quisk_sdriq_fd)) { - bzero(&newtio, sizeof(newtio)); - newtio.c_cflag = CS8 | CLOCAL | CREAD; - newtio.c_iflag = IGNPAR; -@@ -649,15 +678,6 @@ static void quisk_open_sdriq_dev(const c - tcflush(quisk_sdriq_fd, TCIFLUSH); - tcsetattr(quisk_sdriq_fd, TCSANOW, &newtio); - } -- else { // use ft245 or similar driver -- quisk_sdriq_fd = open(name, O_RDWR | O_NONBLOCK); -- if (quisk_sdriq_fd < 0) { -- strncpy(buf, "Open SDR-IQ: ", bufsize); -- strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); -- quisk_sdriq_fd = INVALID_HANDLE_VALUE; -- return; -- } -- } - return; - } - #endif diff --git a/comms/quisk/files/patch-setup.py b/comms/quisk/files/patch-setup.py deleted file mode 100644 index bfd4860a15c9..000000000000 --- a/comms/quisk/files/patch-setup.py +++ /dev/null @@ -1,61 +0,0 @@ ---- setup.py.orig 2019-04-18 17:28:40 UTC -+++ setup.py -@@ -17,23 +17,23 @@ is_64bit = sys.maxint > 2**32 - - if sys.platform != "win32": - missing = False -- try: -- import wx -- except ImportError: -- print ("Please install the package python-wxgtk3.0 or later") -- missing = True -- if not os.path.isfile("/usr/include/fftw3.h"): -- print ("Please install the package libfftw3-dev") -- missing = True -- if not os.path.isdir("/usr/include/alsa"): -- print ("Please install the package libasound2-dev") -- missing = True -- if not os.path.isfile("/usr/include/portaudio.h"): -- print ("Please install the package portaudio19-dev") -- missing = True -- if not os.path.isdir("/usr/include/pulse"): -- print ("please install the package libpulse-dev") -- missing = True -+# try: -+# import wx -+# except ImportError: -+# print ("Please install the package python-wxgtk3.0 or later") -+# missing = True -+# if not os.path.isfile("/usr/include/fftw3.h"): -+# print ("Please install the package libfftw3-dev") -+# missing = True -+# if not os.path.isdir("/usr/include/alsa"): -+# print ("Please install the package libasound2-dev") -+# missing = True -+# if not os.path.isfile("/usr/include/portaudio.h"): -+# print ("Please install the package portaudio19-dev") -+# missing = True -+# if not os.path.isdir("/usr/include/pulse"): -+# print ("please install the package libpulse-dev") -+# missing = True - if missing: - ans = raw_input("Do you want to continue (y, N): ") - ans = ans.strip() -@@ -41,6 +41,8 @@ if sys.platform != "win32": - sys.exit(1) - - module1 = Extension ('quisk._quisk', -+ include_dirs = ['/usr/local/include'], -+ library_dirs = ['/usr/local/lib'], - libraries = ['asound', 'portaudio', 'pulse', 'fftw3', 'm'], - sources = ['quisk.c', 'sound.c', 'sound_alsa.c', 'sound_portaudio.c', 'sound_pulseaudio.c', - 'is_key_down.c', 'microphone.c', 'utility.c', -@@ -94,8 +96,6 @@ modulew4 = Extension ('quisk.soapypkg.soapy', - - # Changes for MacOS support thanks to Mario, DL3LSM. - modulem1 = Extension ('quisk._quisk', -- #include_dirs = ['.'], -- #library_dirs = ['.'], - libraries = ['portaudio', 'fftw3', 'm', 'pulse'], - sources = ['quisk.c', 'sound.c', 'sound_portaudio.c', - 'is_key_down.c', 'microphone.c', 'utility.c', diff --git a/comms/quisk/pkg-descr b/comms/quisk/pkg-descr deleted file mode 100644 index 688ae26cc519..000000000000 --- a/comms/quisk/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -This is QUISK, a Software Defined Radio (SDR). -- Quisk can control the HiQSDR. -- As a receiver it can use the SDR-IQ by RfSpace as a sample source. -- As a receiver it can use your soundcard as a sample source. -- Quisk can control SoftRock hardware for both receive and transmit. -- As a transmitter it can accept microphone input and send that to your - transmitter for SSB operation. For CW, QUISK can mute the audio and - substitute a side tone. - -WWW: http://james.ahlstrom.name/quisk/ |