diff --git a/audio/libmysofa/Makefile b/audio/libmysofa/Makefile index 5d39f97d9e2f..0ca80667c266 100644 --- a/audio/libmysofa/Makefile +++ b/audio/libmysofa/Makefile @@ -1,40 +1,40 @@ PORTNAME= libmysofa DISTVERSIONPREFIX= v -DISTVERSION= 1.3.1 +DISTVERSION= 1.3.2 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org COMMENT= SOFA (Spatially Oriented Format for Acoustics) file reader WWW= https://github.com/hoene/libmysofa LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= node:www/node -USES= cmake cpe +USES= cmake cpe pathfix USE_LDCONFIG= yes CPE_VENDOR= symonics USE_GITHUB= yes GH_ACCOUNT= hoene OPTIONS_DEFINE= STATIC TEST OPTIONS_DEFAULT= STATIC OPTIONS_SUB= yes STATIC_CMAKE_BOOL= BUILD_STATIC_LIBS 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 e5139c973224..c412638cc352 100644 --- a/audio/libmysofa/distinfo +++ b/audio/libmysofa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665316926 -SHA256 (hoene-libmysofa-v1.3.1_GH0.tar.gz) = a8a8cbf7b0b2508a6932278799b9bf5c63d833d9e7d651aea4622f3bc6b992aa -SIZE (hoene-libmysofa-v1.3.1_GH0.tar.gz) = 208117352 +TIMESTAMP = 1697487219 +SHA256 (hoene-libmysofa-v1.3.2_GH0.tar.gz) = 6c5224562895977e87698a64cb7031361803d136057bba35ed4979b69ab4ba76 +SIZE (hoene-libmysofa-v1.3.2_GH0.tar.gz) = 208753292 diff --git a/audio/libmysofa/files/patch-src_CMakeLists.txt b/audio/libmysofa/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..b621350810c4 --- /dev/null +++ b/audio/libmysofa/files/patch-src_CMakeLists.txt @@ -0,0 +1,15 @@ +Install header if STATIC option is disabled. + +https://github.com/hoene/libmysofa/pull/214 + +--- src/CMakeLists.txt.orig 2023-10-15 10:30:14 UTC ++++ src/CMakeLists.txt +@@ -127,6 +127,8 @@ if(BUILD_SHARED_LIBS) + # with the mysofa-static library. + set_target_properties(mysofa-shared + PROPERTIES ARCHIVE_OUTPUT_NAME mysofa_shared) ++ set_target_properties(mysofa-shared ++ PROPERTIES PUBLIC_HEADER "${public-headers}") + + set_property( + TARGET mysofa-shared diff --git a/audio/libmysofa/files/patch-src_hrtf_portable__endian.h b/audio/libmysofa/files/patch-src_hrtf_portable__endian.h new file mode 100644 index 000000000000..1d93c4797c74 --- /dev/null +++ b/audio/libmysofa/files/patch-src_hrtf_portable__endian.h @@ -0,0 +1,30 @@ +Fix linking on FreeBSD and DragonFly. + +https://github.com/hoene/libmysofa/pull/213 + +--- src/hrtf/portable_endian.h.orig 2023-10-17 18:48:34 UTC ++++ src/hrtf/portable_endian.h +@@ -41,22 +41,9 @@ + # define __LITTLE_ENDIAN LITTLE_ENDIAN + # define __PDP_ENDIAN PDP_ENDIAN + +-#elif defined(__OpenBSD__) ++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + + # include +- +-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) +- +-# include +- +-# define be16toh(x) betoh16(x) +-# define le16toh(x) letoh16(x) +- +-# define be32toh(x) betoh32(x) +-# define le32toh(x) letoh32(x) +- +-# define be64toh(x) betoh64(x) +-# define le64toh(x) letoh64(x) + + #elif defined(__WINDOWS__) + diff --git a/audio/libmysofa/pkg-plist b/audio/libmysofa/pkg-plist index d6c35746c04e..b48de10e113a 100644 --- a/audio/libmysofa/pkg-plist +++ b/audio/libmysofa/pkg-plist @@ -1,9 +1,13 @@ %%TEST%%bin/mysofa2json include/mysofa.h +lib/cmake/mysofa/mysofaConfig.cmake +lib/cmake/mysofa/mysofaConfigVersion.cmake +lib/cmake/mysofa/mysofaTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/mysofa/mysofaTargets.cmake %%STATIC%%lib/libmysofa.a lib/libmysofa.so lib/libmysofa.so.1 -lib/libmysofa.so.1.3.0 +lib/libmysofa.so.1.3.2 libdata/pkgconfig/libmysofa.pc %%DATADIR%%/MIT_KEMAR_normal_pinna.sofa %%DATADIR%%/default.sofa