cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to minimodem-0.24 and patch so that tests run correctly

Browse Source 
add comment to makefile pointing out that the next version (not yet
released) has a native sndio backend
This commit is contained in:
sthen 2021-01-16 12:58:11 +00:00
parent 465bbd0647
commit 35fc66e3bd
10 changed files with 106 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comms/minimodem/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2019/07/12 20:43:47 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2021/01/16 12:58:11 sthen Exp $
BROKEN-hppa = no atomic ops in pulse-simple dependency
COMMENT = general-purpose software audio FSK modem
DISTNAME = minimodem-0.22.1
# next version should have a native sndio backend
DISTNAME = minimodem-0.24
CATEGORIES = comms
REVISION = 1
HOMEPAGE = http://www.whence.com/minimodem/
@ -30,4 +31,7 @@ CONFIGURE_ARGS = --without-alsa \
MAKE_FLAGS = LIBS="-lfftw3f_threads -lfftw3f -lpulse-simple -lpulse -lsndfile -lintl -lm"
do-test:
cd ${WRKSRC}/tests; ./run-self-tests
.include <bsd.port.mk>

4
comms/minimodem/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (minimodem-0.22.1.tar.gz) = 9B3Sc2f/4WB8a2Mbt6tuHFwJlJDilc4bYDzFRBaEXOk=
SIZE (minimodem-0.22.1.tar.gz) = 157502
SHA256 (minimodem-0.24.tar.gz) = +Myk244/KE1n+EMFTWu02Io9ted7JhkkEOQemgb0N44=
SIZE (minimodem-0.24.tar.gz) = 159508

77
comms/minimodem/patches/patch-configure
View File

@ -1,77 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2015/08/24 23:02:31 bcallah Exp $
configure is stupid. Force it to do the right thing.
--- configure.orig Mon Aug 24 16:56:13 2015
+++ configure Mon Aug 24 18:24:30 2015
@@ -3572,7 +3572,7 @@ fi
# fftw3f
-deps_packages+=" fftw3f"
+#deps_packages+=" fftw3f"
# ALSA
@@ -3597,20 +3597,8 @@ _ACEOF
# pulseaudio
-# Check whether --with-pulseaudio was given.
-if test "${with_pulseaudio+set}" = set; then :
- withval=$with_pulseaudio;
-fi
+use_pulseaudio=1
-if test "x$with_pulseaudio" == "xno"; then :
- # then
- use_pulseaudio=0
-else
- # else
- use_pulseaudio=1
- deps_packages+=" libpulse-simple"
-fi
-
cat >>confdefs.h <<_ACEOF
#define USE_PULSEAUDIO $use_pulseaudio
_ACEOF
@@ -3618,20 +3606,8 @@ _ACEOF
# sndfile
-# Check whether --with-sndfile was given.
-if test "${with_sndfile+set}" = set; then :
- withval=$with_sndfile;
-fi
+use_sndfile=1
-if test "x$with_sndfile" == "xno"; then :
- # then
- use_sndfile=0
-else
- # else
- use_sndfile=1
- deps_packages+=" sndfile"
-fi
-
cat >>confdefs.h <<_ACEOF
#define USE_SNDFILE $use_sndfile
_ACEOF
@@ -3814,7 +3790,7 @@ if test -n "$DEPS_CFLAGS"; then
pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags " $deps_packages " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
- pkg_failed=yes
+ pkg_failed=no
fi
else
pkg_failed=untried
@@ -3831,7 +3807,7 @@ if test -n "$DEPS_LIBS"; then
pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs " $deps_packages " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
- pkg_failed=yes
+ pkg_failed=no
fi
else
pkg_failed=untried

28
comms/minimodem/patches/patch-tests_16-verify-tx-consistent_test Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-tests_16-verify-tx-consistent_test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/16-verify-tx-consistent.test
--- tests/16-verify-tx-consistent.test.orig
+++ tests/16-verify-tx-consistent.test
@@ -19,19 +19,19 @@ trap "rm -f $TMPF.*" 0
set -e
$MINIMODEM --tx --file $TMPF.1.wav $minimodem_tx_args < "$textfile"
-sum1=$(md5sum -b < $TMPF.1.wav)
+sum1=$(md5 < $TMPF.1.wav)
echo "$sum1 $TMPF.1.wav"
sleep 1
$MINIMODEM --tx --file $TMPF.2.wav $minimodem_tx_args < "$textfile"
-sum2=$(md5sum -b < $TMPF.2.wav)
+sum2=$(md5 < $TMPF.2.wav)
echo "$sum2 $TMPF.2.wav"
sleep 1
$MINIMODEM --tx --file $TMPF.3.wav $minimodem_tx_args < "$textfile"
-sum3=$(md5sum -b < $TMPF.3.wav)
+sum3=$(md5 < $TMPF.3.wav)
echo "$sum3 $TMPF.3.wav"
[ "$sum1" == "$sum2" ] || {

8
comms/minimodem/patches/patch-tests_17-verify-tx-consistent-float_test Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-tests_17-verify-tx-consistent-float_test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/17-verify-tx-consistent-float.test
--- tests/17-verify-tx-consistent-float.test.orig
+++ tests/17-verify-tx-consistent-float.test
@@ -1 +1 @@
-exec ./16-verify-tx-consistent.test --float-samples
+sh ./16-verify-tx-consistent.test --float-samples

9
comms/minimodem/patches/patch-tests_31-amplitude-float_test Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-tests_31-amplitude-float_test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/31-amplitude-float.test
--- tests/31-amplitude-float.test.orig
+++ tests/31-amplitude-float.test
@@ -1,2 +1,2 @@
#!/bin/bash
-exec ./30-amplitude.test --float
+sh ./30-amplitude.test --float

8
comms/minimodem/patches/patch-tests_41-noise-purefreqs_test Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-tests_41-noise-purefreqs_test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/41-noise-purefreqs.test
--- tests/41-noise-purefreqs.test.orig
+++ tests/41-noise-purefreqs.test
@@ -1 +1 @@
-exec ./40-noise.test 1200 -M 1200 -S 2400
+sh ./40-noise.test 1200 -M 1200 -S 2400

9
comms/minimodem/patches/patch-tests_71-callerid-sdmf_test Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-tests_71-callerid-sdmf_test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/71-callerid-sdmf.test
--- tests/71-callerid-sdmf.test.orig
+++ tests/71-callerid-sdmf.test
@@ -1,2 +1,2 @@
#!/bin/bash
-exec ./70-callerid-mdmf.test testdata-callerid-sdmf.bytes
+sh ./70-callerid-mdmf.test testdata-callerid-sdmf.bytes

16
comms/minimodem/patches/patch-tests_run-self-tests Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-tests_run-self-tests,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/run-self-tests
--- tests/run-self-tests.orig
+++ tests/run-self-tests
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
for testcase in ./*.test
do
- $testcase
+ sh $testcase
if [ $? -eq 0 ]
then echo "PASS: $testcase"
else echo "FAIL: $testcase"

19
comms/minimodem/patches/patch-tests_self-test Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-tests_self-test,v 1.1 2021/01/16 12:58:11 sthen Exp $
Index: tests/self-test
--- tests/self-test.orig
+++ tests/self-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ksh
MINIMODEM="${MINIMODEM-./minimodem}"
[ -f "$MINIMODEM" ] || {
@@ -83,6 +83,6 @@ exitcode=0
fi
}
-echo -e "$result $stats"
+echo "$result $stats"
exit $exitcode