From nobody Mon Jan 3 21:44:13 2022 X-Original-To: dev-commits-ports-branches@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 C818F1927704; Mon, 3 Jan 2022 21:44:13 +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 4JSTlx40Gyz4RQF; Mon, 3 Jan 2022 21:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 69D43502F; Mon, 3 Jan 2022 21:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203LiDTL093787; Mon, 3 Jan 2022 21:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203LiDFL093786; Mon, 3 Jan 2022 21:44:13 GMT (envelope-from git) Date: Mon, 3 Jan 2022 21:44:13 GMT Message-Id: <202201032144.203LiDFL093786@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: d00fbf8fc3ef - 2022Q1 - games/openclonk: unbreak build after 9cb3316ecd20 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: d00fbf8fc3ef3f4dd37a7c58cc1d0b8fba62882d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641246253; 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=VVkwd7OPPhsMtH7x2MUvAq/xi1OeZtIZFyG54crb5Mg=; b=jVFqwY/5U8EkGjKxbEpRvwzuGrAOSxNvfBwgzOQoQAy56TCCdyc6sK/FZIVmApwSOYnf+2 EXGEw3kk6Cr6qk36ad6qXf+hlqI25PJVvVSrvoOhCV9QCWe2/p/qLBst08zXZBkFho3rth JSxl4wBEpEGRrS1taSrU3qwlO1MQoQOjWEscJ9Y1PtuIDSMu4xRllcGYhsUnwS2DoPfSkQ OmCuovAELm1DuNg0ZuOjHL3gH1qHvfSKCGe9oXwYeveR43uHUqM8FRhGQvOfQ9GnrwZxsE KnoJxNKKBBQ6wFy2Ly4PpGJ52sClSipbSEIOe4PDKWeYT8nWOaijYC13TCHPMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641246253; a=rsa-sha256; cv=none; b=IIt5sSfwY5Ot8+4HhQwd90qqTYuRD/QoyA7Nm4B7ZTtTpUjs2Kg7vmyUkdD0fHvBDII830 zxbR3CRMWevvUjZr/t9pPvqyiv5itgf+bO6Pktwv1SzQePwjgeT31fPg+rqGTifsJPPbqE G/xGE/o6u6nW8GQ2g7tzgF94CqTWR9pNR/rGp3XWNM8kmQ+h0Yhnyj3RI9RvKDYA/TSh3x SB1BX4xNJLjzs+U3F0UipiaCDKizsAkAGW1h9kyr5nPyaKBvXDyoIK6V6JRDyAKAlRBiIT sAx5jF/A+LWdeNWRcKnaCO1kFc4/yrFnLXw4Ymnv1bvXyeK0pC6m5/7cSGdVoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d00fbf8fc3ef3f4dd37a7c58cc1d0b8fba62882d commit d00fbf8fc3ef3f4dd37a7c58cc1d0b8fba62882d Author: Jan Beich AuthorDate: 2022-01-03 19:51:54 +0000 Commit: Jan Beich CommitDate: 2022-01-03 21:44:09 +0000 games/openclonk: unbreak build after 9cb3316ecd20 sdl2 has a namespace pollution where defines unprefixed HAVE_* macros often used by autotools, CMake, Meson. As sdl2 now depends on libinotify for joystick support HAVE_SYS_INOTIFY_H confuses openclonk which itself fails to detect . Due to inconsistent macro visibility and missing -linotify the build breaks. So, force-disable inotify code as it seems to be only used by editor (e.g., reload scenarios on changes) which since openclonk 8.0 requires Qt5. $ rg HAVE_SYS_INOTIFY_H /usr/local/include /usr/local/include/SDL2/SDL_config.h 223:#define HAVE_SYS_INOTIFY_H 1 $ make [...] -- Looking for C++ include sys/inotify.h -- Looking for C++ include sys/inotify.h - not found [...] src/platform/C4FileMonitor.cpp:29:2: error: use of undeclared identifier 'fd' fd = inotify_init1(IN_CLOEXEC); ^ src/platform/C4FileMonitor.cpp:30:6: error: use of undeclared identifier 'fd' if (fd == -1) fd = inotify_init(); ^ src/platform/C4FileMonitor.cpp:30:16: error: use of undeclared identifier 'fd' if (fd == -1) fd = inotify_init(); ^ src/platform/C4FileMonitor.cpp:31:6: error: use of undeclared identifier 'fd' if (fd == -1) LogF("inotify_init %s", strerror(errno)); ^ src/platform/C4FileMonitor.cpp:42:15: error: use of undeclared identifier 'fd' while (close(fd) == -1 && errno == EINTR) { } ^ src/platform/C4FileMonitor.cpp:57:29: error: use of undeclared identifier 'fd' int wd = inotify_add_watch(fd, file, IN_CREATE | IN_MODIFY | IN_MOVED_TO | IN_MOVE_SELF | IN_ONLYDIR); ^ src/platform/C4FileMonitor.cpp:60:2: error: use of undeclared identifier 'watch_descriptors' watch_descriptors[wd] = file; ^ src/platform/C4FileMonitor.cpp:65:59: error: use of undeclared identifier 'fd' if ((pfd->revents & pfd->events) != POLLIN || pfd->fd != fd) ^ src/platform/C4FileMonitor.cpp:66:69: error: use of undeclared identifier 'fd' LogF("C4FileMonitor::Execute unexpectedly called %d %d %hd %hd", fd, pfd->fd, pfd->events, pfd->revents); ^ src/platform/C4FileMonitor.cpp:69:11: error: use of undeclared identifier 'fd' if (read(fd, buf, sizeof(buf)) > 0) ^ src/platform/C4FileMonitor.cpp:71:23: error: use of undeclared identifier 'watch_descriptors' const char * file = watch_descriptors[event->wd]; ^ src/platform/C4FileMonitor.cpp:99:17: error: use of undeclared identifier 'fd' pollfd pfd = { fd, POLLIN, 0 }; ^ PR: 260885 Reported by: pkg-fallout Submitted by: Kevin Zheng (maintainer, different commit message) (cherry picked from commit deb3482f019ce860b2998f0f55475900edd35b9e) --- games/openclonk/files/patch-src_platform_C4FileMonitor.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/games/openclonk/files/patch-src_platform_C4FileMonitor.cpp b/games/openclonk/files/patch-src_platform_C4FileMonitor.cpp new file mode 100644 index 000000000000..e10a95e65c32 --- /dev/null +++ b/games/openclonk/files/patch-src_platform_C4FileMonitor.cpp @@ -0,0 +1,11 @@ +--- src/platform/C4FileMonitor.cpp.orig 2022-01-02 18:07:10 UTC ++++ src/platform/C4FileMonitor.cpp +@@ -21,6 +21,8 @@ + + #include "game/C4Application.h" + ++#undef HAVE_SYS_INOTIFY_H ++ + #ifdef HAVE_SYS_INOTIFY_H + #include +