Sun Nov 29 23:14:21 2020 UTC ()
ham/freedv: update to 1.4.2


(dbj)
diff -r1.6482 -r1.6483 pkgsrc/doc/CHANGES-2020
diff -r1.20237 -r1.20238 pkgsrc/doc/TODO
diff -r1.22 -r1.23 pkgsrc/ham/freedv/Makefile
diff -r0 -r1.1 pkgsrc/ham/freedv/PLIST.Darwin
diff -r1.4 -r1.5 pkgsrc/ham/freedv/distinfo
diff -r0 -r1.1 pkgsrc/ham/freedv/patches/patch-cmake_FindPortaudio.cmake
diff -r1.1 -r1.2 pkgsrc/ham/freedv/patches/patch-src_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/ham/freedv/patches/patch-src_sox__biquad.c
cvs diff -r1.6482 -r1.6483 pkgsrc/doc/CHANGES-2020 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2020 2020/11/29 23:12:43 1.6482
+++ pkgsrc/doc/CHANGES-2020 2020/11/29 23:14:20 1.6483
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2020,v 1.6482 2020/11/29 23:12:43 dbj Exp $ 1$NetBSD: CHANGES-2020,v 1.6483 2020/11/29 23:14:20 dbj Exp $
2 2
3Changes to the packages collection and infrastructure in 2020: 3Changes to the packages collection and infrastructure in 2020:
4 4
5 Updated devel/p5-Date-Manip to 6.79 [mef 2020-01-01] 5 Updated devel/p5-Date-Manip to 6.79 [mef 2020-01-01]
6 Updated devel/p5-IO-Async to 0.75 [mef 2020-01-01] 6 Updated devel/p5-IO-Async to 0.75 [mef 2020-01-01]
7 Updated devel/samurai to 1.0 [ng0 2020-01-01] 7 Updated devel/samurai to 1.0 [ng0 2020-01-01]
8 Updated www/nsm to 1.25 [ng0 2020-01-01] 8 Updated www/nsm to 1.25 [ng0 2020-01-01]
9 Updated textproc/json-yaml to 1.2.1 [sjmulder 2020-01-01] 9 Updated textproc/json-yaml to 1.2.1 [sjmulder 2020-01-01]
10 Updated security/doas to 6.2p4 [ng0 2020-01-01] 10 Updated security/doas to 6.2p4 [ng0 2020-01-01]
11 Updated devel/p5-B-Keywords to 1.21 [mef 2020-01-01] 11 Updated devel/p5-B-Keywords to 1.21 [mef 2020-01-01]
12 Updated devel/p5-EV to 4.31 [mef 2020-01-01] 12 Updated devel/p5-EV to 4.31 [mef 2020-01-01]
13 Updated security/sudo to 1.8.30 [kim 2020-01-01] 13 Updated security/sudo to 1.8.30 [kim 2020-01-01]
14 Removed graphics/qiviewer [kamil 2020-01-01] 14 Removed graphics/qiviewer [kamil 2020-01-01]
@@ -9444,13 +9444,14 @@ Changes to the packages collection and i @@ -9444,13 +9444,14 @@ Changes to the packages collection and i
9444 Updated graphics/ImageMagick to 7.0.10.44 [wiz 2020-11-29] 9444 Updated graphics/ImageMagick to 7.0.10.44 [wiz 2020-11-29]
9445 Updated textproc/pugixml to 1.11 [wiz 2020-11-29] 9445 Updated textproc/pugixml to 1.11 [wiz 2020-11-29]
9446 Updated x11/libxkbcommon to 1.0.3 [wiz 2020-11-29] 9446 Updated x11/libxkbcommon to 1.0.3 [wiz 2020-11-29]
9447 Updated devel/ninja-build to 1.10.2 [wiz 2020-11-29] 9447 Updated devel/ninja-build to 1.10.2 [wiz 2020-11-29]
9448 Updated devel/py-hypothesis to 5.41.4 [wiz 2020-11-29] 9448 Updated devel/py-hypothesis to 5.41.4 [wiz 2020-11-29]
9449 Updated sysutils/py-setproctitle to 1.2 [wiz 2020-11-29] 9449 Updated sysutils/py-setproctitle to 1.2 [wiz 2020-11-29]
9450 Updated converters/utf8proc to 2.6.0 [wiz 2020-11-29] 9450 Updated converters/utf8proc to 2.6.0 [wiz 2020-11-29]
9451 Updated security/mozilla-rootcerts-openssl to 2.5 [wiz 2020-11-29] 9451 Updated security/mozilla-rootcerts-openssl to 2.5 [wiz 2020-11-29]
9452 Added x11/unibar version 0.1.3 [pin 2020-11-29] 9452 Added x11/unibar version 0.1.3 [pin 2020-11-29]
9453 Updated shells/oksh to 6.8.1 [schmonz 2020-11-29] 9453 Updated shells/oksh to 6.8.1 [schmonz 2020-11-29]
9454 Updated sysutils/ddrescue to 1.25 [dbj 2020-11-29] 9454 Updated sysutils/ddrescue to 1.25 [dbj 2020-11-29]
9455 Updated ham/codec2 to 0.9.2 [dbj 2020-11-29] 9455 Updated ham/codec2 to 0.9.2 [dbj 2020-11-29]
9456 Added ham/lpcnetfreedv-0.2 [dbj 2020-11-29] 9456 Added ham/lpcnetfreedv-0.2 [dbj 2020-11-29]
 9457 Updated ham/freedv to 1.4.2 [dbj 2020-11-29]
