git: 8b3b56eaa45b - main - emulators/rpcs3: update to 0.0.32.16618
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 22 Jun 2024 00:56:28 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8b3b56eaa45ba0fa87c9022dbcb3463220ac6282
commit 8b3b56eaa45ba0fa87c9022dbcb3463220ac6282
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-05-22 09:58:43 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-22 00:48:48 +0000
emulators/rpcs3: update to 0.0.32.16618
Changes: https://github.com/RPCS3/rpcs3/compare/8dac5e34be...bceaf46e2f
---
emulators/rpcs3/Makefile | 30 +++++++++++++++++++++++-------
emulators/rpcs3/distinfo | 12 +++++++++---
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index c06221c015d0..994b53507c9c 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,7 +1,7 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
-DISTVERSION= 0.0.32-16488 # git rev-list --count HEAD
-DISTVERSIONSUFFIX= -g8dac5e34be
+DISTVERSION= 0.0.32-16618 # git rev-list --count HEAD
+DISTVERSIONSUFFIX= -gbceaf46e2f
CATEGORIES= emulators wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -33,8 +33,10 @@ GH_TUPLE= RPCS3:hidapi:hidapi-0.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \
KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-323-ge867c06:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \
KhronosGroup:SPIRV-Tools:v2023.5.rc1:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \
KhronosGroup:glslang:13.1.1:glslang/3rdparty/glslang/glslang \
+ kcat:openal-soft:1.23.1:openal_soft/3rdparty/OpenAL/openal-soft \
kinetiknz:cubeb:cubeb-0.2-1425-g88585b6:cubeb/3rdparty/cubeb/cubeb \
miniupnp:miniupnp:miniupnpd_2_3_6:miniupnp/3rdparty/miniupnp/miniupnp \
+ nothings:stb:013ac3b:stb/3rdparty/stblib/stb \
wolfSSL:wolfssl:v5.7.0-stable:wolfssl/3rdparty/wolfssl/wolfssl
USES= cmake elfctl gl iconv:wchar_t llvm:min=16,lib localbase:ldflags \
@@ -95,13 +97,27 @@ post-patch:
-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
${WRKSRC}/${PORTNAME}/git-version.cmake
-# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01
-.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h)
+# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo)
+.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
+USES+= llvm:min=16,build,export
PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
-CC= clang${LLVM_VERSION}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}"
+
+# XXX Move into separate port and standardize via USES
+GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx
+CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
+# Don't link against new libc++ as it's not necessary
+#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
+
+pre-configure: bundled-libcxx
+bundled-libcxx:
+ @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
+ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
+ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
+ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
+ @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
.endif
+.endif # exists(/usr/lib/libc++.so)
.include <bsd.port.mk>
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 9c0c7d92523b..a0191ec22544 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1716052628
-SHA256 (RPCS3-rpcs3-v0.0.32-16488-g8dac5e34be_GH0.tar.gz) = 7cc540a86da1a571b6347236ecb5cae18a2e66ebabcb845db851fc24e38aacd8
-SIZE (RPCS3-rpcs3-v0.0.32-16488-g8dac5e34be_GH0.tar.gz) = 8662827
+TIMESTAMP = 1718904307
+SHA256 (RPCS3-rpcs3-v0.0.32-16618-gbceaf46e2f_GH0.tar.gz) = ff73297d01f2982ddbacfe3045b6e210a8ad47ef2eb2d14a69ab0cebf82a8e8d
+SIZE (RPCS3-rpcs3-v0.0.32-16618-gbceaf46e2f_GH0.tar.gz) = 7721067
SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6
SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879
SHA256 (RPCS3-soundtouch-2.3.1-68-g394e1f5_GH0.tar.gz) = e24af82c51547341e2dfd43af03c1847abfd8d27334d667e6a51943f7f505cbe
@@ -17,11 +17,17 @@ SHA256 (KhronosGroup-SPIRV-Tools-v2023.5.rc1_GH0.tar.gz) = aed90b51ce884ce3ac267
SIZE (KhronosGroup-SPIRV-Tools-v2023.5.rc1_GH0.tar.gz) = 3147730
SHA256 (KhronosGroup-glslang-13.1.1_GH0.tar.gz) = 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66
SIZE (KhronosGroup-glslang-13.1.1_GH0.tar.gz) = 3763210
+SHA256 (kcat-openal-soft-1.23.1_GH0.tar.gz) = dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a
+SIZE (kcat-openal-soft-1.23.1_GH0.tar.gz) = 840185
SHA256 (kinetiknz-cubeb-cubeb-0.2-1425-g88585b6_GH0.tar.gz) = d10bf2d54d7202efa39ac10bc580048666d6e7a5019a5d1f0f71e8b7bf01f25c
SIZE (kinetiknz-cubeb-cubeb-0.2-1425-g88585b6_GH0.tar.gz) = 226777
SHA256 (miniupnp-miniupnp-miniupnpd_2_3_6_GH0.tar.gz) = 6e5ee2239030486675f558cc840d154e5e2db9517efc96c5b0ab2b2c34c1a128
SIZE (miniupnp-miniupnp-miniupnpd_2_3_6_GH0.tar.gz) = 462607
+SHA256 (nothings-stb-013ac3b_GH0.tar.gz) = f2f5aeaa2504f8dc3ee7412cb480f9be218766c7a652ce3bcebbc25ec72d7e9c
+SIZE (nothings-stb-013ac3b_GH0.tar.gz) = 1510649
SHA256 (wolfSSL-wolfssl-v5.7.0-stable_GH0.tar.gz) = 2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f
SIZE (wolfSSL-wolfssl-v5.7.0-stable_GH0.tar.gz) = 22995679
SHA256 (thestk-rtmidi-6.0.0_GH0.tar.gz) = ef7bcda27fee6936b651c29ebe9544c74959d0b1583b716ce80a1c6fea7617f0
SIZE (thestk-rtmidi-6.0.0_GH0.tar.gz) = 515502
+SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
+SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803