From nobody Thu Feb 20 23:30:00 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 4YzTy11nw4z5pZNl; Thu, 20 Feb 2025 23:30:01 +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 4YzTy063xjz3lP8; Thu, 20 Feb 2025 23:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740094200; 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=A81GSM1cEIPCha8jR1w+hSV0HGs7zFXpIvVKp+qckaQ=; b=K55gq5o/72RH8lWSn7/W5X1uh18yrwO3kufHrz3AFxplZBEN9wKFuC+T/88EF73+xXgyCw HuNwINUUmjWu8iqAu7eh4N4T/w13LGH69luMlQsPR2rytP6R/SH8tLbXBokGYaPSyrLbNF grZlC6LDe1BKWTxesiKFtQR/MUI4wdQAxSAJIXuDlfrGtTVF7Aa5a+jUFqyVjEzfdHdwXf qN74T3860oABUd9b533j/JVhIzTXNX7tUrBzwtv0ilmxePgGXcaDdJD4yfpchL8z4qCPy0 nq+Mw8xVpJ8hmu8Av/Fjz93DyxgCKWAgvPAiiazC8QmJAHOcD74ZdBeGmy5Sgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740094200; a=rsa-sha256; cv=none; b=Y58pTOYsSKgs0dRT9YYwHxEfGke0dPv2wnzJCdwcyDIHo2TtLIG34u714yeD3mjwvfgI6T Y+PtGvcoEmDxqqvwaX1m8/X/AfFHngGl0IJ1f7VigP3NKxPpDzfs5LMHwSdOsQRuz6CkZJ noL5qOg41BvILdk0OWyKROIklTsgcK/A/09O7HxAM/q70FHMPcc7WHc9l9T8ftSJATN5yO 9swyCSkm/9mPAHSe20KPKrzsq6vcnKvYxIe2KkxtAVGft8jGp3773YNZVX6brkMXrJih2X +PCUJuCQ9MV0rAudk48R7n9OATYxw7d0SfT629mqGel527SbGCAfBCmyNMuOLQ== 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=1740094200; 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=A81GSM1cEIPCha8jR1w+hSV0HGs7zFXpIvVKp+qckaQ=; b=UnO5QaeHNTfm9nYQgHKzrHLKY/ui+7pxoClSeXM/gCTz9TCVifMbqJxDV0X0GXaMQUNFmi gpdi9n7adF0tcRpqEaVScmU8EaBOIcDRQO/VoB703lzCQyTIDyrjVWzjs4g5Uz5apf4KyB vQ9X9YW7oATMdie1/8yY3B10G+N4ZDQ+J1P1C2xZ083kXvGowNFFyq31f0U2QftLPfwNOM nTbmJoU2LKSqkP6JR38sbyH0dLiRtHeOy92tSRYJK2AwaKbXaa21LOvXvobQhQ0FWKz+P6 EkV4FtwrYpck6OaNhS56dZg5ERk1u6K1puCgUephwV1nlM4A+7pfOb1A4SsTtQ== 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 4YzTy05YFyz1Brv; Thu, 20 Feb 2025 23:30:00 +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 51KNU0X5088892; Thu, 20 Feb 2025 23:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KNU0wN088864; Thu, 20 Feb 2025 23:30:00 GMT (envelope-from git) Date: Thu, 20 Feb 2025 23:30:00 GMT Message-Id: <202502202330.51KNU0wN088864@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 6b40f35e9668 - 2025Q1 - 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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 6b40f35e96681da84b64b1797b3069610cb93f6e Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b40f35e96681da84b64b1797b3069610cb93f6e commit 6b40f35e96681da84b64b1797b3069610cb93f6e Author: Chédotal Julien AuthorDate: 2025-02-19 15:17:08 +0000 Commit: Robert Clausecker CommitDate: 2025-02-20 23:29:19 +0000 devel/godot-tools: fix joystick driver code Approved by: FreeBSD@ShaneWare.Biz PR: 284869 MFH: 2025Q1 (cherry picked from commit 3d9903862da8e530ebbc38840e23867c91e4c08f) --- 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