Attachment #234794 for bug #264769

Lines 1-7 Link Here

(-)b/audio/codec2/Makefile (-1 lines)
1	PORTNAME= codec2	1	PORTNAME= codec2
2	DISTVERSIONPREFIX=v	2	DISTVERSIONPREFIX=v
3	DISTVERSION= 1.0.3	3	DISTVERSION= 1.0.3
4	PORTREVISION= 1
5	CATEGORIES= audio hamradio	4	CATEGORIES= audio hamradio
6		5
7	MAINTAINER= hamradio@FreeBSD.org	6	MAINTAINER= hamradio@FreeBSD.org




PORTNAME=	freedv
DISTVERSIONPREFIX=v
DISTVERSION=	1.7.0
CATEGORIES=	comms hamradio
MASTER_SITES=	https://hobbes1069.fedorapeople.org/freetel/freedv/

MAINTAINER=	hamradio@FreeBSD.org
COMMENT=	Narrow band digital voice

LICENSE=	LGPL21

BROKEN=		Needs update due to Hamlib changes

LIB_DEPENDS=	libcodec2.so:audio/codec2 \
		libportaudio.so:audio/portaudio \
		libgsm.so:audio/gsm \
		libhamlib.so:comms/hamlib \
		libsamplerate.so:audio/libsamplerate \
		libsox.so:audio/sox \
		libsndfile.so:audio/libsndfile \
		libspeex.so:audio/speex \
		libspeexdsp.so:audio/speexdsp \
		liblpcnetfreedv.so:audio/lpcnet

USES=	cmake compiler:c++11-lib tar:xz
USE_WX=	3.0+
USE_GITHUB=		yes
GH_ACCOUNT=	drowe67
GH_PROJECT=		freedv-gui

USES=		cmake compiler:c++11-lib gnome tar:xz
USE_WX=		3.0+
CMAKE_ARGS+=	-DCODEC2_INCLUDE_DIRS=${LOCALBASE}/include/codec2 \
		-DCODEC2_LIBRARY=${LOCALBASE}/lib/libcodec2.so \
		-DUSE_STATIC_CODEC2=FALSE \

Lines 1-3 Link Here

(-)b/comms/freedv/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535511699	1	TIMESTAMP = 1655664601
2	SHA256 (freedv-1.3.1.tar.xz) = 9365459d4c8d478d32d91629f6fdf0cb6bd27cbb71ddc5a09b37e10df03dff65	2	SHA256 (drowe67-freedv-gui-v1.7.0_GH0.tar.gz) = 20ead8b37b0d42710226d2902f7fc0898de631fb28353ab6b018556117121ca8
3	SIZE (freedv-1.3.1.tar.xz) = 536864	3	SIZE (drowe67-freedv-gui-v1.7.0_GH0.tar.gz) = 9477053

Lines 6-9 is received by an SSB radio, then demodulated and decoded by FreeDV. FreeDV Link Here

(-)b/comms/freedv/pkg-descr (-1 / +1 lines)
6	700(B) rivals SSB in it's low SNR performance. At high SNRs FreeDV 1600	6	700(B) rivals SSB in it's low SNR performance. At high SNRs FreeDV 1600
7	sounds like FM, with no annoying analog HF radio noise.	7	sounds like FM, with no annoying analog HF radio noise.
8		8
9	WWW: https://freedv.org/	9	WWW: http://freedv.org/tiki-index.php




PORTNAME=	lpcnet
PORTVERSION=	20210629
CATEGORIES=	audio hamradio
MASTER_SITES=	http://rowetel.com/downloads/deep/:main \
		GH:sub
DISTFILES=	lpcnet_191005_v1.0.tgz:main \
		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sub

MAINTAINER=	hamradio@FreeBSD.org
COMMENT=	Neural Net speech coding

LICENSE=	LGPL21

LIB_DEPENDS=	libcodec2.so:audio/codec2

USES=		cmake compiler:c++11-lib
CMAKE_ARGS+=	-DMACHINE_CPU:STRING="${MACHINE_CPU}" \
				-DWRKDIR:STRING=${WRKDIR}