cvs diff -r1.20237 -r1.20238 pkgsrc/doc/TODO (expand / switch to unified diff)

--- pkgsrc/doc/TODO 2020/11/29 21:58:03 1.20237
+++ pkgsrc/doc/TODO 2020/11/29 23:14:20 1.20238
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: TODO,v 1.20237 2020/11/29 21:58:03 dbj Exp $ 1$NetBSD: TODO,v 1.20238 2020/11/29 23:14:20 dbj Exp $
2 2
3Suggested new packages 3Suggested new packages
4====================== 4======================
5 5
6 Any unresolved PRs (if you have commit access) 6 Any unresolved PRs (if you have commit access)
7 http://gnats.NetBSD.org/summary/category/pkg.html 7 http://gnats.NetBSD.org/summary/category/pkg.html
8 8
9 Any complete, polished packages in pkgsrc-wip (ditto) 9 Any complete, polished packages in pkgsrc-wip (ditto)
10 https://www.pkgsrc.org/wip/ 10 https://www.pkgsrc.org/wip/
11 11
12 Any interesting packages in FreeBSD's ports. 12 Any interesting packages in FreeBSD's ports.
13 http://freshports.org/ 13 http://freshports.org/
14 14
@@ -551,27 +551,26 @@ For possible Perl packages updates, see  @@ -551,27 +551,26 @@ For possible Perl packages updates, see
551 o evolution-mapi-0.32.2 551 o evolution-mapi-0.32.2
552 o ex-20050325 552 o ex-20050325
553 o exmh-2.8.0 553 o exmh-2.8.0
554 o faces-1.7.7 554 o faces-1.7.7
555 o facter-2.4.5 555 o facter-2.4.5
556 o fakeroot-1.6.5 556 o fakeroot-1.6.5
557 o felt-3.07 [wip] 557 o felt-3.07 [wip]
558 o fet-5.28.6 558 o fet-5.28.6
559 o fetchyahoo-2.14.0 559 o fetchyahoo-2.14.0
560 o filerunner-14.06.18.10 560 o filerunner-14.06.18.10
561 o flashplayer-0.4.13 561 o flashplayer-0.4.13
562 o flow-tools-0.411 562 o flow-tools-0.411
563 o fortunes-calvin-0.3 563 o fortunes-calvin-0.3
564 o freedv-1.2.2 
565 o freenet-0.7 564 o freenet-0.7
566 o freesci-0.6.4 565 o freesci-0.6.4
567 o freeswitch-1.2.3 566 o freeswitch-1.2.3
568 o freetds-1.2.5 567 o freetds-1.2.5
569 o freetype-lib-1.5.20050518 568 o freetype-lib-1.5.20050518
570 o freetype-utils-1.5.20050518 569 o freetype-utils-1.5.20050518
571 o freewais-sf-2.2.14 570 o freewais-sf-2.2.14
572 o frink-2.3.1a2 571 o frink-2.3.1a2
573 o ftplibpp-2.0.2 572 o ftplibpp-2.0.2
574 o fuse-archivemount-0.8.7 573 o fuse-archivemount-0.8.7
575 o fuse-bindfs-1.13.7 574 o fuse-bindfs-1.13.7
576 o fuse-mp3fs-0.91 [needs fixes to work on NetBSD; started in wip] 575 o fuse-mp3fs-0.91 [needs fixes to work on NetBSD; started in wip]
577 o fvwm-devel-2.7.0 576 o fvwm-devel-2.7.0
cvs diff -r1.22 -r1.23 pkgsrc/ham/freedv/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/freedv/Makefile 2020/08/18 17:58:03 1.22
+++ pkgsrc/ham/freedv/Makefile 2020/11/29 23:14:20 1.23
@@ -1,40 +1,55 @@ @@ -1,40 +1,55 @@
1# $NetBSD: Makefile,v 1.22 2020/08/18 17:58:03 leot Exp $ 1# $NetBSD: Makefile,v 1.23 2020/11/29 23:14:20 dbj Exp $
2 2
3DISTNAME= freedv-1.1 3DISTNAME= freedv-1.4.2
4PKGREVISION= 13 
5CATEGORIES= ham 4CATEGORIES= ham
6MASTER_SITES= http://files.freedv.org/freedv/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=drowe67/}
7EXTRACT_SUFX= .tar.xz 6GITHUB_PROJECT= freedv-gui
 7GITHUB_TAG= bb9558cc496b7b253fb54bb28486b0bcd7516ae5
