pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc ham/freedv: update to 1.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/58c18584d1fb
branches: trunk
changeset: 442755:58c18584d1fb
user: dbj <dbj%pkgsrc.org@localhost>
date: Sun Nov 29 23:14:20 2020 +0000
description:
ham/freedv: update to 1.4.2
diffstat:
doc/CHANGES-2020 | 3 +-
doc/TODO | 3 +-
ham/freedv/Makefile | 33 +++++++++++----
ham/freedv/PLIST.Darwin | 6 ++
ham/freedv/distinfo | 14 +++---
ham/freedv/patches/patch-cmake_FindPortaudio.cmake | 24 +++++++++++
ham/freedv/patches/patch-src_CMakeLists.txt | 47 ++++++++++-----------
ham/freedv/patches/patch-src_sox__biquad.c | 26 ------------
8 files changed, 87 insertions(+), 69 deletions(-)
diffs (242 lines):
diff -r 0b32fdd80d6e -r 58c18584d1fb doc/CHANGES-2020
--- a/doc/CHANGES-2020 Sun Nov 29 23:12:43 2020 +0000
+++ b/doc/CHANGES-2020 Sun Nov 29 23:14:20 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.6482 2020/11/29 23:12:43 dbj Exp $
+$NetBSD: CHANGES-2020,v 1.6483 2020/11/29 23:14:20 dbj Exp $
Changes to the packages collection and infrastructure in 2020:
@@ -9454,3 +9454,4 @@
Updated sysutils/ddrescue to 1.25 [dbj 2020-11-29]
Updated ham/codec2 to 0.9.2 [dbj 2020-11-29]
Added ham/lpcnetfreedv-0.2 [dbj 2020-11-29]
+ Updated ham/freedv to 1.4.2 [dbj 2020-11-29]
diff -r 0b32fdd80d6e -r 58c18584d1fb doc/TODO
--- a/doc/TODO Sun Nov 29 23:12:43 2020 +0000
+++ b/doc/TODO Sun Nov 29 23:14:20 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.20237 2020/11/29 21:58:03 dbj Exp $
+$NetBSD: TODO,v 1.20238 2020/11/29 23:14:20 dbj Exp $
Suggested new packages
======================
@@ -561,7 +561,6 @@
o flashplayer-0.4.13
o flow-tools-0.411
o fortunes-calvin-0.3
- o freedv-1.2.2
o freenet-0.7
o freesci-0.6.4
o freeswitch-1.2.3
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/Makefile
--- a/ham/freedv/Makefile Sun Nov 29 23:12:43 2020 +0000
+++ b/ham/freedv/Makefile Sun Nov 29 23:14:20 2020 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2020/08/18 17:58:03 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/11/29 23:14:20 dbj Exp $
-DISTNAME= freedv-1.1
-PKGREVISION= 13
+DISTNAME= freedv-1.4.2
CATEGORIES= ham
-MASTER_SITES= http://files.freedv.org/freedv/
-EXTRACT_SUFX= .tar.xz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=drowe67/}
+GITHUB_PROJECT= freedv-gui
+GITHUB_TAG= bb9558cc496b7b253fb54bb28486b0bcd7516ae5
MAINTAINER= dbj%NetBSD.org@localhost
HOMEPAGE= https://freedv.org/
COMMENT= FreeDV: HF Digital Voice for Radio Amateurs
-
LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= pkg-config
@@ -18,23 +17,39 @@
USE_CMAKE= yes
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DUSE_STATIC_CODEC2=FALSE
-CMAKE_ARGS+= -DUSE_STATIC_SPEEXDSP=FALSE
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.include "../../mk/bsd.prefs.mk"
PLIST_VARS+= icons
.if ${OPSYS} != "Darwin"
PLIST.icons= yes
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.else
+post-build:
+ cd ${WRKSRC}/build/src && \
+ ver="$$(sed -n -e 's/^\#define FREEDV_VERSION "\(.*\)"$$/\1/p' version.h)" && \
+ /usr/libexec/PlistBuddy \
+ -c 'Set CFBundleShortVersionString "'"$${ver}"'"' \
+ -c 'Set CFBundleExecutable FreeDV' \
+ FreeDV.app/Contents/info.plist
+INSTALLATION_DIRS+= Applications
+USE_TOOLS+= pax
+post-install:
+ cd ${WRKSRC}/build/src && \
+ pax -rw -pp -pm FreeDV.app ${DESTDIR}${PREFIX}/Applications
.endif
pre-configure:
${MKDIR} ${WRKSRC}/build
.include "../../ham/codec2/buildlink3.mk"
+.include "../../ham/lpcnetfreedv/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
-.include "../../audio/sox/buildlink3.mk"
+# freedv 1.4.2 seems to only use included static sox
+#.include "../../audio/sox/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/PLIST.Darwin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/freedv/PLIST.Darwin Sun Nov 29 23:14:20 2020 +0000
@@ -0,0 +1,6 @@
+@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
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/distinfo
--- a/ham/freedv/distinfo Sun Nov 29 23:12:43 2020 +0000
+++ b/ham/freedv/distinfo Sun Nov 29 23:14:20 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/01/19 04:03:21 dbj Exp $
+$NetBSD: distinfo,v 1.5 2020/11/29 23:14:20 dbj Exp $
-SHA1 (freedv-1.1.tar.xz) = ec98a60e04c4eafb112793028468345d9f8aed55
-RMD160 (freedv-1.1.tar.xz) = c2be5877a7a8865581aff8badb1bb6441f8fdc0b
-SHA512 (freedv-1.1.tar.xz) = bd149f74ceae9c63b23c37d2e6d876238b9c1759d8bd1213675d3d0d2f817863e952129306ca37da9f41297b17a9f74d57cb807689ef051b3d94a8f8b52b5727
-Size (freedv-1.1.tar.xz) = 424420 bytes
-SHA1 (patch-src_CMakeLists.txt) = 6dc34dbc89394c92afbb435d8b06bd76603cc5d2
-SHA1 (patch-src_sox__biquad.c) = b59975d6590cddacd3978759b254ce54894c1a7b
+SHA1 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = d3248a3b32b6772bc6c072d2f01bffaae6699dd8
+RMD160 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 311c0e1022e28fd24361c2ef6f9276f68b5493c1
+SHA512 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) =
fc7589606a208938129ad622966fa108e4c1ee84a86273a1b33705331282e811f7891bbc47528e475742a9b78f4dbc78cc1d84c13e1784b7923de9babf60171d
+Size (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 6177996 bytes
+SHA1 (patch-cmake_FindPortaudio.cmake) = 1105012bc3287bd5044250ad6f1c4609cbf7c217
+SHA1 (patch-src_CMakeLists.txt) = 05636fb3c3f836fb8287b16147f5e99a745fb265
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/patches/patch-cmake_FindPortaudio.cmake
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/freedv/patches/patch-cmake_FindPortaudio.cmake Sun Nov 29 23:14:20 2020 +0000
@@ -0,0 +1,24 @@
+$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
+ )
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/patches/patch-src_CMakeLists.txt
--- a/ham/freedv/patches/patch-src_CMakeLists.txt Sun Nov 29 23:12:43 2020 +0000
+++ b/ham/freedv/patches/patch-src_CMakeLists.txt Sun Nov 29 23:14:20 2020 +0000
@@ -1,30 +1,29 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/01/19 04:03:21 dbj Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/11/29 23:14:21 dbj Exp $
+
+Don't use dylibbundler to package up the MacOS app. We don't
+currently have this tool in tree, although that's fixable.
+(For example: https://github.com/auriamg/macdylibbundler)
-Disable building App bundle on MacOS. This isn't very useful
-unless we have a native version wxWidgets, which we don't at the
-moment.
+However, we do build a non-bundled MacOS application similar to how
+Emacs.app is built in pkgsrc.
---- src/CMakeLists.txt.orig 2015-08-30 10:27:14.000000000 +0000
+Also, don't make the disk image.
+
+--- src/CMakeLists.txt.orig 2020-07-18 23:16:05.000000000 +0000
+++ src/CMakeLists.txt
-@@ -43,21 +43,3 @@ endif(FREEDV_STATIC_DEPS)
- install(TARGETS freedv
- RUNTIME DESTINATION bin)
-
--# Custom commands to build OSX images.
--if(APPLE)
-- add_custom_command(
-- TARGET freedv
-- POST_BUILD
-- COMMAND mkdir ARGS -p FreeDV.app/Contents/MacOS
-- COMMAND mkdir ARGS -p FreeDV.app/Contents/Resources/English.lproj
-- COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/info.plist FreeDV.app/Contents
-- COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
-- COMMAND echo ARGS -n "APPL????" > FreeDV.app/Contents/PkgInfo
-- COMMAND cp ARGS freedv FreeDV.app/Contents/MacOS/FreeDV
-- COMMAND dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @executable_path/../libs/
+@@ -112,10 +112,10 @@ if(APPLE)
+ COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
+ COMMAND echo ARGS -n "APPL????" > FreeDV.app/Contents/PkgInfo
+ COMMAND cp ARGS freedv FreeDV.app/Contents/MacOS/FreeDV
+- 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/
- COMMAND mkdir dist_tmp
- COMMAND cp -r FreeDV.app dist_tmp
-- COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO ./FreeDV.dmg
+- COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO -fs HFS+ ./FreeDV.dmg
- COMMAND rm -rf dist_tmp
-- )
--endif(APPLE)
++ #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/
++ #COMMAND mkdir dist_tmp
++ #COMMAND cp -r FreeDV.app dist_tmp
++ #COMMAND hdiutil create -srcfolder dist_tmp/ -volname FreeDV -format UDZO -fs HFS+ ./FreeDV.dmg
++ #COMMAND rm -rf dist_tmp
+ )
+ endif(APPLE)
diff -r 0b32fdd80d6e -r 58c18584d1fb ham/freedv/patches/patch-src_sox__biquad.c
--- a/ham/freedv/patches/patch-src_sox__biquad.c Sun Nov 29 23:12:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_sox__biquad.c,v 1.1 2016/01/19 04:03:21 dbj Exp $
-
-Avoid calling a sox internal function that is no longer
-exported by the library.
-
---- src/sox_biquad.c.orig 2014-06-04 11:05:20.000000000 +0000
-+++ src/sox_biquad.c
-@@ -34,9 +34,6 @@
-
- #define N_MAX 1024
-
--int lsx_biquad_flow(sox_effect_t * effp, const sox_sample_t *ibuf,
-- sox_sample_t *obuf, size_t *isamp, size_t *osamp);
--
- void sox_biquad_start(void)
- {
- int r = sox_init();
-@@ -94,7 +91,7 @@ void sox_biquad_filter(void *sbq, short
- for(i=0; i<n; i++)
- ibuf[i] = SOX_SIGNED_16BIT_TO_SAMPLE(in[i], clips);
- isamp = osamp = (unsigned int)n;
-- lsx_biquad_flow(e, ibuf, obuf, &isamp, &osamp);
-+ e->handler.flow(e, ibuf, obuf, &isamp, &osamp);
- for(i=0; i<n; i++)
- out[i] = SOX_SAMPLE_TO_SIGNED_16BIT(obuf[i], clips);
- }
Home |
Main Index |
Thread Index |
Old Index