CVS commit: pkgsrc/audio/libmysofa

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun 19 13:17:59 UTC 2020

Modified Files:
        pkgsrc/audio/libmysofa: Makefile PLIST distinfo
        pkgsrc/audio/libmysofa/patches: patch-CMakeLists.txt

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libmysofa/Makefile \
    pkgsrc/audio/libmysofa/PLIST pkgsrc/audio/libmysofa/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libmysofa/Makefile
diff -u pkgsrc/audio/libmysofa/Makefile:1.3 pkgsrc/audio/libmysofa/Makefile:1.4
--- pkgsrc/audio/libmysofa/Makefile:1.3 Sat Feb  8 16:34:55 2020
+++ pkgsrc/audio/libmysofa/Makefile     Fri Jun 19 13:17:59 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/02/08 16:34:55 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/19 13:17:59 wiz Exp $
 
-DISTNAME=      libmysofa-1.0
+DISTNAME=      libmysofa-1.1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hoene/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -10,13 +10,22 @@ HOMEPAGE=   https://github.com/hoene/libmy
 COMMENT=       Reader for AES SOFA HRTF files
 LICENSE=       modified-bsd
 
+TEST_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
+
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 
 CMAKE_ARGS+=   -Wno-dev
-CMAKE_ARGS+=   -DBUILD_TESTS=OFF
+#CMAKE_ARGS+=  -DBUILD_TESTS=OFF
 
 PKGCONFIG_OVERRIDE+=   libmysofa.pc.cmake
 
+# 16 test failures as of 1.1
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ctest
+
+# for tests
+BUILDLINK_DEPMETHOD.cunit=     build
+.include "../../devel/cunit/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/libmysofa/PLIST
diff -u pkgsrc/audio/libmysofa/PLIST:1.3 pkgsrc/audio/libmysofa/PLIST:1.4
--- pkgsrc/audio/libmysofa/PLIST:1.3    Sat Feb  8 16:34:55 2020
+++ pkgsrc/audio/libmysofa/PLIST        Fri Jun 19 13:17:59 2020
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2020/02/08 16:34:55 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/06/19 13:17:59 wiz Exp $
+bin/mysofa2json
 include/mysofa.h
 lib/libmysofa.a
 lib/libmysofa.so
 lib/libmysofa.so.1
-lib/libmysofa.so.${PKGVERSION}.0
+lib/libmysofa.so.1.0.0
 lib/pkgconfig/libmysofa.pc
 share/libmysofa/MIT_KEMAR_normal_pinna.sofa
 share/libmysofa/default.sofa
Index: pkgsrc/audio/libmysofa/distinfo
diff -u pkgsrc/audio/libmysofa/distinfo:1.3 pkgsrc/audio/libmysofa/distinfo:1.4
--- pkgsrc/audio/libmysofa/distinfo:1.3 Sat Feb  8 16:34:55 2020
+++ pkgsrc/audio/libmysofa/distinfo     Fri Jun 19 13:17:59 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/02/08 16:34:55 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/06/19 13:17:59 wiz Exp $
 
-SHA1 (libmysofa-1.0.tar.gz) = 84825bb02b7e434ffeb5ef1319dc2761abd05086
-RMD160 (libmysofa-1.0.tar.gz) = a16db6164c8ff901c322353d7c65d6d3a30ce1f5
-SHA512 (libmysofa-1.0.tar.gz) = a6bb0c00a0e473c80db5db5afbb13eee2876587905c6660a23d3be35605d8dafadfa050921973039ca7af0c50eab61b9e8ba9c7ddae85bec96048d368c9ea757
-Size (libmysofa-1.0.tar.gz) = 161384068 bytes
-SHA1 (patch-CMakeLists.txt) = 10d38c3518ddbdfe8c9aff915097931a157ed1a2
+SHA1 (libmysofa-1.1.tar.gz) = 6dcad3417576c59eb77a88ac6362799e0247bf9a
+RMD160 (libmysofa-1.1.tar.gz) = 2467dd23b458b487782cea19aaa476523a22b706
+SHA512 (libmysofa-1.1.tar.gz) = 8feafbf447f21f3ef5a283f5f494a647dd5db47cc43af4cc26efeae9f8684c93f5aa1131d8c5570d1d7811c3e3b08763fabdfad2beff0858eeb3cb78dda22332
+Size (libmysofa-1.1.tar.gz) = 199816311 bytes
+SHA1 (patch-CMakeLists.txt) = b2432d0df7134ba607b54f2015437b0091efd92a

Index: pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt:1.2 pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt:1.2     Sat Feb  8 16:34:55 2020
+++ pkgsrc/audio/libmysofa/patches/patch-CMakeLists.txt Fri Jun 19 13:17:59 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2020/02/08 16:34:55 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2020/06/19 13:17:59 wiz Exp $
 
 Don't need a C++ compiler.
 
