From nobody Sun Dec 31 04:26:37 2023 X-Original-To: dev-commits-ports-all@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 4T2mK94K6Yz565bF; Sun, 31 Dec 2023 04:26:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2mK92QJGz4P6N; Sun, 31 Dec 2023 04:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703996797; 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=uUGscxFznJ38JWC+glu7i9QkI2qThgSLD4kwLV3onfk=; b=TmqxrubVGMQKfKQztl8mibS0+xxtqI0rPmAT6iFDVFtiDY4n+OcEM7PWgLmAkzClRoEG8k XTEHlzqqobWyPw0zBR9Nvu3gT8NMKopWFaC8KmQUf4zonqt3GLmnBzYO8Q368SU0VTNpU2 BsAs9X9NwSPOPprLiyxAasc/gEYOyTmDtfeX1RjzILxev/rJVNSRm/zpwA+l5CLeBR2ZBz D5AdT1CsEKyY8ZscBexTxemxa+rTVc14WZnJifAw+eV9eV9LzXz3ROYXSiEVHYaKHkFX2O 1Tw86XNk5OY+ZkeGymEjdnv1h/thNzV1YKq5Wanj4sF5pDxqM/PVxtMo8hVB2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703996797; a=rsa-sha256; cv=none; b=UbkCNnj+Kk85MNGGN9O7VHhxryqkgKcK7Fkgc/QrnWBF1M3KiNPtNUevi6SNaYvUjk3OvF 3whlDhJpgkbaagnQKoAYi19ayhVnpn1ateoXxzmbqIhW2WwwVI8fW6E3Zi3C4HSOIyMPX2 OIU8qN2NJMtHkpTyxtFRPXG+x4peau904DBC/1LQ9mYEqRfWkFJDFcQNii558Vb1NE/ADQ kQ2tQKSXizT2ISyB9wypp0+TNBzehEGtciMf2jRAgY/vDQfa4SyuyL+w6vDT3V/LQ8qnsm fJliOjpT7JdkzcvsQuHwmm7JKMOhw8WnP6lb7G9WPm9cMJjRIHQZ8mNSwcya5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703996797; 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=uUGscxFznJ38JWC+glu7i9QkI2qThgSLD4kwLV3onfk=; b=H1xaYWCHtXkbXi+NI2mRmL0IzqtBFBQKnfjIVcj7GDPhLvSX1D2O+FBLXzfDzDKSLFR1Gk NrOrzzwnGX9Sa8T5sV3nSkLNJ2M1Lg8+LA1O7IFGnGjsK5IQ9nnrDFUa9ylXQwcfKM55He AS1GV5knTDRT0vex+VsWLxqReUbNsT8mTAbMDQkrnYP3hl3+qKrADEW+0T+PboMTomphv3 6UV08L8l9/sC0tgE8DKLzG4AupC9tMzikxHRzVl+vqBcva6EOuD/4n0ECXl+4/yBMotEBS 3Su0TgWJJ8lPCo2gqwGD9nNqHNO+k3LC1IKpoE+Vm8A4Zx2CjyLerqHxbau1+g== 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 4T2mK91Kzrz4Fm; Sun, 31 Dec 2023 04:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BV4QbIe034448; Sun, 31 Dec 2023 04:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BV4Qbqg034445; Sun, 31 Dec 2023 04:26:37 GMT (envelope-from git) Date: Sun, 31 Dec 2023 04:26:37 GMT Message-Id: <202312310426.3BV4Qbqg034445@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: aa7a64ae1bd6 - main - audio/umurmur: Jettison byteswap/endian hacks List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa7a64ae1bd61ed2bdc97df1d662f104bcb31ce5 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa7a64ae1bd61ed2bdc97df1d662f104bcb31ce5 commit aa7a64ae1bd61ed2bdc97df1d662f104bcb31ce5 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-31 03:27:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 03:51:04 +0000 audio/umurmur: Jettison byteswap/endian hacks --- audio/umurmur/Makefile | 3 --- audio/umurmur/files/patch-configure.ac | 8 ++++---- audio/umurmur/files/patch-src_conf.c | 4 ++-- audio/umurmur/{files => }/patch-src_byteorder.h | 9 +++------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile index c7ab80fceb03..bed7bc05b9d1 100644 --- a/audio/umurmur/Makefile +++ b/audio/umurmur/Makefile @@ -9,9 +9,6 @@ WWW= https://umurmur.net/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to compile: fatal error: byteswap.h file not found -BROKEN_armv6= fails to compile: fatal error: byteswap.h file not found - LIB_DEPENDS= libconfig.so:devel/libconfig \ libprotobuf-c.so:devel/protobuf-c diff --git a/audio/umurmur/files/patch-configure.ac b/audio/umurmur/files/patch-configure.ac index 14045b5e9d7b..6e9a84ad3b72 100644 --- a/audio/umurmur/files/patch-configure.ac +++ b/audio/umurmur/files/patch-configure.ac @@ -1,8 +1,8 @@ ---- configure.ac.orig 2015-04-07 10:01:12 UTC +--- configure.ac.orig 2021-03-21 20:49:04 UTC +++ configure.ac -@@ -113,7 +113,7 @@ AS_IF([test "x$enable_shmapi" != xno], - - +@@ -118,7 +118,7 @@ AS_IF([test "x$enable_shmapi" != xno], + AM_CONDITIONAL(USE_SHAREDMEMORY_API, false) + ]) -AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config]) +AC_DEFINE([DEFAULT_CONFIG], ["%%PREFIX%%/etc/umurmur.conf"], [Default config]) diff --git a/audio/umurmur/files/patch-src_conf.c b/audio/umurmur/files/patch-src_conf.c index 209de220eae0..ab4b7b3df91e 100644 --- a/audio/umurmur/files/patch-src_conf.c +++ b/audio/umurmur/files/patch-src_conf.c @@ -1,6 +1,6 @@ ---- src/conf.c.orig 2015-04-07 10:01:12 UTC +--- src/conf.c.orig 2021-03-21 20:49:04 UTC +++ src/conf.c -@@ -89,23 +89,23 @@ const char *getStrConf(param_t param) +@@ -90,23 +90,23 @@ const char *getStrConf(param_t param) case CERTIFICATE: setting = config_lookup(&configuration, "certificate"); if (!setting) diff --git a/audio/umurmur/files/patch-src_byteorder.h b/audio/umurmur/patch-src_byteorder.h similarity index 60% rename from audio/umurmur/files/patch-src_byteorder.h rename to audio/umurmur/patch-src_byteorder.h index 05b7a4e5863a..134ce96050d4 100644 --- a/audio/umurmur/files/patch-src_byteorder.h +++ b/audio/umurmur/patch-src_byteorder.h @@ -1,16 +1,13 @@ ---- src/byteorder.h.orig 2020-10-20 00:54:48 UTC +--- src/byteorder.h.orig 2021-03-21 20:49:04 UTC +++ src/byteorder.h -@@ -56,8 +56,12 @@ typedef uint64_t subblock; +@@ -56,8 +56,10 @@ typedef uint64_t subblock; #elif defined( __x86_64__) #define SWAPPED(x) ({register uint64_t __out, __in = (x); __asm__("bswap %q0" : "=r"(__out) : "0"(__in)); __out;}) #else +#if defined(__linux__) #include --#define SWAPPED(x) bswap_64(x) -+#elif defined(__FreeBSD__) -+#include + #define SWAPPED(x) bswap_64(x) +#endif // defined(__linux__) -+#define SWAPPED(x) bswap64(x) #endif // defined(BYTE_ORDER_BIG_ENDIAN) #else #define BLOCKSIZE 4