From nobody Tue Sep 27 13:07:40 2022 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 4McKfj0y92z4cxny; Tue, 27 Sep 2022 13:07:41 +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 4McKfj0TTDz3R58; Tue, 27 Sep 2022 13:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664284061; 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=k114R2dOpq6145PcYBZyiX22ZgXVN7g0qko9WG2lZJg=; b=uClZJKJtbJTmmt5pAC3SXGkZkkRDyHY06phJiov/N9NdRBgMq2s5dstB3bicZVRLn0glIq gcCL4m6RPq5ngli6eYZM9ZkFzEvMgQXQ7j1G5GIIsImJqWeiiFHMMYIvRVzgucvBVFbedZ Y+csGW3umbEUHaYlL54QQL9ImjPoOwIjCSklmqqu1d6+Dmo3mFkZKHXUgcigKGD3qC6m9D 7p4kaMlqFY3k/iUwPSrL8b+Z29/UULEE61hqWQafa7pGTfXzs1lDnkf9wVeZdwV+G4Fso0 MGqCSza3FooQ4DlejLXjtpDlfFk2W6upF1lH4/pV0tt+QEogAecSLfmNdCDeXw== 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 4McKfh6Msxz17Xn; Tue, 27 Sep 2022 13:07:40 +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 28RD7eVG054428; Tue, 27 Sep 2022 13:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28RD7et5054427; Tue, 27 Sep 2022 13:07:40 GMT (envelope-from git) Date: Tue, 27 Sep 2022 13:07:40 GMT Message-Id: <202209271307.28RD7et5054427@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 47fa29206f1d - main - devel/sdl20: fix build with disabled JOYSTICK 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fa29206f1df1cc709c8dd7b5d19118d9fd0987 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664284061; 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=k114R2dOpq6145PcYBZyiX22ZgXVN7g0qko9WG2lZJg=; b=mKRLbyXIZ9e9eGY8EGBWGPXOht5SsUs3S1IG5fcoTjqwpDaoddkbtYlCKa6PtsH6hxL5c7 WsFjtl2GMLTD249xh3B7uU+F84q8QG9kbN0g5oWHWyioQOXRnZEuDE3R5eAptaUu1VRQAx jq6Jy6vtzoWHxW9FsDU24uDU8ZXumuhJ9imQvCcIMNfJj1q6KkeXtvZQ8mmMCDPpHYhseG xI9HwEL5432B2I7/w/ZOA8pzO4b6kFNGnquR4T9E+qdQbo3NLbb4CUdiGxgIFnG5T1bwOZ z0B4QAZ3R09CwPfJXB03sd6wl4s9vgf8IamUHdRwJaKNO9CgCOdLt5gI0jjV+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664284061; a=rsa-sha256; cv=none; b=csISGbh+myRKiPnoX8SU/645EXGK5xIrlG3L8j5XfX25tEeJaCsU676z84Ru7rEwVS60M/ KSHRXJEGyr7VGryYV6UrKIS+4fi0u6bGxUub5oYQznWKXki3oWvDu0j8XVucPBQxVmr41r ZaDZvDnCvMh0NlAIMPcnUcPweaAARO/FMcXHf3TgPwflxH1PzlLzVjcz42FRDFwitfSJk1 fIQG9HB6EX8jGfp8Y1LykXIopU30L35vrblZqFK0tztaEx7s17hXrS7pEsB+/lHQ9zwwe5 e20BNgBdOXO9wPit3kd51y6l0/RUC0kQ7+wkpCh5VXtEMuG4+E/guHFZ3ikRTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=47fa29206f1df1cc709c8dd7b5d19118d9fd0987 commit 47fa29206f1df1cc709c8dd7b5d19118d9fd0987 Author: Dmitry Marakasov AuthorDate: 2022-09-27 13:06:21 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-27 13:07:34 +0000 devel/sdl20: fix build with disabled JOYSTICK Upstream issue: https://github.com/libsdl-org/SDL/issues/6169 Upstream fix: https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51 --- devel/sdl20/Makefile | 1 - .../patch-src_core_linux_SDL__evdev_capabilities.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 0257b27ff029..d84a9679030b 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -91,7 +91,6 @@ JACK_LIB_DEPENDS= libjack.so:audio/jack JOYSTICK_CONFIGURE_ENABLE= joystick haptic JOYSTICK_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto JOYSTICK_LIB_DEPENDS= libinotify.so:devel/libinotify -JOYSTICK_BROKEN_OFF= Does not build with JOYSTICK disabled NAS_CONFIGURE_ENABLE= nas nas-shared NAS_LIB_DEPENDS= libaudio.so:audio/nas OSS_CONFIGURE_ENABLE= oss diff --git a/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h b/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h new file mode 100644 index 000000000000..3c756ebcc9b1 --- /dev/null +++ b/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h @@ -0,0 +1,20 @@ +--- src/core/linux/SDL_evdev_capabilities.h.orig 2022-01-08 02:29:52 UTC ++++ src/core/linux/SDL_evdev_capabilities.h +@@ -25,8 +25,6 @@ + #ifndef SDL_evdev_capabilities_h_ + #define SDL_evdev_capabilities_h_ + +-#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) +- + #include + + /* A device can be any combination of these classes */ +@@ -52,8 +50,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bi + unsigned long bitmask_abs[NBITS(ABS_MAX)], + unsigned long bitmask_key[NBITS(KEY_MAX)], + unsigned long bitmask_rel[NBITS(REL_MAX)]); +- +-#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */ + + #endif /* SDL_evdev_capabilities_h_ */ +