Fri Jun 19 13:17:59 2020 UTC ()
libmysofa: update to 1.1.

Add test dependencies and enable tests.

Changes:
    Support the change of the reference implementation to version 1.1.1
    (see sofacoustics/API_MO@fcd8d6a)
    Fixing the problem of left / right confusion common in many old SOFA files
    Support many more HDF features which are used in recent implementations of netcdf


(wiz)
diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/PLIST
diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt
cvs diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libmysofa/Makefile 2020/02/08 16:34:55 1.3
+++ pkgsrc/audio/libmysofa/Makefile 2020/06/19 13:17:59 1.4
@@ -1,22 +1,31 @@ @@ -1,22 +1,31 @@
1# $NetBSD: Makefile,v 1.3 2020/02/08 16:34:55 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2020/06/19 13:17:59 wiz Exp $
2 2
3DISTNAME= libmysofa-1.0 3DISTNAME= libmysofa-1.1
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=hoene/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=hoene/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/hoene/libmysofa 9HOMEPAGE= https://github.com/hoene/libmysofa
10COMMENT= Reader for AES SOFA HRTF files 10COMMENT= Reader for AES SOFA HRTF files
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
 13TEST_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
 14
13USE_CMAKE= yes 15USE_CMAKE= yes
14USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
15 17
16CMAKE_ARGS+= -Wno-dev 18CMAKE_ARGS+= -Wno-dev
17CMAKE_ARGS+= -DBUILD_TESTS=OFF 19#CMAKE_ARGS+= -DBUILD_TESTS=OFF
18 20
19PKGCONFIG_OVERRIDE+= libmysofa.pc.cmake 21PKGCONFIG_OVERRIDE+= libmysofa.pc.cmake
20 22
 23# 16 test failures as of 1.1
 24do-test:
 25 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ctest
 26
 27# for tests
 28BUILDLINK_DEPMETHOD.cunit= build
 29.include "../../devel/cunit/buildlink3.mk"
21.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/libmysofa/PLIST 2020/02/08 16:34:55 1.3
+++ pkgsrc/audio/libmysofa/PLIST 2020/06/19 13:17:59 1.4
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1@comment $NetBSD: PLIST,v 1.3 2020/02/08 16:34:55 nia Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/06/19 13:17:59 wiz Exp $
 2bin/mysofa2json
