From nobody Tue Nov 21 20:39:39 2023 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 4SZbpM2s4Dz52G6j; Tue, 21 Nov 2023 20:39:39 +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 4SZbpM2LZYz3QWq; Tue, 21 Nov 2023 20:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700599179; 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=xIz50KWnbIX5iLPTS5UmjBH1bk9r8M2wpnfY3Y54BzQ=; b=EGC/3wRvGtVbji2ycIRp3BKJKqOtdcsWzs1wcnHKTBdkXVHxdho40vyoISZ9Xp8U7EDA65 s/Ycvzsg5M3KU2rZB45EAGIn+VqJLcEQYTk7CF8hwoX4uHhbYDMJkV/z8f/OOCOaSfWY1Q f538A2kVczvsZOQ4F9RXbdPugZvsCAoF+GHsjg/5qMfBQZXfvLqHCoyGJsx1cBMBU9COLv gvCKbPT7CgDmz3mbS4ZzR5h7ugUoC5PB1TPBqVCMVDI3QmSuVL4UnZYaFadvcrRzAvBNAQ AQNDTCntEuxwI+fsO4Ww/n1VQ0Rcbo0KSUcKJw+mBOCb6rQMzxdrK8zQuALWZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700599179; 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=xIz50KWnbIX5iLPTS5UmjBH1bk9r8M2wpnfY3Y54BzQ=; b=l35mbkyb/yXCq/GI2EGq2K+qJlnwWKGpsNpOJ8yP4CYnShAgH7TrFm5JXszEg0srWmle8g k8xBHqFNbe7mJZXxl0dWLQQxE9lBehvLhYodFmW/8Nf9TR4hEudxyt2GIWgYUkR7+2QbfF PJCLBSlAF4pEJ6oKE9H7h2CKuLXbETS1QOpuRsmqG+qqbGA8wzL1zU9wP+/by0ynJ5i8+1 eRrRMA9gi9oVnqJPF1puuiKkPkHnM5n1R1YZ+1vPamjkA/JdXF91jfYcXDt1VBpG2IUcCy lzly2uiNVxfrDiUGZ+x0T+wdopckcGNYHSulQfEWBe3KvYUfJ2djRV44b9nMnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700599179; a=rsa-sha256; cv=none; b=nfuNwQNsjeFQJIgdGm0QDwCeeS9Gx2tzZoSq69Y8XnxELNocv9XKrx4fTd/8rcwllw96YN xsor3/GxFqzR9LIoucOtQF/zoL8BGo5PGeAYnGxCne3bk0eXduA8DfOkDzNMTiDpRpnGZ7 pmZV4R6Glqw6oKaK3MqdIsc4cIZ8JbYIK1SSbIM4U8igsbuUDkcHhBpcYi3tYgP0cXndjI M1ZjNQPixntD2mLnznNtlQcsJANQIvkF1T3dNjSwFXJZuSINScm2HTLut+WXrJbBqyH7Nc DRXpcUkxDaA+slc2sVBhw59KHYxpwfwU7x7FNWxKPE8T04tC4iitQ4tRkEU/HQ== 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 4SZbpM1P4JzqQb; Tue, 21 Nov 2023 20:39:39 +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 3ALKdd31047687; Tue, 21 Nov 2023 20:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALKddGT047684; Tue, 21 Nov 2023 20:39:39 GMT (envelope-from git) Date: Tue, 21 Nov 2023 20:39:39 GMT Message-Id: <202311212039.3ALKddGT047684@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 2cf7924d2f43 - main - multimedia/vmaf: unbreak build with clang 15 after a57fa8802ae7 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cf7924d2f434617187db3f9a5205e461e89c26a Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cf7924d2f434617187db3f9a5205e461e89c26a commit 2cf7924d2f434617187db3f9a5205e461e89c26a Author: Jan Beich AuthorDate: 2023-11-21 20:31:52 +0000 Commit: Jan Beich CommitDate: 2023-11-21 20:39:25 +0000 multimedia/vmaf: unbreak build with clang 15 after a57fa8802ae7 ../tools/cli_parse.c:194:21: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] while ((key_val = strsep(&optarg_copy, ":")) != NULL) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:195:15: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *key = strsep(&key_val, "="); ^ ~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:196:15: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *val = strsep(&key_val, "="); ^ ~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:221:19: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *name = strsep(&key, "."); ^ ~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:223:19: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *opt = strsep(&key, "."); ^ ~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:240:30: warning: call to undeclared function 'strnlen'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] const size_t optarg_sz = strnlen(optarg, 1024); ^ ../tools/cli_parse.c:249:17: warning: call to undeclared function 'strsep'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] .name = strsep(&optarg_copy, "="), ^ ../tools/cli_parse.c:249:17: error: incompatible integer to pointer conversion initializing 'const char *' with an expression of type 'int' [-Wint-conversion] .name = strsep(&optarg_copy, "="), ^~~~~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:255:21: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] while ((key_val = strsep(&optarg_copy, ":")) != NULL) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:256:21: error: incompatible integer to pointer conversion initializing 'const char *' with an expression of type 'int' [-Wint-conversion] const char *key = strsep(&key_val, "="); ^ ~~~~~~~~~~~~~~~~~~~~~ ../tools/cli_parse.c:257:21: error: incompatible integer to pointer conversion initializing 'const char *' with an expression of type 'int' [-Wint-conversion] const char *val = strsep(&key_val, "="); ^ ~~~~~~~~~~~~~~~~~~~~~ Reported by: Michael Butler --- multimedia/vmaf/Makefile | 1 + multimedia/vmaf/files/patch-meson.build | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile index 33cb60a3ded0..1594d4390525 100644 --- a/multimedia/vmaf/Makefile +++ b/multimedia/vmaf/Makefile @@ -1,6 +1,7 @@ PORTNAME= vmaf DISTVERSIONPREFIX= v DISTVERSION= 3.0.0-rc +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/vmaf/files/patch-meson.build b/multimedia/vmaf/files/patch-meson.build new file mode 100644 index 000000000000..0843e2f267a1 --- /dev/null +++ b/multimedia/vmaf/files/patch-meson.build @@ -0,0 +1,22 @@ +../src/feature/feature_collector.c:72:36: error: call to undeclared function 'strnlen'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + 72 | const size_t feature_name_sz = strnlen(feature_name, 2048); + | ^ +../src/feature/feature_name.c:34:24: error: call to undeclared function 'strnlen'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + 34 | const size_t len = strnlen(buf, buf_sz); + | ^ +../tools/cli_parse.c:194:21: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] + while ((key_val = strsep(&optarg_copy, ":")) != NULL) { + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- meson.build.orig 2023-11-20 19:15:15 UTC ++++ meson.build +@@ -26,9 +26,6 @@ elif host_machine.system() == 'darwin' + elif host_machine.system() == 'darwin' + test_args += '-D_DARWIN_C_SOURCE' + add_project_arguments('-D_DARWIN_C_SOURCE', language: 'c') +-else +- test_args += '-D_XOPEN_SOURCE=600' +- add_project_arguments('-D_XOPEN_SOURCE=600', language: 'c') + endif + + # Header checks