FreeBSD Bugzilla – Attachment 234794 Details for
Bug 264769
comms/freedv: update to 1.7.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Third time patch is right
freedv_update.diff (text/plain), 8.14 KB, created by
Diane Bruce
on 2022-06-19 19:22:32 UTC
(
hide
)
Description:
Third time patch is right
Filename:
MIME Type:
Creator:
Diane Bruce
Created:
2022-06-19 19:22:32 UTC
Size:
8.14 KB
patch
obsolete
>diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile >index 06f0a232a75e..b06a9672ae5a 100644 >--- a/audio/codec2/Makefile >+++ b/audio/codec2/Makefile >@@ -1,7 +1,6 @@ > PORTNAME= codec2 > DISTVERSIONPREFIX=v > DISTVERSION= 1.0.3 >-PORTREVISION= 1 > CATEGORIES= audio hamradio > > MAINTAINER= hamradio@FreeBSD.org >diff --git a/comms/freedv/Makefile b/comms/freedv/Makefile >index e6e5a4ea808b..2a66cf1203e9 100644 >--- a/comms/freedv/Makefile >+++ b/comms/freedv/Makefile >@@ -1,27 +1,30 @@ > PORTNAME= freedv >-DISTVERSION= 1.3.1 >-PORTREVISION= 6 >+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 >+ 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 \ >diff --git a/comms/freedv/distinfo b/comms/freedv/distinfo >index 0d01d70db8fa..6a86d71feac0 100644 >--- a/comms/freedv/distinfo >+++ b/comms/freedv/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1535511699 >-SHA256 (freedv-1.3.1.tar.xz) = 9365459d4c8d478d32d91629f6fdf0cb6bd27cbb71ddc5a09b37e10df03dff65 >-SIZE (freedv-1.3.1.tar.xz) = 536864 >+TIMESTAMP = 1655664601 >+SHA256 (drowe67-freedv-gui-v1.7.0_GH0.tar.gz) = 20ead8b37b0d42710226d2902f7fc0898de631fb28353ab6b018556117121ca8 >+SIZE (drowe67-freedv-gui-v1.7.0_GH0.tar.gz) = 9477053 >diff --git a/comms/freedv/pkg-descr b/comms/freedv/pkg-descr >index 329dfdac6b8b..22db75454e42 100644 >--- a/comms/freedv/pkg-descr >+++ b/comms/freedv/pkg-descr >@@ -6,4 +6,4 @@ is received by an SSB radio, then demodulated and decoded by FreeDV. FreeDV > 700(B) rivals SSB in it's low SNR performance. At high SNRs FreeDV 1600 > sounds like FM, with no annoying analog HF radio noise. > >-WWW: https://freedv.org/ >+WWW: http://freedv.org/tiki-index.php >--- /dev/null 2022-06-19 15:15:13.763057000 -0400 >+++ audio/lpcnet/Makefile 2022-01-06 19:32:48.000000000 -0500 >@@ -0,0 +1,27 @@ >+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> >--- /dev/null 2022-06-19 15:17:06.876802000 -0400 >+++ audio/lpcnet/distinfo 2022-01-06 10:40:40.000000000 -0500 >@@ -0,0 +1,7 @@ >+TIMESTAMP = 1641483640 >+SHA256 (lpcnet_191005_v1.0.tgz) = 509440924751fdd87ffaa5683ee3dddd937af5c833b9104ccce65d51614926c8 >+SIZE (lpcnet_191005_v1.0.tgz) = 18396516 >+SHA256 (lpcnet-20210629.tar.gz) = 31a687ac5e822c6c2cf75fe8e7371a5cd834d692635a802ec8fd33dc340d9cf2 >+SIZE (lpcnet-20210629.tar.gz) = 33016759 >+SHA256 (drowe67-LPCNet-20210629-0dc5935_GH0.tar.gz) = 31a687ac5e822c6c2cf75fe8e7371a5cd834d692635a802ec8fd33dc340d9cf2 >+SIZE (drowe67-LPCNet-20210629-0dc5935_GH0.tar.gz) = 33016759 >--- /dev/null 2022-06-19 15:17:22.643713000 -0400 >+++ audio/lpcnet/pkg-descr 2021-12-21 10:53:30.000000000 -0500 >@@ -0,0 +1,6 @@ >+Experimental version of LPCNet that has been used to develop FreeDV 2020 >+- a HF radio Digial Voice mode for over the air experimentation with >+Neural Net speech coding. Possibly the first use of Neural Net speech >+coding in real world operation. >+ >+WWW: http://freedv.org/tiki-index.php >--- /dev/null 2022-06-19 15:17:38.790955000 -0400 >+++ audio/lpcnet/pkg-plist 2021-12-31 22:25:47.000000000 -0500 >@@ -0,0 +1,7 @@ >+bin/lpcnet_dec >+bin/lpcnet_enc >+include/lpcnet/lpcnet_freedv.h >+lib/cmake/lpcnetfreedv/lpcnetfreedv-config-%%CMAKE_BUILD_TYPE%%.cmake >+lib/cmake/lpcnetfreedv/lpcnetfreedv-config.cmake >+lib/liblpcnetfreedv.so >+lib/liblpcnetfreedv.so.0.2 >--- /dev/null 2022-06-19 15:18:13.989152000 -0400 >+++ audio/lpcnet/files/patch-CMakeLists.txt 2022-01-06 19:22:44.000000000 -0500 >@@ -0,0 +1,86 @@ >+--- 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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 264769
:
234792
|
234793
| 234794