2include/mysofa.h 3include/mysofa.h
3lib/libmysofa.a 4lib/libmysofa.a
4lib/libmysofa.so 5lib/libmysofa.so
5lib/libmysofa.so.1 6lib/libmysofa.so.1
6lib/libmysofa.so.${PKGVERSION}.0 7lib/libmysofa.so.1.0.0
7lib/pkgconfig/libmysofa.pc 8lib/pkgconfig/libmysofa.pc
8share/libmysofa/MIT_KEMAR_normal_pinna.sofa 9share/libmysofa/MIT_KEMAR_normal_pinna.sofa
9share/libmysofa/default.sofa 10share/libmysofa/default.sofa
cvs diff -r1.3 -r1.4 pkgsrc/audio/libmysofa/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libmysofa/distinfo 2020/02/08 16:34:55 1.3
+++ pkgsrc/audio/libmysofa/distinfo 2020/06/19 13:17:59 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2020/02/08 16:34:55 nia Exp $ 1$NetBSD: distinfo,v 1.4 2020/06/19 13:17:59 wiz Exp $
2 2
3SHA1 (libmysofa-1.0.tar.gz) = 84825bb02b7e434ffeb5ef1319dc2761abd05086 3SHA1 (libmysofa-1.1.tar.gz) = 6dcad3417576c59eb77a88ac6362799e0247bf9a
4RMD160 (libmysofa-1.0.tar.gz) = a16db6164c8ff901c322353d7c65d6d3a30ce1f5 4RMD160 (libmysofa-1.1.tar.gz) = 2467dd23b458b487782cea19aaa476523a22b706
5SHA512 (libmysofa-1.0.tar.gz) = a6bb0c00a0e473c80db5db5afbb13eee2876587905c6660a23d3be35605d8dafadfa050921973039ca7af0c50eab61b9e8ba9c7ddae85bec96048d368c9ea757 5SHA512 (libmysofa-1.1.tar.gz) = 8feafbf447f21f3ef5a283f5f494a647dd5db47cc43af4cc26efeae9f8684c93f5aa1131d8c5570d1d7811c3e3b08763fabdfad2beff0858eeb3cb78dda22332
6Size (libmysofa-1.0.tar.gz) = 161384068 bytes 6Size (libmysofa-1.1.tar.gz) = 199816311 bytes
7SHA1 (patch-CMakeLists.txt) = 10d38c3518ddbdfe8c9aff915097931a157ed1a2 7SHA1 (patch-CMakeLists.txt) = b2432d0df7134ba607b54f2015437b0091efd92a
cvs diff -r1.2 -r1.3 pkgsrc/audio/libmysofa/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/libmysofa/patches/Attic/patch-CMakeLists.txt 2020/02/08 16:34:55 1.2
+++ pkgsrc/audio/libmysofa/patches/Attic/patch-CMakeLists.txt 2020/06/19 13:17:59 1.3
@@ -1,13 +1,92 @@ @@ -1,13 +1,92 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2020/02/08 16:34:55 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2020/06/19 13:17:59 wiz Exp $
2 2
3Don't need a C++ compiler. 3Don't need a C++ compiler.
4 4
5--- CMakeLists.txt.orig 2020-02-05 17:22:43.000000000 +0000 5--- CMakeLists.txt.orig 2020-06-13 15:02:13.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -1,5 +1,5 @@ 7@@ -1,5 +1,5 @@
8 cmake_minimum_required(VERSION 2.8) 8 cmake_minimum_required(VERSION 2.8)
9-project(libmysofa) 9-project(libmysofa)
10+project(libmysofa C) 10+project(libmysofa C)
11  11
12 include(CheckCCompilerFlag) 12 include(CheckCCompilerFlag)
13 include(GenerateExportHeader) 13 include(GenerateExportHeader)
 14@@ -48,19 +48,19 @@ if(BUILD_TESTS)
 15 enable_testing()
 16
 17 add_test(D1_48K_24bit_0.3s_FIR_SOFA src/mysofa2json
 18- ../tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa)
 19- add_test(H20_44K_16bit_256tap_FIR_SOFA ../tests/compareIgnoreNew.sh
 20- ../tests/H20_44K_16bit_256tap_FIR_SOFA)
 21- add_test(MIT_KEMAR_large_pinna ../tests/compare.sh
 22- ../tests/MIT_KEMAR_large_pinna)
 23- add_test(MIT_KEMAR_normal_pinna ../tests/compareIgnoreNew.sh
 24- ../tests/MIT_KEMAR_normal_pinna)
 25- add_test(MIT_KEMAR_normal_pinna.old ../tests/compare.sh
 26- ../tests/MIT_KEMAR_normal_pinna.old)
 27- add_test(dtf_nh2 ../tests/compareIgnoreNew.sh
 28- ../tests/dtf_nh2)
 29- add_test(hrtf_c_nh898 ../tests/compareIgnoreNew.sh
 30- ../tests/hrtf_c_nh898)
 31+ ${PROJECT_SOURCE_DIR}/tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa)
 32+ add_test(H20_44K_16bit_256tap_FIR_SOFA ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
 33+ ${PROJECT_SOURCE_DIR}/tests/H20_44K_16bit_256tap_FIR_SOFA)
 34+ add_test(MIT_KEMAR_large_pinna ${PROJECT_SOURCE_DIR}/tests/compare.sh
 35+ ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_large_pinna)
 36+ add_test(MIT_KEMAR_normal_pinna ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
 37+ ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_normal_pinna)
 38+ add_test(MIT_KEMAR_normal_pinna.old ${PROJECT_SOURCE_DIR}/tests/compare.sh
 39+ ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_normal_pinna.old)
 40+ add_test(dtf_nh2 ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
 41+ ${PROJECT_SOURCE_DIR}/tests/dtf_nh2)
 42+ add_test(hrtf_c_nh898 ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
 43+ ${PROJECT_SOURCE_DIR}/tests/hrtf_c_nh898)
 44 foreach(
 45 ISSUE
 46 72
 47@@ -72,26 +72,26 @@ if(BUILD_TESTS)
 48 83
 49 84)
 50 # issues with osx 96)
 51- add_test(fail-issue-${ISSUE} ../tests/notcrashed.sh
 52- ../tests/fail-issue-${ISSUE})
 53+ add_test(fail-issue-${ISSUE} ${PROJECT_SOURCE_DIR}/tests/notcrashed.sh
 54+ ${PROJECT_SOURCE_DIR}/tests/fail-issue-${ISSUE})
 55 endforeach(ISSUE)
 56- add_test(CIPIC_subject_003_hrir_final ../tests/compare.sh
 57- ../tests/CIPIC_subject_003_hrir_final)
 58- add_test(FHK_HRIR_L2354 ../tests/compare.sh ../tests/FHK_HRIR_L2354)
 59- add_test(LISTEN_1002_IRC_1002_C_HRIR ../tests/compare.sh
 60- ../tests/LISTEN_1002_IRC_1002_C_HRIR)
 61- add_test(Pulse ../tests/compare.sh ../tests/Pulse)
 62- add_test(Tester ../tests/compare.sh ../tests/tester)
 63- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ../tests/compare.sh
 64- ../tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m)
 65- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ../tests/compare.sh
 66- ../tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m)
 67- add_test(example_dummy_sofa48 ../tests/compare.sh
 68- ../tests/example_dummy_sofa48)
 69- add_test(TestSOFA48_netcdf472 ../tests/compare.sh
 70- ../tests/TestSOFA48_netcdf472)
 71- add_test(example_dummy_sofa48_with_user_defined_variable ../tests/compare.sh
 72- ../tests/example_dummy_sofa48_with_user_defined_variable)
 73+ add_test(CIPIC_subject_003_hrir_final ${PROJECT_SOURCE_DIR}/tests/compare.sh
 74+ ${PROJECT_SOURCE_DIR}/tests/CIPIC_subject_003_hrir_final)
 75+ add_test(FHK_HRIR_L2354 ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/FHK_HRIR_L2354)
 76+ add_test(LISTEN_1002_IRC_1002_C_HRIR ${PROJECT_SOURCE_DIR}/tests/compare.sh
 77+ ${PROJECT_SOURCE_DIR}/tests/LISTEN_1002_IRC_1002_C_HRIR)
 78+ add_test(Pulse ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/Pulse)
 79+ add_test(Tester ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/tester)
 80+ add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ${PROJECT_SOURCE_DIR}/tests/compare.sh
 81+ ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m)
 82+ add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ${PROJECT_SOURCE_DIR}/tests/compare.sh
 83+ ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m)
 84+ add_test(example_dummy_sofa48 ${PROJECT_SOURCE_DIR}/tests/compare.sh
 85+ ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48)
 86+ add_test(TestSOFA48_netcdf472 ${PROJECT_SOURCE_DIR}/tests/compare.sh
 87+ ${PROJECT_SOURCE_DIR}/tests/TestSOFA48_netcdf472)
 88+ add_test(example_dummy_sofa48_with_user_defined_variable ${PROJECT_SOURCE_DIR}/tests/compare.sh
 89+ ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48_with_user_defined_variable)
 90 endif(BUILD_TESTS)
 91
 92 add_subdirectory(src)