8 8
9MAINTAINER= dbj@NetBSD.org 9MAINTAINER= dbj@NetBSD.org
10HOMEPAGE= https://freedv.org/ 10HOMEPAGE= https://freedv.org/
11COMMENT= FreeDV: HF Digital Voice for Radio Amateurs 11COMMENT= FreeDV: HF Digital Voice for Radio Amateurs
12 
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16
18USE_CMAKE= yes 17USE_CMAKE= yes
19CONFIGURE_DIRS= build 18CONFIGURE_DIRS= build
20CMAKE_ARG_PATH= .. 19CMAKE_ARG_PATH= ..
21CMAKE_ARGS+= -DUSE_STATIC_CODEC2=FALSE 20CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
22CMAKE_ARGS+= -DUSE_STATIC_SPEEXDSP=FALSE 
23 21
24.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
25 23
26PLIST_VARS+= icons 24PLIST_VARS+= icons
27.if ${OPSYS} != "Darwin" 25.if ${OPSYS} != "Darwin"
28PLIST.icons= yes 26PLIST.icons= yes
 27.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 28.else
 29post-build:
 30 cd ${WRKSRC}/build/src && \
 31 ver="$$(sed -n -e 's/^\#define FREEDV_VERSION "\(.*\)"$$/\1/p' version.h)" && \
 32 /usr/libexec/PlistBuddy \
 33 -c 'Set CFBundleShortVersionString "'"$${ver}"'"' \
 34 -c 'Set CFBundleExecutable FreeDV' \
 35 FreeDV.app/Contents/info.plist
 36INSTALLATION_DIRS+= Applications
 37USE_TOOLS+= pax
 38post-install:
 39 cd ${WRKSRC}/build/src && \
 40 pax -rw -pp -pm FreeDV.app ${DESTDIR}${PREFIX}/Applications
