From nobody Thu Feb 20 23:28:13 2025 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 4YzTvy24r3z5pZ5j; Thu, 20 Feb 2025 23:28:14 +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 4YzTvx6h4zz3jLZ; Thu, 20 Feb 2025 23:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740094094; 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=f/zcda0qjVh3uzUpcX0SmI778ACE9Fz/G4UsdQKiHbw=; b=yCCT2cxed89+sZBFASxqE18WZTALC/8y0i1c7oKuDG5DrNqcGXGRQGD1OERHeRmwKkJhoh IJ5hUvZbUEyjn2Sv6+Kxf6ZzGkcqfc+QvRp5qlJtcMqkRJJW+P7T3vNcRCbbzKv3weGJbc mLcdz9MkOGWrryNhYTy2cFdlPj+cbtEvoNfaW/d4CNopH9qo8Fi9V9ThQhLCoV3BL9JEk7 jeflD/cJd1fLgimWWU9OQxVCaa0g2dym0fUWsr7MLv4neztnoJxwzKVLyNW+Susf3rKeVp 76hcJuzalb+tnsQLaTIFi2YIXWbxcy7u9MUEerGZ8HlGEJi8F1slfGC9KSVs/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740094094; a=rsa-sha256; cv=none; b=ymfBCaLo5Q+vIluMHO8Tp1NPizXz5b20iR/bEl4Zq9epyaD9B5v09A25PzuYSMRDl5j36n Z9eOM6ORDFBvDMtmSTD01pNP0yvDPEpKn6zXNnJeoPNyYXy8Xg7c9/sFtOmFk3p/uIgntD oHHb2AKYK5y6CHleyc+wP93WpvWJX6QjlbzgetcT0nVpSW761WatDGCSC2NnwAkbGeA8pd t5oSajAQxCrWCqZAUzOd5pPjXFumeY2D0HR7rUDs3Td5V6O47SIYgomwSYvT1XtFMbCNR5 dnkJTOCETdyYdV8QQF0aJppERokUWp9AY7O0VavyaV7sm04ZToMMi8nj8jXEDg== 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=1740094093; 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=f/zcda0qjVh3uzUpcX0SmI778ACE9Fz/G4UsdQKiHbw=; b=kY9p8bJwjh3pnRGoH2mTuiOkrpTHCohqdlDZOGrc/DIyGfi7zeCxJXayH7vUBihgQF8Z7o j/Um/Q1DdU8yVKynLmXImCf/qG0QRXngiWvmA8jgiaRmdsU6fsxnTDD2zqsm/crXkXfPUd Bv8RtUuD9iER076X2LLlM7HBeYFgkto3fOxqht82JVqS+wzJuTCevIamj9HyKWVzAFpSm7 +OGp8WMrSWXvfDhqw4Pq4uCbZ+Ix6eppL3F0N+BXn2JChCrQ7xEofF1Bx4n8E0WfHh+j7q qibcv312ukHP07EpyXjl1Wmf6YDyBx9KbE8iGADZD0FZQ6ANLmv2Fatsar/Ezw== 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 4YzTvx6H8Zz1Bwg; Thu, 20 Feb 2025 23:28:13 +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 51KNSDKj087167; Thu, 20 Feb 2025 23:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KNSD2T087164; Thu, 20 Feb 2025 23:28:13 GMT (envelope-from git) Date: Thu, 20 Feb 2025 23:28:13 GMT Message-Id: <202502202328.51KNSD2T087164@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 3d9903862da8 - main - devel/godot-tools: fix joystick driver code 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d9903862da8e530ebbc38840e23867c91e4c08f Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d9903862da8e530ebbc38840e23867c91e4c08f commit 3d9903862da8e530ebbc38840e23867c91e4c08f Author: Chédotal Julien AuthorDate: 2025-02-19 15:17:08 +0000 Commit: Robert Clausecker CommitDate: 2025-02-20 23:27:26 +0000 devel/godot-tools: fix joystick driver code Approved by: FreeBSD@ShaneWare.Biz PR: 284869 MFH: 2025Q1 --- devel/godot-tools/Makefile | 1 + devel/godot-tools/files/patch-platform_linuxbsd_detect.py | 11 +++++++++++ .../files/patch-platform_linuxbsd_libudev-so__wrap.c | 11 +++++++++++ .../files/patch-thirdparty_linuxbsd_headers_udev_libudev.h | 11 +++++++++++ 4 files changed, 34 insertions(+) diff --git a/devel/godot-tools/Makefile b/devel/godot-tools/Makefile index 43e64dd72d98..4d46aa2a5fcb 100644 --- a/devel/godot-tools/Makefile +++ b/devel/godot-tools/Makefile @@ -1,4 +1,5 @@ PKGNAMESUFFIX= -tools +PORTREVISION= 3 COMMENT= Game integrated development environment diff --git a/devel/godot-tools/files/patch-platform_linuxbsd_detect.py b/devel/godot-tools/files/patch-platform_linuxbsd_detect.py new file mode 100644 index 000000000000..ab0cb61205cb --- /dev/null +++ b/devel/godot-tools/files/patch-platform_linuxbsd_detect.py @@ -0,0 +1,11 @@ +--- platform/linuxbsd/detect.py.orig 2025-02-19 15:17:58.330499000 +0100 ++++ platform/linuxbsd/detect.py 2025-02-19 15:20:19.837955000 +0100 +@@ -370,7 +370,7 @@ + else: + env.Append(CPPDEFINES=["XKB_ENABLED"]) + +- if platform.system() == "Linux": ++ if platform.system() in ["Linux","FreeBSD"]: + env.Append(CPPDEFINES=["JOYDEV_ENABLED"]) + if env["udev"]: + if not env["use_sowrap"]: diff --git a/devel/godot-tools/files/patch-platform_linuxbsd_libudev-so__wrap.c b/devel/godot-tools/files/patch-platform_linuxbsd_libudev-so__wrap.c new file mode 100644 index 000000000000..1becd49b36cc --- /dev/null +++ b/devel/godot-tools/files/patch-platform_linuxbsd_libudev-so__wrap.c @@ -0,0 +1,11 @@ +--- platform/linuxbsd/libudev-so_wrap.c.orig 2025-02-19 15:17:47.002070000 +0100 ++++ platform/linuxbsd/libudev-so_wrap.c 2025-02-19 15:19:37.278257000 +0100 +@@ -281,7 +281,7 @@ + int initialize_libudev(int verbose) { + void *handle; + char *error; +- handle = dlopen("libudev.so.1", RTLD_LAZY); ++ handle = dlopen("libudev.so.0", RTLD_LAZY); + if (!handle) { + if (verbose) { + fprintf(stderr, "%s\n", dlerror()); diff --git a/devel/godot-tools/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h b/devel/godot-tools/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h new file mode 100644 index 000000000000..7ce8d19a4a13 --- /dev/null +++ b/devel/godot-tools/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h @@ -0,0 +1,11 @@ +--- thirdparty/linuxbsd_headers/udev/libudev.h.orig 2025-02-19 15:18:28.842768000 +0100 ++++ thirdparty/linuxbsd_headers/udev/libudev.h 2025-02-19 15:18:40.913920000 +0100 +@@ -22,7 +22,7 @@ + #define _LIBUDEV_H_ + + #include +-#include ++// #include + #include + + #ifdef __cplusplus