USE_GITHUB=	yes
GH_ACCOUNT=	drowe67
GH_PROJECT=	LPCNet
GH_TAGNAME=	0dc5935

.include <bsd.port.pre.mk>
.include <bsd.cpu.mk>
.include <bsd.port.post.mk>

Added Link Here

(-)audio/lpcnet/distinfo (+7 lines)
1	TIMESTAMP = 1641483640
2	SHA256 (lpcnet_191005_v1.0.tgz) = 509440924751fdd87ffaa5683ee3dddd937af5c833b9104ccce65d51614926c8
3	SIZE (lpcnet_191005_v1.0.tgz) = 18396516
4	SHA256 (lpcnet-20210629.tar.gz) = 31a687ac5e822c6c2cf75fe8e7371a5cd834d692635a802ec8fd33dc340d9cf2
5	SIZE (lpcnet-20210629.tar.gz) = 33016759
6	SHA256 (drowe67-LPCNet-20210629-0dc5935_GH0.tar.gz) = 31a687ac5e822c6c2cf75fe8e7371a5cd834d692635a802ec8fd33dc340d9cf2
7	SIZE (drowe67-LPCNet-20210629-0dc5935_GH0.tar.gz) = 33016759

Added Link Here

(-)audio/lpcnet/pkg-descr (+6 lines)
1	Experimental version of LPCNet that has been used to develop FreeDV 2020
2	- a HF radio Digial Voice mode for over the air experimentation with
3	Neural Net speech coding. Possibly the first use of Neural Net speech
4	coding in real world operation.
5
6	WWW: http://freedv.org/tiki-index.php

Added Link Here

(-)audio/lpcnet/pkg-plist (+7 lines)
1	bin/lpcnet_dec
2	bin/lpcnet_enc
3	include/lpcnet/lpcnet_freedv.h
4	lib/cmake/lpcnetfreedv/lpcnetfreedv-config-%%CMAKE_BUILD_TYPE%%.cmake
5	lib/cmake/lpcnetfreedv/lpcnetfreedv-config.cmake
6	lib/liblpcnetfreedv.so
7	lib/liblpcnetfreedv.so.0.2