29.endif 41.endif
30pre-configure: 42pre-configure:
31 ${MKDIR} ${WRKSRC}/build 43 ${MKDIR} ${WRKSRC}/build
32 44
33.include "../../ham/codec2/buildlink3.mk" 45.include "../../ham/codec2/buildlink3.mk"
 46.include "../../ham/lpcnetfreedv/buildlink3.mk"
34.include "../../ham/hamlib/buildlink3.mk" 47.include "../../ham/hamlib/buildlink3.mk"
35.include "../../audio/sox/buildlink3.mk" 48# freedv 1.4.2 seems to only use included static sox
 49#.include "../../audio/sox/buildlink3.mk"
36.include "../../audio/speexdsp/buildlink3.mk" 50.include "../../audio/speexdsp/buildlink3.mk"
37.include "../../audio/portaudio/buildlink3.mk" 51.include "../../audio/portaudio/buildlink3.mk"
38.include "../../audio/libsamplerate/buildlink3.mk" 52.include "../../audio/libsamplerate/buildlink3.mk"
 53.include "../../audio/libsndfile/buildlink3.mk"
39.include "../../x11/wxGTK30/buildlink3.mk" 54.include "../../x11/wxGTK30/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/ham/freedv/PLIST.Darwin
@comment $NetBSD: PLIST.Darwin,v 1.1 2020/11/29 23:14:20 dbj Exp $
Applications/FreeDV.app/Contents/MacOS/FreeDV
Applications/FreeDV.app/Contents/PkgInfo
@pkgdir Applications/FreeDV.app/Contents/Resources/English.lproj
Applications/FreeDV.app/Contents/Resources/freedv.icns
Applications/FreeDV.app/Contents/info.plist
cvs diff -r1.4 -r1.5 pkgsrc/ham/freedv/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/freedv/distinfo 2016/01/19 04:03:21 1.4
+++ pkgsrc/ham/freedv/distinfo 2020/11/29 23:14:20 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2016/01/19 04:03:21 dbj Exp $ 1$NetBSD: distinfo,v 1.5 2020/11/29 23:14:20 dbj Exp $
2 2
3SHA1 (freedv-1.1.tar.xz) = ec98a60e04c4eafb112793028468345d9f8aed55 3SHA1 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = d3248a3b32b6772bc6c072d2f01bffaae6699dd8
4RMD160 (freedv-1.1.tar.xz) = c2be5877a7a8865581aff8badb1bb6441f8fdc0b 4RMD160 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 311c0e1022e28fd24361c2ef6f9276f68b5493c1
5SHA512 (freedv-1.1.tar.xz) = bd149f74ceae9c63b23c37d2e6d876238b9c1759d8bd1213675d3d0d2f817863e952129306ca37da9f41297b17a9f74d57cb807689ef051b3d94a8f8b52b5727 5SHA512 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = fc7589606a208938129ad622966fa108e4c1ee84a86273a1b33705331282e811f7891bbc47528e475742a9b78f4dbc78cc1d84c13e1784b7923de9babf60171d
6Size (freedv-1.1.tar.xz) = 424420 bytes 6Size (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 6177996 bytes
7SHA1 (patch-src_CMakeLists.txt) = 6dc34dbc89394c92afbb435d8b06bd76603cc5d2 7SHA1 (patch-cmake_FindPortaudio.cmake) = 1105012bc3287bd5044250ad6f1c4609cbf7c217
8SHA1 (patch-src_sox__biquad.c) = b59975d6590cddacd3978759b254ce54894c1a7b 8SHA1 (patch-src_CMakeLists.txt) = 05636fb3c3f836fb8287b16147f5e99a745fb265
File Added: pkgsrc/ham/freedv/patches/patch-cmake_FindPortaudio.cmake
$NetBSD: patch-cmake_FindPortaudio.cmake,v 1.1 2020/11/29 23:14:21 dbj Exp $

Remove special case Darwin search for portaudio that was
seting the wrong path to the libraries

--- cmake/FindPortaudio.cmake.orig	2019-11-11 21:00:04.000000000 +0000
+++ cmake/FindPortaudio.cmake
@@ -27,13 +27,9 @@ else (PORTAUDIO_LIBRARIES AND PORTAUDIO_
     set(PORTAUDIO_INCLUDE_DIRS
       ${PORTAUDIO2_INCLUDE_DIRS}
     )
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      set(PORTAUDIO_LIBRARIES "${PORTAUDIO2_LIBRARY_DIRS}/lib${PORTAUDIO2_LIBRARIES}.dylib")
-    else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      set(PORTAUDIO_LIBRARIES
-        ${PORTAUDIO2_LIBRARIES}
-      )
-    endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(PORTAUDIO_LIBRARIES
+      ${PORTAUDIO2_LIBRARIES}
+    )
     set(PORTAUDIO_VERSION
       19
     )
cvs diff -r1.1 -r1.2 pkgsrc/ham/freedv/patches/patch-src_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/ham/freedv/patches/patch-src_CMakeLists.txt 2016/01/19 04:03:21 1.1
+++ pkgsrc/ham/freedv/patches/patch-src_CMakeLists.txt 2020/11/29 23:14:21 1.2
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/01/19 04:03:21 dbj Exp $ 1$NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/11/29 23:14:21 dbj Exp $
2 2
3Disable building App bundle on MacOS. This isn't very useful 3Don't use dylibbundler to package up the MacOS app. We don't
4unless we have a native version wxWidgets, which we don't at the 4currently have this tool in tree, although that's fixable.
5moment. 5(For example: https://github.com/auriamg/macdylibbundler)
6 6
7--- src/CMakeLists.txt.orig 2015-08-30 10:27:14.000000000 +0000 7However, we do build a non-bundled MacOS application similar to how
 8Emacs.app is built in pkgsrc.
 9
 10Also, don't make the disk image.
 11
 12--- src/CMakeLists.txt.orig 2020-07-18 23:16:05.000000000 +0000
8+++ src/CMakeLists.txt 13+++ src/CMakeLists.txt
9@@ -43,21 +43,3 @@ endif(FREEDV_STATIC_DEPS) 14@@ -112,10 +112,10 @@ if(APPLE)
10 install(TARGETS freedv 15 COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
11 RUNTIME DESTINATION bin) 16 COMMAND echo ARGS -n "APPL????" > FreeDV.app/Contents/PkgInfo
12  17 COMMAND cp ARGS freedv FreeDV.app/Contents/MacOS/FreeDV
13-# Custom commands to build OSX images. 18- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${LPCNET_BUILD_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/
14-if(APPLE) 
15- add_custom_command( 
16- TARGET freedv 
17- POST_BUILD 
18- COMMAND mkdir ARGS -p FreeDV.app/Contents/MacOS 
19- COMMAND mkdir ARGS -p FreeDV.app/Contents/Resources/English.lproj 
20- COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/info.plist FreeDV.app/Contents 
21- COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources 
22- COMMAND echo ARGS -n "APPL????" > FreeDV.app/Contents/PkgInfo 
23- COMMAND cp ARGS freedv FreeDV.app/Contents/MacOS/FreeDV 
24- COMMAND dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @executable_path/../libs/ 
25- COMMAND mkdir dist_tmp 19- COMMAND mkdir dist_tmp
26- COMMAND cp -r FreeDV.app dist_tmp 20- COMMAND cp -r FreeDV.app dist_tmp
27- COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO ./FreeDV.dmg 21- COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO -fs HFS+ ./FreeDV.dmg
28- COMMAND rm -rf dist_tmp 22- COMMAND rm -rf dist_tmp
29- ) 23+ #COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${LPCNET_BUILD_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/
30-endif(APPLE) 24+ #COMMAND mkdir dist_tmp
 25+ #COMMAND cp -r FreeDV.app dist_tmp
 26+ #COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO -fs HFS+ ./FreeDV.dmg
 27+ #COMMAND rm -rf dist_tmp
 28 )
 29 endif(APPLE)
File Deleted: pkgsrc/ham/freedv/patches/Attic/patch-src_sox__biquad.c