diff --git a/net-dialup/minimodem/Manifest b/net-dialup/minimodem/Manifest index bacf45a3f..f5f0eb01b 100644 --- a/net-dialup/minimodem/Manifest +++ b/net-dialup/minimodem/Manifest @@ -1 +1 @@ -DIST minimodem-0.22.1-1.tar.gz 58348 SHA256 a3195094106eb1b8b8223f1b8a547f9aa68db0fd68d23121eb73b2d86588957a SHA512 c51013873b5920e250d8bcef57258a305201956ac84d46d35dcabe4534e37f321156abb67e48089f61a0e89a1caf2de325a228969d027518a8e41d9afee8fe6a WHIRLPOOL 1b38be35b54a8c965f36e9a6c0119cb415dbe0efd12f6588988ced3d381b3a5fc109a63ee7c8824caea17cd1a0719e7c3f8a0b29bf80196400eeb52748fb1aea +DIST minimodem-0.24-1.tar.gz 58655 SHA256 812611a880008c86086c105683063076176e87115490f8c266a0e25f9e27719f SHA512 4a60a13596adbebc2b0b63579b037b595221f1ba7ede33e0e74d8866ffd786f2a9504e01c9ff06e136af5e1a6f0a43940e7d3650e19a0964bc1fc9ba231b437c WHIRLPOOL 4656e07cae9b0067deed81533e34cc36319849e060bca408ca1264e7dcf5605823127ede14edff2e82fe64d36268c14f3213321ed260fd0208232cc7257f5f2d diff --git a/net-dialup/minimodem/files/minimodem-0.22.1-ttytdd.patch b/net-dialup/minimodem/files/minimodem-0.22.1-ttytdd.patch deleted file mode 100644 index 4a1222a4a..000000000 --- a/net-dialup/minimodem/files/minimodem-0.22.1-ttytdd.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f48257ac595afbc8f576d5ac4fcc180a608c6a25 Mon Sep 17 00:00:00 2001 -From: Rodrigo Menezes -Date: Tue, 19 Jan 2016 19:31:20 -0200 -Subject: [PATCH] TTY/TDD support - ---- - src/minimodem.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/minimodem.c b/src/minimodem.c -index 7cc8c46..812bdfa 100644 ---- a/src/minimodem.c -+++ b/src/minimodem.c -@@ -409,6 +409,7 @@ usage() - " 1200 Bell202 1200 bps --ascii\n" - " 300 Bell103 300 bps --ascii\n" - " rtty RTTY 45.45 bps --baudot --stopbits=1.5\n" -+ " tdd TTY/TDD 45.45 bps --baudot --stopbits=2.0\n" - " same NOAA SAME 520.83 bps --sync-byte=0xAB ...\n" - " callerid Bell202 CID 1200 bps\n" - " uic{-train,-ground} UIC-751-3 Train/Ground 600 bps\n" -@@ -781,6 +782,16 @@ main( int argc, char*argv[] ) - bfsk_n_data_bits = 5; - if ( bfsk_nstopbits < 0 ) - bfsk_nstopbits = 1.5; -+ } else if ( strncasecmp(modem_mode, "tdd",3)==0 ) { -+ bfsk_databits_decode = databits_decode_baudot; -+ bfsk_databits_encode = databits_encode_baudot; -+ bfsk_data_rate = 45.45; -+ if ( bfsk_n_data_bits == 0 ) -+ bfsk_n_data_bits = 5; -+ if ( bfsk_nstopbits < 0 ) -+ bfsk_nstopbits = 2.0; -+ bfsk_mark_f = 1400; -+ bfsk_space_f = 1800; - } else if ( strncasecmp(modem_mode, "same",5)==0 ) { - // http://www.nws.noaa.gov/nwr/nwrsame.htm - bfsk_data_rate = 520.0 + 5/6.0; -diff --git a/src/minimodem.1.in b/src/minimodem.1.in -index dc4f6b0..c95a0ee 100644 ---- a/src/minimodem.1.in -+++ b/src/minimodem.1.in -@@ -31,7 +31,7 @@ is a command-line program which decodes (or generates) audio - modem tones at any specified baud rate, using various framing protocols. - It acts a general-purpose software FSK modem, and includes support for - various standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, --and Caller-ID. -+TTY/TDD, and Caller-ID. - .PP - .B Minimodem - can play and capture audio modem tones in real-time via the system -@@ -67,6 +67,9 @@ default mark and space tone frequencies. - .B rtty - : RTTY 45.45 bps \-\-baudot \-\-stopbits 1.5 - .TP -+.B tdd -+: TTY/TDD 45.45 bps \-\-baudot \-\-stopbits 2.0 -+.TP - .B same - : SAME 520.83 bps \-\-startbits 0 \-\-stopbits 0 \-\-sync-byte 0xAB - .br -diff --git a/tests/81-tdd.test b/tests/81-tdd.test -new file mode 100755 -index 0000000..a55a2ac ---- /dev/null -+++ b/tests/81-tdd.test -@@ -0,0 +1 @@ -+exec ./self-test testdata-baudot.txt tdd diff --git a/net-dialup/minimodem/minimodem-0.22.1-r1.ebuild b/net-dialup/minimodem/minimodem-0.24.ebuild similarity index 86% rename from net-dialup/minimodem/minimodem-0.22.1-r1.ebuild rename to net-dialup/minimodem/minimodem-0.24.ebuild index 26461f090..c68358325 100644 --- a/net-dialup/minimodem/minimodem-0.22.1-r1.ebuild +++ b/net-dialup/minimodem/minimodem-0.24.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 inherit autotools-utils -#inherit autotools autotools-utils DESCRIPTION="General-purpose software audio FSK modem." HOMEPAGE="https://github.com/kamalmostafa/minimodem" @@ -28,7 +26,7 @@ S="${WORKDIR}/${PN}-${P}-1" src_prepare() { #apply upstream patch - epatch "${FILESDIR}/${P}-ttytdd.patch" +# epatch "${FILESDIR}/${P}-ttytdd.patch" eautoreconf } diff --git a/profiles/pentoo/base/package.accept_keywords/net-dialup b/profiles/pentoo/base/package.accept_keywords/net-dialup index 0010f7978..fe9c650c6 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-dialup +++ b/profiles/pentoo/base/package.accept_keywords/net-dialup @@ -1,3 +1,3 @@ #~net-dialup/freeradius-2.2.0 -~net-dialup/minimodem-0.22.1 +=net-dialup/minimodem-0.24*