diff --git a/audio/libmysofa/Makefile b/audio/libmysofa/Makefile index e8aac781b654..b0bc71fc3861 100644 --- a/audio/libmysofa/Makefile +++ b/audio/libmysofa/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libmysofa -PORTVERSION= 0.8 +PORTVERSION= 0.9 DISTVERSIONPREFIX= v CATEGORIES= audio @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= node:www/node -USES= cmake:insource +USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes @@ -26,4 +26,11 @@ TEST_BUILD_DEPENDS= cunit>0:devel/cunit TEST_CMAKE_BOOL= BUILD_TESTS TEST_TEST_TARGET= test +# The tests are expected to be in ../tests relative to the build +# directory and the build results are expected to be in build/ relative +# to ${WRKSRC}. USES=cmake does not allow overwriting ${WRKDIR}/.build +# as the build directory. +post-patch: + @${RLN} ${WRKSRC}/build ${CONFIGURE_WRKSRC} + .include diff --git a/audio/libmysofa/distinfo b/audio/libmysofa/distinfo index 771198be6ba3..675ff42a77c1 100644 --- a/audio/libmysofa/distinfo +++ b/audio/libmysofa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569030892 -SHA256 (hoene-libmysofa-v0.8_GH0.tar.gz) = 0e0abb6ec6f5f09266325741d6ef218532187129f65d0bc6b21e155760dfb2ad -SIZE (hoene-libmysofa-v0.8_GH0.tar.gz) = 80597280 +TIMESTAMP = 1575042231 +SHA256 (hoene-libmysofa-v0.9_GH0.tar.gz) = 9d8f8aec6d73209dadd1b33d436d397dbd3372ef8a8627081e0d28a8e7cc40d2 +SIZE (hoene-libmysofa-v0.9_GH0.tar.gz) = 80597989 diff --git a/audio/libmysofa/files/patch-CMakeLists.txt b/audio/libmysofa/files/patch-CMakeLists.txt deleted file mode 100644 index 6f0b48a1ace9..000000000000 --- a/audio/libmysofa/files/patch-CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -The tests/compare.sh script is written to be run relative to the directory it -is in, so we need to direct CMake to execute it from the tests directory -instead of the top source directory. - ---- CMakeLists.txt.orig 2017-07-11 11:36:33 UTC -+++ CMakeLists.txt -@@ -38,14 +38,14 @@ if(BUILD_TESTS) - - enable_testing() - -- add_test(CIPIC_subject_003_hrir_final ../tests/compare.sh ../tests/CIPIC_subject_003_hrir_final) -- add_test(FHK_HRIR_L2354.sofa ../tests/compare.sh ../tests/FHK_HRIR_L2354) -- add_test(LISTEN_1002_IRC_1002_C_HRIR.sofa ../tests/compare.sh ../tests/LISTEN_1002_IRC_1002_C_HRIR) -- add_test(MIT_KEMAR_large_pinna.sofa ../tests/compare.sh ../tests/MIT_KEMAR_large_pinna) -- 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.sofa ../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.sofa ../tests/compare.sh ../tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m) -+ add_test(NAME CIPIC_subject_003_hrir_final COMMAND compare.sh CIPIC_subject_003_hrir_final WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME FHK_HRIR_L2354.sofa COMMAND compare.sh FHK_HRIR_L2354 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME LISTEN_1002_IRC_1002_C_HRIR.sofa COMMAND compare.sh LISTEN_1002_IRC_1002_C_HRIR WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME MIT_KEMAR_large_pinna.sofa COMMAND compare.sh MIT_KEMAR_large_pinna WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME Pulse COMMAND compare.sh Pulse WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME Tester COMMAND compare.sh tester WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m.sofa COMMAND compare.sh TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) -+ add_test(NAME TU-Berlin_QU_KEMAR_anechoic_radius_0.5m.sofa COMMAND compare.sh TU-Berlin_QU_KEMAR_anechoic_radius_0.5m WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) - endif(BUILD_TESTS) - - add_subdirectory(src) diff --git a/audio/libmysofa/files/patch-tests_compare.sh b/audio/libmysofa/files/patch-tests_compare.sh deleted file mode 100644 index 34ab4082d87f..000000000000 --- a/audio/libmysofa/files/patch-tests_compare.sh +++ /dev/null @@ -1,13 +0,0 @@ -Fix binary location. - ---- tests/compare.sh.orig 2018-02-08 14:33:00 UTC -+++ tests/compare.sh -@@ -1,7 +1,7 @@ - #!/bin/bash - - NODEJS=`which node || which nodejs || which false` --../build/src/mysofa2json "$1".sofa >tmp1.json 2>tmp1.txt -+../src/mysofa2json "$1".sofa >tmp1.json 2>tmp1.txt - - ret=$? - if [ "$ret" != 0 ]; then