---- CMakeLists.txt.orig        2020-02-05 17:22:43.000000000 +0000
+--- CMakeLists.txt.orig        2020-06-13 15:02:13.000000000 +0000
 +++ CMakeLists.txt
 @@ -1,5 +1,5 @@
  cmake_minimum_required(VERSION 2.8)
@@ -11,3 +11,82 @@ Don't need a C++ compiler.
  
  include(CheckCCompilerFlag)
  include(GenerateExportHeader)
+@@ -48,19 +48,19 @@ if(BUILD_TESTS)
+   enable_testing()
+ 
+   add_test(D1_48K_24bit_0.3s_FIR_SOFA src/mysofa2json
+-           ../tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa)
+-  add_test(H20_44K_16bit_256tap_FIR_SOFA ../tests/compareIgnoreNew.sh
+-           ../tests/H20_44K_16bit_256tap_FIR_SOFA)
+-  add_test(MIT_KEMAR_large_pinna ../tests/compare.sh
+-           ../tests/MIT_KEMAR_large_pinna)
+-  add_test(MIT_KEMAR_normal_pinna ../tests/compareIgnoreNew.sh
+-           ../tests/MIT_KEMAR_normal_pinna)
+-  add_test(MIT_KEMAR_normal_pinna.old ../tests/compare.sh
+-           ../tests/MIT_KEMAR_normal_pinna.old)
+-  add_test(dtf_nh2 ../tests/compareIgnoreNew.sh
+-           ../tests/dtf_nh2)
+-  add_test(hrtf_c_nh898 ../tests/compareIgnoreNew.sh
+-           ../tests/hrtf_c_nh898)
++           ${PROJECT_SOURCE_DIR}/tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa)
++  add_test(H20_44K_16bit_256tap_FIR_SOFA ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
++           ${PROJECT_SOURCE_DIR}/tests/H20_44K_16bit_256tap_FIR_SOFA)
++  add_test(MIT_KEMAR_large_pinna ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_large_pinna)
++  add_test(MIT_KEMAR_normal_pinna ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
++           ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_normal_pinna)
++  add_test(MIT_KEMAR_normal_pinna.old ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_normal_pinna.old)
++  add_test(dtf_nh2 ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
++           ${PROJECT_SOURCE_DIR}/tests/dtf_nh2)
++  add_test(hrtf_c_nh898 ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
++           ${PROJECT_SOURCE_DIR}/tests/hrtf_c_nh898)
+   foreach(
+     ISSUE
+     72
+@@ -72,26 +72,26 @@ if(BUILD_TESTS)
+     83
+     84)
+     # issues with osx    96)
+-    add_test(fail-issue-${ISSUE} ../tests/notcrashed.sh
+-             ../tests/fail-issue-${ISSUE})
++    add_test(fail-issue-${ISSUE} ${PROJECT_SOURCE_DIR}/tests/notcrashed.sh
++             ${PROJECT_SOURCE_DIR}/tests/fail-issue-${ISSUE})
+   endforeach(ISSUE)
+-  add_test(CIPIC_subject_003_hrir_final ../tests/compare.sh
+-           ../tests/CIPIC_subject_003_hrir_final)
+-  add_test(FHK_HRIR_L2354 ../tests/compare.sh ../tests/FHK_HRIR_L2354)
+-  add_test(LISTEN_1002_IRC_1002_C_HRIR ../tests/compare.sh
+-           ../tests/LISTEN_1002_IRC_1002_C_HRIR)
+-  add_test(Pulse ../tests/compare.sh ../tests/Pulse)
+-  add_test(Tester ../tests/compare.sh ../tests/tester)
+-  add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ../tests/compare.sh
+-           ../tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m)
+-  add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ../tests/compare.sh
+-           ../tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m)
+-  add_test(example_dummy_sofa48 ../tests/compare.sh
+-           ../tests/example_dummy_sofa48)
+-  add_test(TestSOFA48_netcdf472 ../tests/compare.sh
+-           ../tests/TestSOFA48_netcdf472)
+-  add_test(example_dummy_sofa48_with_user_defined_variable ../tests/compare.sh
+-           ../tests/example_dummy_sofa48_with_user_defined_variable)
++  add_test(CIPIC_subject_003_hrir_final ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/CIPIC_subject_003_hrir_final)
++  add_test(FHK_HRIR_L2354 ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/FHK_HRIR_L2354)
++  add_test(LISTEN_1002_IRC_1002_C_HRIR ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/LISTEN_1002_IRC_1002_C_HRIR)
++  add_test(Pulse ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/Pulse)
++  add_test(Tester ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/tester)
++  add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m)
++  add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m)
++  add_test(example_dummy_sofa48 ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48)
++  add_test(TestSOFA48_netcdf472 ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/TestSOFA48_netcdf472)
++  add_test(example_dummy_sofa48_with_user_defined_variable ${PROJECT_SOURCE_DIR}/tests/compare.sh
++           ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48_with_user_defined_variable)
+ endif(BUILD_TESTS)
+ 
+ add_subdirectory(src)