From nobody Tue Oct 22 05:36:01 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XXgrd5lLwz595js; Tue, 22 Oct 2024 05:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXgrd5Cbwz46hB; Tue, 22 Oct 2024 05:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729575361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOlfNSkvOtCQr68Pe9sU9xrKVdjeRA3VQDKzw5kukGc=; b=vV5QpB5kavBcdPKr4AjLxRbDEYl+g1/j21OPpJ6dRn5x9mLjLTWhA4+R6DXEVN9B1h3jWK 6dc80R/XFHXBLff2DZ2KAn98slAFo2YUuvIJJhomwGdN0gXSalc55HXjTlAnmqKqlx//Mw aYCwUtfS5JUt7LsIYIGXqCOsB+W/tBlVdUKCqQcmS/vZ12ga4GuLJz++tyTfjHRTzwJif3 rnUs3z6QjXYXimEoujdtYWakjVl1HaRSqgWaEDa6kw/ab16j3Yf64zOhYHNftU751jcN4G E2RpSkG0EpFoCPTP1q+aQpxkwiLMBJIL7V1V6TMotZpdjroh1YGCiXUo0HNINg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729575361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOlfNSkvOtCQr68Pe9sU9xrKVdjeRA3VQDKzw5kukGc=; b=hC9NfC9f1nBVGWgG7pYM0vJJCRn/JxW/0VF7XDl4Sq4v4ggK6p4RFubFIvzQTIy5D+Ht+W 9wMIwqLxRYqJVswcljj6Zj8gx4+JvHBGQs3naXAn1lE+DHzCS47Thrlh82PiKKq6KmXoJ7 JQ2IDwm6EMQusDhv2pKMLVvsnla+HOHUTCavB3XlNNTPg0rX3TlLZ9TQl2NZO4XnjKfYaS JnncsXsy35ciY0KnO+FPCrlz7XP+6+k9hXAlmO8jLDOguHTNEgOoL1LUFhCixoJXbwkRNs P1xOZDtudoRSGSPqRh4qiZ7yQdZoOnX9i+jlL592EpXjuPYKd2qJKLa/h8yH3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729575361; a=rsa-sha256; cv=none; b=KKtbgEtrjN3Udys8f613sTuw2opyxAtGPE/lWHLcd499A6H//VppMOTDKC2NXlhnl0iaqr EyY5OrqEH8EaCh++QoNpy0z3i1dRycltsQXFF/3jIQaugetCURoy/S5rZRG400Xm9JnnUt Ma6tqt083pVABrDHF90KVcIlUX7y9QCz+6a4OHkVBKAWTVaVO1RgDTb6hFPIXYl959YxiD tUoB8eKj67v5NVRs9hYZb810ksjagnijbwIclYuOOb9g+wF8PXJ1go+95r+2sM+bmnvvrl pgYwSA6fZi9W2QqljXnxCLrKk2C5WYXU3V3lPsew9EYgO4bLWG99cqrpP1jP0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXgrd4hWHz12BC; Tue, 22 Oct 2024 05:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49M5a1Wd058410; Tue, 22 Oct 2024 05:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49M5a1r2058407; Tue, 22 Oct 2024 05:36:01 GMT (envelope-from git) Date: Tue, 22 Oct 2024 05:36:01 GMT Message-Id: <202410220536.49M5a1r2058407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: a640fdbaf2c3 - main - audio/libmysofa: Update to 1.3.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a640fdbaf2c35a5d3115038acdbc1546b63f39c7 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=a640fdbaf2c35a5d3115038acdbc1546b63f39c7 commit a640fdbaf2c35a5d3115038acdbc1546b63f39c7 Author: Jason E. Hale AuthorDate: 2024-10-21 03:03:49 +0000 Commit: Jason E. Hale CommitDate: 2024-10-22 05:35:55 +0000 audio/libmysofa: Update to 1.3.3 https://github.com/hoene/libmysofa/releases/tag/v1.3.3 --- audio/libmysofa/Makefile | 2 +- audio/libmysofa/distinfo | 6 ++--- audio/libmysofa/files/extrapatch-tests_compare.sh | 11 ++++---- .../files/extrapatch-tests_compareIgnoreNew.sh | 11 ++++---- audio/libmysofa/files/patch-src_CMakeLists.txt | 15 ----------- .../files/patch-src_hrtf_portable__endian.h | 30 ---------------------- audio/libmysofa/pkg-plist | 3 ++- 7 files changed, 18 insertions(+), 60 deletions(-) diff --git a/audio/libmysofa/Makefile b/audio/libmysofa/Makefile index 716b11100250..b39b1abfb624 100644 --- a/audio/libmysofa/Makefile +++ b/audio/libmysofa/Makefile @@ -1,6 +1,6 @@ PORTNAME= libmysofa DISTVERSIONPREFIX= v -DISTVERSION= 1.3.2 +DISTVERSION= 1.3.3 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org diff --git a/audio/libmysofa/distinfo b/audio/libmysofa/distinfo index c412638cc352..0a7ba7bfa0b8 100644 --- a/audio/libmysofa/distinfo +++ b/audio/libmysofa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697487219 -SHA256 (hoene-libmysofa-v1.3.2_GH0.tar.gz) = 6c5224562895977e87698a64cb7031361803d136057bba35ed4979b69ab4ba76 -SIZE (hoene-libmysofa-v1.3.2_GH0.tar.gz) = 208753292 +TIMESTAMP = 1729476519 +SHA256 (hoene-libmysofa-v1.3.3_GH0.tar.gz) = a15f7236a2b492f8d8da69f6c71b5bde1ef1bac0ef428b94dfca1cabcb24c84f +SIZE (hoene-libmysofa-v1.3.3_GH0.tar.gz) = 208753723 diff --git a/audio/libmysofa/files/extrapatch-tests_compare.sh b/audio/libmysofa/files/extrapatch-tests_compare.sh index c701ea6dd6fa..27c52a172880 100644 --- a/audio/libmysofa/files/extrapatch-tests_compare.sh +++ b/audio/libmysofa/files/extrapatch-tests_compare.sh @@ -1,13 +1,14 @@ Undo bashism added upstream in a5a3562. The built-in 'command' command of sh(1) does not take multiple arguments. ---- tests/compare.sh.orig 2022-02-14 10:05:41 UTC + +--- tests/compare.sh.orig 2024-10-19 19:02:44 UTC +++ tests/compare.sh -@@ -1,7 +1,7 @@ +@@ -1,7 +1,7 @@ SCRIPTDIR=${0%/*} #!/bin/sh SCRIPTDIR=${0%/*} -NODEJS=$(command -v node nodejs false | head -1) +NODEJS=$(which node nodejs false | head -1) - - ${MYSOFA2JSON:-${SCRIPTDIR}/../build/src/mysofa2json} -c -s "$1".sofa >tmp1.json 2>tmp1.txt - + TMP1=`mktemp -p . tmp1-XXXXXXXX.json` + TMP2=`mktemp -p . tmp2-XXXXXXXX.txt` + TMP3=`mktemp -p . tmp3-XXXXXXXX.json` diff --git a/audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh b/audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh index 8b5d9ea74c31..03c909aae978 100644 --- a/audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh +++ b/audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh @@ -1,13 +1,14 @@ Undo bashism added upstream in a5a3562. The built-in 'command' command of sh(1) does not take multiple arguments. ---- tests/compareIgnoreNew.sh.orig 2022-02-14 10:05:54 UTC + +--- tests/compareIgnoreNew.sh.orig 2024-10-19 19:02:44 UTC +++ tests/compareIgnoreNew.sh -@@ -1,7 +1,7 @@ +@@ -1,7 +1,7 @@ SCRIPTDIR=${0%/*} #!/bin/sh SCRIPTDIR=${0%/*} -NODEJS=$(command -v node nodejs false | head -1) +NODEJS=$(which node nodejs false | head -1) - - ${MYSOFA2JSON:-${SCRIPTDIR}/../build/src/mysofa2json} -c -s "$1".sofa >tmp1.json 2>tmp1.txt - + TMP1=`mktemp -p . tmp1-XXXXXXXX.json` + TMP2=`mktemp -p . tmp2-XXXXXXXX.txt` + TMP3=`mktemp -p . tmp3-XXXXXXXX.json` diff --git a/audio/libmysofa/files/patch-src_CMakeLists.txt b/audio/libmysofa/files/patch-src_CMakeLists.txt deleted file mode 100644 index b621350810c4..000000000000 --- a/audio/libmysofa/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 1d93c4797c74..000000000000 --- a/audio/libmysofa/files/patch-src_hrtf_portable__endian.h +++ /dev/null @@ -1,30 +0,0 @@ -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 b48de10e113a..584ca67b6aef 100644 --- a/audio/libmysofa/pkg-plist +++ b/audio/libmysofa/pkg-plist @@ -1,5 +1,6 @@ %%TEST%%bin/mysofa2json include/mysofa.h +include/mysofa_export.h lib/cmake/mysofa/mysofaConfig.cmake lib/cmake/mysofa/mysofaConfigVersion.cmake lib/cmake/mysofa/mysofaTargets-%%CMAKE_BUILD_TYPE%%.cmake @@ -7,7 +8,7 @@ lib/cmake/mysofa/mysofaTargets.cmake %%STATIC%%lib/libmysofa.a lib/libmysofa.so lib/libmysofa.so.1 -lib/libmysofa.so.1.3.2 +lib/libmysofa.so.1.3.3 libdata/pkgconfig/libmysofa.pc %%DATADIR%%/MIT_KEMAR_normal_pinna.sofa %%DATADIR%%/default.sofa