From nobody Sun Feb 18 09:53:26 2024 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 4Td1Ff6SZ7z5C6yV; Sun, 18 Feb 2024 09:53:26 +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 4Td1Ff5rFrz46J2; Sun, 18 Feb 2024 09:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250006; 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=3BfY3d+64wuFs9a8oEkYiqJidQGqLc0AWTJ2udBq7K4=; b=snzhrsyNkAlJODJGXiOimEYYG1GxIBQQGw8mTdWR/qtNCHzFGjalP/yL6F9PgA8COc5Jad /hGq5JjpScx9CONno1eKc9eeoh0E3H/bLujrti6He+y2/Xmp1lU/mvoXpyXmSX9l/vYo3w OTHwfM9/U352m8bI3f5aNyE0ONL5/BCHMmcT9s+UNCk0vihzPGTXqrP9h5l/jssYwn9Rwv twMt65j5TzaF3kUdD6RpsRuvdP/CnPzNwR6TOOqjRckdAbKKvjzOJblfZhl0MIm/SZG58A uR1Xd62GPGSj0Qdj5HvtYvyrwSCb1RlWIcK04znFCLp//ohs/E0AKHDFlXzT5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250006; 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=3BfY3d+64wuFs9a8oEkYiqJidQGqLc0AWTJ2udBq7K4=; b=w2d8jgNp/DhLaoeeSuY1o1/oQ7h/siB2FKnJ/Xo1uCSOlCs+Qv1c3zzRJXZtcQrLKUr9QT 3MhmrKDoZNhUZXbphZ/I54GEB5S2vQJTjr8QGE1gCHtAlQJijZ3eVcuMoqLMltpnRX+fQr ysldQw8C0HGmKqRZowEgCa6oWlWxyvu0dSHddLxmV55ah967JiblfnyZbblaDMsyR63KCa OfDBndns5wlaDdJkoXT0fNo0HTMwnTG6Uj9D0cjXJRVCVuDt1GvpDrqEOftiWXbSHvHqIA 9JdnYp1Km28zIBqHwt+8zXe+0/lsF7bK144yh9fON3ry6Q3U9PgVINyyptj7rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708250006; a=rsa-sha256; cv=none; b=vUX9S0Q1XWBN81Q7B2zGTmxkTBwXSRM8ihsnONzW7VCrV/juXKRrMV3m8ShNInlbVHBQIk 6C/G5sAvzHM5anwssIQCZHiIQuUgeqrJPMMk1oXwcVgkgTYt8Pk+BkF9/Blb3sywOwYPCf SvnpD69lnMXFH4gsuBnQ/9Gld8PjSsacXqzs7X/IMmFUTXN6lXM+mqxSjNrfHJwVCMdcWp x0hhe7GCIL1fKRF9gIp/2TcCPtLxnuorQV1I5XLvTKDXQX5o0KEKHQ+0ileGCU4exFZ4D3 eyIcZlizaTD7Fggb6LoX2LlrdiWOZajdTqo3WQYZh5xyB8CqMvViTKH472EGuw== 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 4Td1Ff4wl2zmjb; Sun, 18 Feb 2024 09:53:26 +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 41I9rQW6066742; Sun, 18 Feb 2024 09:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I9rQW6066739; Sun, 18 Feb 2024 09:53:26 GMT (envelope-from git) Date: Sun, 18 Feb 2024 09:53:26 GMT Message-Id: <202402180953.41I9rQW6066739@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: cb9b4d096498 - main - games/retroarch: Incorporate changes from a pull request 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb9b4d09649857e585159630f4d31e014af21884 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb9b4d09649857e585159630f4d31e014af21884 commit cb9b4d09649857e585159630f4d31e014af21884 Author: Emanuel Haupt AuthorDate: 2024-02-18 08:46:52 +0000 Commit: Emanuel Haupt CommitDate: 2024-02-18 09:53:15 +0000 games/retroarch: Incorporate changes from a pull request Incorporate changes from a pull request for improved traceability and documentation. See https://github.com/libretro/RetroArch/pull/16221 This is a NOP change and does not warrant a PORTREVISION bump. --- games/retroarch/files/patch-input_input__keymaps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games/retroarch/files/patch-input_input__keymaps.c b/games/retroarch/files/patch-input_input__keymaps.c index dae7278b7f58..4dd10b4c46c1 100644 --- a/games/retroarch/files/patch-input_input__keymaps.c +++ b/games/retroarch/files/patch-input_input__keymaps.c @@ -5,7 +5,7 @@ #endif -#if defined(__linux__) || defined(HAVE_WAYLAND) -+#if defined(__linux__) || defined(HAVE_WAYLAND) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(HAVE_WAYLAND) || defined(__FreeBSD__) && !defined(__PS4__) #if defined(__linux__) #include #include @@ -14,7 +14,7 @@ #endif -#if defined(__linux__) || defined(HAVE_WAYLAND) -+#if defined(__linux__) || defined(HAVE_WAYLAND) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(HAVE_WAYLAND) || defined(__FreeBSD__) && !defined(__PS4__) /* Note: Only one input can be mapped to each * RETROK_* key. If several physical inputs * correspond to the same key, these inputs