From nobody Wed Oct 12 10:13:00 2022 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 4MnT4D5lnTz4dxyR; Wed, 12 Oct 2022 10:13:00 +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 4MnT4D5DFRz3l5s; Wed, 12 Oct 2022 10:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665569580; 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=sVdzN2cB6fg5qpYkrLpLVjhq8o8MtIgh5CZ8+HzDWsI=; b=CaSqOKW3qEFNMM4gfX/Rd16vKjYt7H4uz5Ae31FPN+EvgWWljSNUp4fzqFVT/gkYadfYWG HG6E7ZdtdNoUTfo4d8dPSXgWPEuvyuuYc+/WXyDfdePXwJVbd1chVWUEM0sHkfKMyDcdFC CbWZ4MqB8dike9YaBvTHT1mgx6P7luVGJmoai6lLIXcC+vaCvIvpYx7nvq/Kro7jB+czPj GnpNwvqden13ii6yCRpQdoguU1EHJU99wD+AqjLFjsfJD/MNoXjRD9MMCtVX58t3e1R0bS jdaSXwfpwRKTepi1Wv39x+9kHN/CMniKQKqm5zQTWpXom14+PcVdjJAR+EzEZQ== 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 4MnT4D4HMgz1H7v; Wed, 12 Oct 2022 10:13:00 +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 29CAD0jj018871; Wed, 12 Oct 2022 10:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CAD0DZ018870; Wed, 12 Oct 2022 10:13:00 GMT (envelope-from git) Date: Wed, 12 Oct 2022 10:13:00 GMT Message-Id: <202210121013.29CAD0DZ018870@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: fb52ca9c110d - main - emulators/pcsx2: Update to 1.7.3344 and fix build with wx 3.1 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: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb52ca9c110d80e0ab625aac7ef333032755b580 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665569580; 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=sVdzN2cB6fg5qpYkrLpLVjhq8o8MtIgh5CZ8+HzDWsI=; b=iucZXhPyjODQZbgM9JZebSskK02u2tgZuH5uo2h8S6OkyXlbx3XHZEfGQBoJQPEHc9nQbZ z5bPodoExaPbpwLhyN26iZjxZ5xo1770Q7JcUQeGl7WSwEOriUx1ZKNUqclWrd1h3xTWoT XVkiWEBn3xOFfHa26HrxuHlDYx0S+rwkipbDzGsm+qcAwYnRd+KmOwkzvqpQph7hzd2ND+ fhMEmHTXCG8/8YCBsspE80mSk0w9qQpQEr6V6OKC9TqqS9xKjju/MrXitJTh5A/motLwvI Z/PSqf5qSMRnYQJSxe8lMBsepsdA6vHF2ZbhMj//pN3dhNHq5IeRTSK/WalzsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665569580; a=rsa-sha256; cv=none; b=hX1gyAJsBPiiOzXVJUeJ9BbUEVtevn1PepUrM7sgMHMor9tlEO07dAxNR+Nrty1ll759Qk mHf5f5d//3/Avaa5+Am/VGhsyQI/Vj6C+1M02xng4EuKflNWid+QbGyvYhNFtZvcwCnN5g InrKb0HMHOY2HudqS2Qd7bOM6UWJrWEl9ZBChJEBnmFgqG+2Ez1gK5qxTe9yNXuqDFM/m2 eqCU8pCVDitLM9AGwqy5XEy7ymOW7EqZUPcaoTrNP3cZA/qJHLCt0CBiTKeX/CxW5/JePU 5BnCMoBNFAPaEA8TMbHTOp7doW4bG/BWRQ4iaRgA5Q/NSYDa+b21kH4VSlsC6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb52ca9c110d80e0ab625aac7ef333032755b580 commit fb52ca9c110d80e0ab625aac7ef333032755b580 Author: Ganael LAPLANCHE AuthorDate: 2022-10-12 10:12:12 +0000 Commit: Ganael LAPLANCHE CommitDate: 2022-10-12 10:12:12 +0000 emulators/pcsx2: Update to 1.7.3344 and fix build with wx 3.1 --- emulators/pcsx2/Makefile | 2 +- emulators/pcsx2/Makefile.tuples | 1 - emulators/pcsx2/distinfo | 8 +++--- .../pcsx2/files/patch-cmake-SearchForStuff.cmake | 18 +++++++++++++ emulators/pcsx2/files/patch-pcsx2-CMakeLists.txt | 31 ---------------------- 5 files changed, 22 insertions(+), 38 deletions(-) diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile index 176fce84fa2e..1c5d764658c8 100644 --- a/emulators/pcsx2/Makefile +++ b/emulators/pcsx2/Makefile @@ -1,5 +1,5 @@ PORTNAME= pcsx2 -PORTVERSION= 1.7.3274 +PORTVERSION= 1.7.3344 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org diff --git a/emulators/pcsx2/Makefile.tuples b/emulators/pcsx2/Makefile.tuples index 44b86ed559b9..a3cb0f09fb72 100644 --- a/emulators/pcsx2/Makefile.tuples +++ b/emulators/pcsx2/Makefile.tuples @@ -2,7 +2,6 @@ GH_TUPLE= \ rtissera:libchdr:5de1a59019815ccdbba0fe07c71b31406d023248:libchdr/3rdparty/libchdr/libchdr \ mozilla:cubeb:dc511c6b3597b6384d28949285b9289e009830ea:cubeb/3rdparty/cubeb/cubeb \ biojppm:rapidyaml:213b201d264139cd1b887790197e08850af628e3:rapidyaml/3rdparty/rapidyaml/rapidyaml \ - ocornut:imgui:60bea052a92cbb4a93b221002fdf04f0da3698e1:imgui/3rdparty/imgui/imgui \ facebook:zstd:e47e674cd09583ff0503f0f6defd6d23d8b718d3:zstd/3rdparty/zstd/zstd \ google:googletest:800f5422ac9d9e0ad59cd860a2ef3a679588acb4:googletest/3rdparty/cubeb/cubeb/googletest \ arsenm:sanitizers-cmake:aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a:sanitizerscmake/3rdparty/cubeb/cubeb/cmake/sanitizers-cmake \ diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo index c1668aa0c336..b058f7d72d02 100644 --- a/emulators/pcsx2/distinfo +++ b/emulators/pcsx2/distinfo @@ -1,14 +1,12 @@ -TIMESTAMP = 1663532752 -SHA256 (pcsx2-pcsx2-1.7.3274-v1.7.3274_GH0.tar.gz) = f7b9d64cdd32f95c37157f4b805ab8d1a162b0e481b16fc1857108d4488ccb37 -SIZE (pcsx2-pcsx2-1.7.3274-v1.7.3274_GH0.tar.gz) = 18696918 +TIMESTAMP = 1665430531 +SHA256 (pcsx2-pcsx2-1.7.3344-v1.7.3344_GH0.tar.gz) = c60ef26bd6b2aeaa8c41f04c4df3a4d079962d53979900ef94272a427b56a6e9 +SIZE (pcsx2-pcsx2-1.7.3344-v1.7.3344_GH0.tar.gz) = 19384408 SHA256 (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = e0df9f88cd93e673d384cbf7cf28ea396aba96c769b41ec149a259768b27b00c SIZE (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = 414409 SHA256 (mozilla-cubeb-dc511c6b3597b6384d28949285b9289e009830ea_GH0.tar.gz) = e67aae13adcb84b1548e2a6de266e2daadaa26aff86d91e775749748c3894478 SIZE (mozilla-cubeb-dc511c6b3597b6384d28949285b9289e009830ea_GH0.tar.gz) = 223207 SHA256 (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = c206d4565ccfa721991a8df90821d1a1f747e68385a0f3f5b9ab995e191c06be SIZE (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = 446070 -SHA256 (ocornut-imgui-60bea052a92cbb4a93b221002fdf04f0da3698e1_GH0.tar.gz) = 53da3a145256434fa9c16720d03916a173a6bc447c3c4b53ab46159cd85283a3 -SIZE (ocornut-imgui-60bea052a92cbb4a93b221002fdf04f0da3698e1_GH0.tar.gz) = 1477417 SHA256 (facebook-zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3_GH0.tar.gz) = 2a7b7e5d3f8c759894f0fea9917a590733600574d20cb53f3be827c7c62862e1 SIZE (facebook-zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3_GH0.tar.gz) = 1952167 SHA256 (google-googletest-800f5422ac9d9e0ad59cd860a2ef3a679588acb4_GH0.tar.gz) = 57bc26ac31e1bc47a12e4ae99a0f6e17506ba10f0f82ae16aa52cc7cc215a3b0 diff --git a/emulators/pcsx2/files/patch-cmake-SearchForStuff.cmake b/emulators/pcsx2/files/patch-cmake-SearchForStuff.cmake new file mode 100644 index 000000000000..f251c7ced6e8 --- /dev/null +++ b/emulators/pcsx2/files/patch-cmake-SearchForStuff.cmake @@ -0,0 +1,18 @@ +Enable building with WX 3.1 + +--- cmake/SearchForStuff.cmake.orig 2022-09-02 10:21:30 UTC ++++ cmake/SearchForStuff.cmake +@@ -81,7 +81,12 @@ else() + endif() + else() + if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +- set(wxWidgets_CONFIG_EXECUTABLE "/usr/local/bin/wxgtk3u-3.0-config") ++ if(EXISTS "/usr/local/bin/wxgtk3u-3.1-config") ++ set(wxWidgets_CONFIG_EXECUTABLE "/usr/local/bin/wxgtk3u-3.1-config") ++ endif() ++ if(EXISTS "/usr/local/bin/wxgtk3u-3.0-config") ++ set(wxWidgets_CONFIG_EXECUTABLE "/usr/local/bin/wxgtk3u-3.0-config") ++ endif() + endif() + if(EXISTS "/usr/bin/wx-config-3.2") + set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.2") diff --git a/emulators/pcsx2/files/patch-pcsx2-CMakeLists.txt b/emulators/pcsx2/files/patch-pcsx2-CMakeLists.txt deleted file mode 100644 index b396868826ae..000000000000 --- a/emulators/pcsx2/files/patch-pcsx2-CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ ---- pcsx2/CMakeLists.txt.orig 2022-09-02 10:21:30 UTC -+++ pcsx2/CMakeLists.txt -@@ -1581,8 +1581,14 @@ endif() - - # MacOSX/BSD - if(UNIX AND NOT Linux) -+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") - target_sources(PCSX2 PRIVATE -- ${pcsx2OSXSources} -+ ${pcsx2FreeBSDSources}) -+ else() -+ target_sources(PCSX2 PRIVATE -+ ${pcsx2OSXSources}) -+ endif() -+ target_sources(PCSX2 PRIVATE - ${pcsx2LinuxHeaders} - ${pcsx2USBNullSources} - ${pcsx2USBNullHeaders}) -@@ -1599,12 +1605,6 @@ else() - ${pcsx2USBNullSources} - ${pcsx2USBNullHeaders}) - endif() --endif() -- --if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") -- target_sources(PCSX2 PRIVATE -- ${pcsx2FreeBSDSources} -- ${pcsx2LinuxHeaders}) - endif() - - target_link_libraries(PCSX2_FLAGS INTERFACE