--- CMakeLists.txt.orig	2021-06-29 09:04:36 UTC
+++ CMakeLists.txt
@@ -87,15 +87,32 @@ message(STATUS "Host system arch is: ${CMAKE_SYSTEM_PR
 # Detection of available CPU optimizations
 if(NOT DISABLE_CPU_OPTIMIZATION)
     if(UNIX AND NOT APPLE)
-        message(STATUS "Looking for available CPU optimizations on Linux/BSD system...")
-        execute_process(COMMAND grep -c "avx2" /proc/cpuinfo
-            OUTPUT_VARIABLE AVX2)
-        execute_process(COMMAND grep -c "avx " /proc/cpuinfo
-            OUTPUT_VARIABLE AVX)
-        execute_process(COMMAND grep -c "sse4_1 " /proc/cpuinfo
-            OUTPUT_VARIABLE SSE)
-        execute_process(COMMAND grep -c "neon" /proc/cpuinfo
-            OUTPUT_VARIABLE NEON)
+        if ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+            message(STATUS "Looking for available CPU optimizations on FreeBSD system...")
+	    message (STATUS "MACHINE_CPU = ${MACHINE_CPU}")
+            if (MACHINE_CPU MATCHES  "avx")
+                set(AVX TRUE)
+           endif()
+           if (MACHINE_CPU MATCHES "avx2")
+               set(AVX2 TRUE)
+           endif()
+           if (MACHINE_CPU MATCHES "sse")
+	       set(SSE TRUE)
+           endif()
+           if (MACHINE_CPU MATCHES  "neon")
+               set(NEON TRUE)
+           endif()
+        else()
+            message(STATUS "Looking for available CPU optimizations on Linux system...")
+            execute_process(COMMAND grep -c "avx2" /proc/cpuinfo
+                OUTPUT_VARIABLE AVX2)
+            execute_process(COMMAND grep -c "avx " /proc/cpuinfo
+                OUTPUT_VARIABLE AVX)
+            execute_process(COMMAND grep -c "sse4_1 " /proc/cpuinfo
+                OUTPUT_VARIABLE SSE)
+            execute_process(COMMAND grep -c "neon" /proc/cpuinfo
+                OUTPUT_VARIABLE NEON)
+        endif()
     elseif(APPLE)
         if(BUILD_OSX_UNIVERSAL)
             # Presume AVX/AVX2 are enabled on the x86 side. The ARM side will auto-enable
@@ -140,36 +157,12 @@ if(${NEON} OR ${NEON} GREATER 0)
 endif()
 
 # grab latest NN model (or substitute your own)
-set(LPCNET_ROOT http://rowetel.com/downloads/deep/)
-set(LPCNET_FILE lpcnet_191005_v1.0.tgz)
-set(LPCNET_URL ${LPCNET_ROOT}${LPCNET_FILE})
+# retrieved by port
+#set(LPCNET_ROOT http://rowetel.com/downloads/deep/)
+#set(LPCNET_FILE lpcnet_191005_v1.0.tgz)
+#set(LPCNET_URL ${LPCNET_ROOT}${LPCNET_FILE})
 
-if(EXISTS ${CMAKE_BINARY_DIR}/${LPCNET_FILE})
-    set(lpcnet_SOURCE_DIR ${CMAKE_BINARY_DIR}/src)
-    file(MAKE_DIRECTORY ${lpcnet_SOURCE_DIR})
-    execute_process(COMMAND tar -xzf ${CMAKE_BINARY_DIR}/${LPCNET_FILE} -C ${CMAKE_BINARY_DIR}/src)
-
-# Work around not having the FetchContent module.
-elseif(CMAKE_VERSION VERSION_LESS 3.11.4)
-    set(lpcnet_SOURCE_DIR ${CMAKE_BINARY_DIR}/src)
-    if(NOT EXISTS ${lpcnet_SOURCE_DIR})
-        file(DOWNLOAD ${LPCNET_URL}
-            ${CMAKE_BINARY_DIR}/${LPCNET_FILE}
-            SHOW_PROGRESS
-        )
-        file(MAKE_DIRECTORY ${lpcnet_SOURCE_DIR})
-        execute_process(COMMAND tar -xzf ${CMAKE_BINARY_DIR}/${LPCNET_FILE} -C ${CMAKE_BINARY_DIR}/src)
-    endif()
-else()
-    include(FetchContent)
-    FetchContent_Declare(
-        lpcnet
-        URL ${LPCNET_URL})
-    FetchContent_GetProperties(lpcnet)
-    if(NOT lpcnet_POPULATED)
-        FetchContent_Populate(lpcnet)
-    endif()
-endif()
+set(lpcnet_SOURCE_DIR ${WRKDIR})
 
 # Find codec2
 if(CODEC2_BUILD_DIR)

Return to bug 264769

Lines 1-27 Link Here

(-)b/comms/freedv/Makefile (-8 / +11 lines)
1	PORTNAME= freedv	1	PORTNAME= freedv
2	DISTVERSION= 1.3.1	2	DISTVERSIONPREFIX=v
3	PORTREVISION= 6	3	DISTVERSION= 1.7.0
4	CATEGORIES= comms hamradio	4	CATEGORIES= comms hamradio
5	MASTER_SITES= https://hobbes1069.fedorapeople.org/freetel/freedv/
6		5
7	MAINTAINER= hamradio@FreeBSD.org	6	MAINTAINER= hamradio@FreeBSD.org
8	COMMENT= Narrow band digital voice	7	COMMENT= Narrow band digital voice
9		8
10	LICENSE= LGPL21	9	LICENSE= LGPL21
11		10
12	BROKEN= Needs update due to Hamlib changes
13
14	LIB_DEPENDS= libcodec2.so:audio/codec2 \	11	LIB_DEPENDS= libcodec2.so:audio/codec2 \
15	libportaudio.so:audio/portaudio \	12	libportaudio.so:audio/portaudio \
		13	libgsm.so:audio/gsm \
16	libhamlib.so:comms/hamlib \	14	libhamlib.so:comms/hamlib \
17	libsamplerate.so:audio/libsamplerate \	15	libsamplerate.so:audio/libsamplerate \
18	libsox.so:audio/sox \	16	libsox.so:audio/sox \
19	libsndfile.so:audio/libsndfile \	17	libsndfile.so:audio/libsndfile \
20	libspeex.so:audio/speex \	18	libspeex.so:audio/speex \
21	libspeexdsp.so:audio/speexdsp	19	libspeexdsp.so:audio/speexdsp \
		20	liblpcnetfreedv.so:audio/lpcnet
		21
		22	USES= cmake compiler:c++11-lib tar:xz
		23	USE_WX= 3.0+
		24	USE_GITHUB= yes
		25	GH_ACCOUNT= drowe67
		26	GH_PROJECT= freedv-gui
22		27
23	USES= cmake compiler:c++11-lib gnome tar:xz
24	USE_WX= 3.0+
25	CMAKE_ARGS+= -DCODEC2_INCLUDE_DIRS=${LOCALBASE}/include/codec2 \	28	CMAKE_ARGS+= -DCODEC2_INCLUDE_DIRS=${LOCALBASE}/include/codec2 \
26	-DCODEC2_LIBRARY=${LOCALBASE}/lib/libcodec2.so \	29	-DCODEC2_LIBRARY=${LOCALBASE}/lib/libcodec2.so \
27	-DUSE_STATIC_CODEC2=FALSE \	30	-DUSE_STATIC_CODEC2=FALSE \

Added Link Here

(-)audio/lpcnet/Makefile (+27 lines)
1	PORTNAME= lpcnet
2	PORTVERSION= 20210629
3	CATEGORIES= audio hamradio
4	MASTER_SITES= http://rowetel.com/downloads/deep/:main \
5	GH:sub
6	DISTFILES= lpcnet_191005_v1.0.tgz:main \
7	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sub
8
9	MAINTAINER= hamradio@FreeBSD.org
10	COMMENT= Neural Net speech coding
11
12	LICENSE= LGPL21
13
14	LIB_DEPENDS= libcodec2.so:audio/codec2
15
16	USES= cmake compiler:c++11-lib
17	CMAKE_ARGS+= -DMACHINE_CPU:STRING="${MACHINE_CPU}" \
18	-DWRKDIR:STRING=${WRKDIR}
19
20	USE_GITHUB= yes
21	GH_ACCOUNT= drowe67
22	GH_PROJECT= LPCNet
23	GH_TAGNAME= 0dc5935
24
25	.include <bsd.port.pre.mk>
26	.include <bsd.cpu.mk>
27	.include <bsd.port.post.mk>

Added Link Here

(-)audio/lpcnet/files/patch-CMakeLists.txt (+86 lines)
1	--- CMakeLists.txt.orig 2021-06-29 09:04:36 UTC
2	+++ CMakeLists.txt
3	@@ -87,15 +87,32 @@ message(STATUS "Host system arch is: ${CMAKE_SYSTEM_PR
4	# Detection of available CPU optimizations
5	if(NOT DISABLE_CPU_OPTIMIZATION)
6	if(UNIX AND NOT APPLE)
7	- message(STATUS "Looking for available CPU optimizations on Linux/BSD system...")
8	- execute_process(COMMAND grep -c "avx2" /proc/cpuinfo
9	- OUTPUT_VARIABLE AVX2)
10	- execute_process(COMMAND grep -c "avx " /proc/cpuinfo
11	- OUTPUT_VARIABLE AVX)
12	- execute_process(COMMAND grep -c "sse4_1 " /proc/cpuinfo
13	- OUTPUT_VARIABLE SSE)
14	- execute_process(COMMAND grep -c "neon" /proc/cpuinfo
15	- OUTPUT_VARIABLE NEON)
16	+ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
17	+ message(STATUS "Looking for available CPU optimizations on FreeBSD system...")
18	+ message (STATUS "MACHINE_CPU = ${MACHINE_CPU}")
19	+ if (MACHINE_CPU MATCHES "avx")
20	+ set(AVX TRUE)
21	+ endif()
22	+ if (MACHINE_CPU MATCHES "avx2")
23	+ set(AVX2 TRUE)
24	+ endif()
25	+ if (MACHINE_CPU MATCHES "sse")
26	+ set(SSE TRUE)
27	+ endif()
28	+ if (MACHINE_CPU MATCHES "neon")
29	+ set(NEON TRUE)
30	+ endif()
31	+ else()
32	+ message(STATUS "Looking for available CPU optimizations on Linux system...")
33	+ execute_process(COMMAND grep -c "avx2" /proc/cpuinfo
34	+ OUTPUT_VARIABLE AVX2)
35	+ execute_process(COMMAND grep -c "avx " /proc/cpuinfo
36	+ OUTPUT_VARIABLE AVX)
37	+ execute_process(COMMAND grep -c "sse4_1 " /proc/cpuinfo
38	+ OUTPUT_VARIABLE SSE)
39	+ execute_process(COMMAND grep -c "neon" /proc/cpuinfo
40	+ OUTPUT_VARIABLE NEON)
41	+ endif()
42	elseif(APPLE)
43	if(BUILD_OSX_UNIVERSAL)
44	# Presume AVX/AVX2 are enabled on the x86 side. The ARM side will auto-enable
45	@@ -140,36 +157,12 @@ if(${NEON} OR ${NEON} GREATER 0)
46	endif()
47
48	# grab latest NN model (or substitute your own)
49	-set(LPCNET_ROOT http://rowetel.com/downloads/deep/)
50	-set(LPCNET_FILE lpcnet_191005_v1.0.tgz)
51	-set(LPCNET_URL ${LPCNET_ROOT}${LPCNET_FILE})
52	+# retrieved by port
53	+#set(LPCNET_ROOT http://rowetel.com/downloads/deep/)
54	+#set(LPCNET_FILE lpcnet_191005_v1.0.tgz)
55	+#set(LPCNET_URL ${LPCNET_ROOT}${LPCNET_FILE})
56
57	-if(EXISTS ${CMAKE_BINARY_DIR}/${LPCNET_FILE})
58	- set(lpcnet_SOURCE_DIR ${CMAKE_BINARY_DIR}/src)
59	- file(MAKE_DIRECTORY ${lpcnet_SOURCE_DIR})
60	- execute_process(COMMAND tar -xzf ${CMAKE_BINARY_DIR}/${LPCNET_FILE} -C ${CMAKE_BINARY_DIR}/src)
61	-
62	-# Work around not having the FetchContent module.
63	-elseif(CMAKE_VERSION VERSION_LESS 3.11.4)
64	- set(lpcnet_SOURCE_DIR ${CMAKE_BINARY_DIR}/src)
65	- if(NOT EXISTS ${lpcnet_SOURCE_DIR})
66	- file(DOWNLOAD ${LPCNET_URL}
67	- ${CMAKE_BINARY_DIR}/${LPCNET_FILE}
68	- SHOW_PROGRESS
69	- )
70	- file(MAKE_DIRECTORY ${lpcnet_SOURCE_DIR})
71	- execute_process(COMMAND tar -xzf ${CMAKE_BINARY_DIR}/${LPCNET_FILE} -C ${CMAKE_BINARY_DIR}/src)
72	- endif()
73	-else()
74	- include(FetchContent)
75	- FetchContent_Declare(
76	- lpcnet
77	- URL ${LPCNET_URL})
78	- FetchContent_GetProperties(lpcnet)
79	- if(NOT lpcnet_POPULATED)
80	- FetchContent_Populate(lpcnet)
81	- endif()
82	-endif()
83	+set(lpcnet_SOURCE_DIR ${WRKDIR})
84
85	# Find codec2
86	if(CODEC2_BUILD_DIR)