From nobody Sun Jul 21 12:12:55 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 4WRj3W5zJ0z5RPBl; Sun, 21 Jul 2024 12:12:55 +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 4WRj3W5SWXz4Kwr; Sun, 21 Jul 2024 12:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721563975; 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=MU9uT3yOF6SCZWxuYO4TeHCLubLUEfsZqyDNwNqDdfk=; b=pCCzougkeP+c83SWqe066rJC0ncpJgxFJ2B9dBNLELpjmcxKEYj4+emG0vPH2pC+7IyuXA l4pNpLareoR0amUzPHd8DoF9tSCIdOqmg8WQHqwNtavg1UCZi7zBrZ6N8elgl7+UM1RclK HwI0t8q6Q1ifkK0hTbrtiLkrwpGSWLEtBVaJrZtGiW/R0gDuTg6e02ql82+h8WGsNnxmrM UFphtVi5yNknyKj2cjy+fN8Eb/lHL1K91+bN3QEMvi6N5l0TXXmWRuWYLVwW8NjoJrAsCK Y03iV6KCIDkFrnf4VGnuEraLhHM6iju8YEItWjee8wdq8P0v8OHaV6bNnfFyLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721563975; a=rsa-sha256; cv=none; b=LzKzDmhBI3JqZAek7oMbKhPOg6S8jCLrF+84ydV7SARYbEJHp/1OH3XSRuqThVS7nVejZP /mTyH0vL28agz8qtwDE5ndzKduQHIgHBH6xpP96P5zdBkZBEDWMJAFP+8W2DNHgzTGhAFY b6QePSY+Tv3+TxAwAxjMHayNySEcwrMl2DgelpWRaXj0nmIzIop+Xf4+qFH7HhH15I0jtx TZ4HuNmiU03gF/l7kbNT5CF6tYJk65r+BspNHMOzSr0XU/l3SrU2NwgpUUw83AbRQGdM9f MsC/l0jvgoDsek49qu5sIF2xmeu21kC79ctvIkHCtYgFhO/0BFHbxd35cjfgVA== 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=1721563975; 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=MU9uT3yOF6SCZWxuYO4TeHCLubLUEfsZqyDNwNqDdfk=; b=nRs3cP47ZtZq2LgK/WKGCL1wBa/lLRKGYUzfsEm5qmPmTckxg24+eshYOcfxTlbJ5nFxID MAQuJCehjidK4azXGPj/PNcj3BE+kkBByVbsbJUXpW8z4XRuzxhwDsyXks0Jnfvwz3Hjse 6v0MP5jgNPVBUSyoE9t4X+4HLG8dCEBVKSZCqb/HLdyF3K90BDdoogaulkatZw1z2kTQH9 NbfQbnWmY5i9nIo3ioGEJdj9iRDVH84R+NMlRVlPdtAAe2NjNdsVd4mDfIecqjw62DQoyY dKDCf8VaJN5jOrClwutTyWrQ2DOm9bmLm2NgR23VzPQBjWsE4VmGP1XCaSHrxQ== 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 4WRj3W53YJz10Qj; Sun, 21 Jul 2024 12:12:55 +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 46LCCtj8019053; Sun, 21 Jul 2024 12:12:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LCCton019050; Sun, 21 Jul 2024 12:12:55 GMT (envelope-from git) Date: Sun, 21 Jul 2024 12:12:55 GMT Message-Id: <202407211212.46LCCton019050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: d12484668389 - main - multimedia/ringrtc: Fix build on recent main 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: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d124846683899511580ea66a6497a232563dca46 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=d124846683899511580ea66a6497a232563dca46 commit d124846683899511580ea66a6497a232563dca46 Author: Joseph Mingrone AuthorDate: 2024-07-20 22:27:36 +0000 Commit: Joseph Mingrone CommitDate: 2024-07-21 12:09:39 +0000 multimedia/ringrtc: Fix build on recent main After src snapshot 0c47b9c211e, the build began failing with: ../../third_party/nasm/include/compiler.h:249:21: error: static declaration of 'mempcpy' follows non-static declaration 249 | static inline void *mempcpy(void *dst, const void *src, size_t n) | ^ /usr/include/string.h:71:8: note: previous declaration is here 71 | void *(mempcpy)(void * __restrict, const void * __restrict, size_t); Fix the build by restoring a default definition of HAVE_MEMPCPY since we have had mempcpy() since 13.1. Approved by: kevans, mikael (maintainer) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46053 --- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h b/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h index 30f2390890d4..3bb7bc175176 100644 --- a/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h +++ b/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- src/webrtc/src/third_party/nasm/config/config-linux.h 2021-03-15 17:51:55 UTC +--- src/webrtc/src/third_party/nasm/config/config-linux.h.orig 2024-03-14 18:07:21 UTC +++ src/webrtc/src/third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ - - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1