diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile index 176fce84fa2e..1c5d764658c8 100644 --- a/emulators/pcsx2/Makefile +++ b/emulators/pcsx2/Makefile @@ -1,70 +1,70 @@ PORTNAME= pcsx2 -PORTVERSION= 1.7.3274 +PORTVERSION= 1.7.3344 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org COMMENT= Free and open-source PlayStation 2 emulator WWW= https://pcsx2.net LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 # Notes on dependencies (see cmake/SearchForStuff.cmake): # - rapidyaml (and c4core) come from 3rdparty/ (0.4.0 is needed) # - glad comes from 3rdparty/ (conflicts with libglvnd) # - zstd comes from 3rdparty/ (not detected yet) # - cubeb comes from 3rdparty/ (not available from ports yet) LIB_DEPENDS= libpng.so:graphics/png \ libpulse.so:audio/pulseaudio \ libSoundTouch.so:audio/soundtouch \ libsamplerate.so:audio/libsamplerate \ libharfbuzz.so:print/harfbuzz \ libfmt.so:devel/libfmt \ libzip.so:archivers/libzip # libryml.so:devel/rapidyaml \ # libglad.so:graphics/glad \ # libzstd.so:archivers/zstd USES= cmake desktop-file-utils gl gnome pkgconfig sdl xorg USE_GITHUB= yes GH_PROJECT= pcsx2 GH_TAGNAME= v${PORTVERSION} .include "${.CURDIR}/Makefile.tuples" USE_GL= egl USE_GNOME= glib20 gtk30 USE_SDL= sdl2 USE_XORG= ice x11 xcb xext xpm xrandr USE_WX= 3.0+ # See: cmake/BuildParameters.cmake CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \ -DPACKAGE_MODE:BOOL=ON \ -DUSE_VTUNE:BOOL=OFF \ -DUSE_VULKAN:BOOL=OFF \ -DQT_BUILD:BOOL=OFF \ -DENABLE_TESTS:BOOL=OFF \ -DDISABLE_PCSX2_WRAPPER:BOOL=ON DATADIR= ${PREFIX}/share/PCSX2 OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CMAKE_ON= -DNO_TRANSLATION:BOOL=OFF NLS_CMAKE_OFF= -DNO_TRANSLATION:BOOL=ON # For maintainer (do not forget to clean up Makefile.tuples afterwards to # remove useless submodules) Makefile.tuples:: @${RM} -f ${.CURDIR}/Makefile.tuples @${RM} -rf ${WRKDIR}/.maintainer.checkout @${MKDIR} ${WRKDIR}/.maintainer.checkout && \ cd ${WRKDIR}/.maintainer.checkout && \ git clone --recursive --branch=v${PORTVERSION} \ https://github.com/${PORTNAME}/${PORTNAME} . && \ ${SH} ${FILESDIR}/gen_gh_tuple.sh >> ${.CURDIR}/Makefile.tuples .include 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 @@ -1,12 +1,11 @@ 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 \ biojppm:c4core:d35c7c9bf370134595699d791e6ff8db018ddc8d:c4core/3rdparty/rapidyaml/rapidyaml/ext/c4core \ biojppm:cmake:371982300ff5a076d7c3199057ebed77bbe3472f:cmake/3rdparty/rapidyaml/rapidyaml/ext/c4core/cmake \ biojppm:debugbreak:5dcbe41d2bd4712c8014aa7e843723ad7b40fd74:debugbreak/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak \ fastfloat:fast_float:32d21dcecb404514f94fb58660b8029a4673c2c1:fast_float/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo index c1668aa0c336..b058f7d72d02 100644 --- a/emulators/pcsx2/distinfo +++ b/emulators/pcsx2/distinfo @@ -1,25 +1,23 @@ -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 SIZE (google-googletest-800f5422ac9d9e0ad59cd860a2ef3a679588acb4_GH0.tar.gz) = 455806 SHA256 (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 9f5b073625375322236a94ce8d2d803cdedad321c91e63845f487b9ebfb2c433 SIZE (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 7234 SHA256 (biojppm-c4core-d35c7c9bf370134595699d791e6ff8db018ddc8d_GH0.tar.gz) = b768c8fb5dd4740317b7e1a3e43a0b32615d4d4e1e974d7ab515a80d2f1f318d SIZE (biojppm-c4core-d35c7c9bf370134595699d791e6ff8db018ddc8d_GH0.tar.gz) = 262210 SHA256 (biojppm-cmake-371982300ff5a076d7c3199057ebed77bbe3472f_GH0.tar.gz) = 1d3ded3a552a5993c8ebe5059a9829e0e26ae4f4780c179a11882d25da203de6 SIZE (biojppm-cmake-371982300ff5a076d7c3199057ebed77bbe3472f_GH0.tar.gz) = 122880 SHA256 (biojppm-debugbreak-5dcbe41d2bd4712c8014aa7e843723ad7b40fd74_GH0.tar.gz) = 4b424d23dad957937c57c142648d32571a78a6c6b2e473709748e5c1bb8a0f92 SIZE (biojppm-debugbreak-5dcbe41d2bd4712c8014aa7e843723ad7b40fd74_GH0.tar.gz) = 7033 SHA256 (fastfloat-fast_float-32d21dcecb404514f94fb58660b8029a4673c2c1_GH0.tar.gz) = 8035a9ca28a8e3dfee332c7960af3c06ef0ab5169d5f31228b89c469e882bef7 SIZE (fastfloat-fast_float-32d21dcecb404514f94fb58660b8029a4673c2c1_GH0.tar.gz) = 76108 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