svn commit: r525992 - in head/emulators/rpcs3: . files

Jan Beich jbeich at FreeBSD.org
Thu Feb 13 00:43:50 UTC 2020 

Author: jbeich
Date: Thu Feb 13 00:43:49 2020
New Revision: 525992
URL: https://svnweb.freebsd.org/changeset/ports/525992

Log:
  emulators/rpcs3: update to 0.0.8.9576
  
  Changes:	https://github.com/RPCS3/rpcs3/compare/54da9ac7e...78c49e733

Added:
  head/emulators/rpcs3/files/patch-CMakeLists.txt   (contents, props changed)
  head/emulators/rpcs3/files/patch-qt-5.13   (contents, props changed)
Deleted:
  head/emulators/rpcs3/files/extra-patch-no-cotire
Modified:
  head/emulators/rpcs3/Makefile   (contents, props changed)
  head/emulators/rpcs3/distinfo   (contents, props changed)

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Thu Feb 13 00:43:42 2020	(r525991)
+++ head/emulators/rpcs3/Makefile	Thu Feb 13 00:43:49 2020	(r525992)
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.8-9528 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g54da9ac7e
+DISTVERSION=	0.0.8-9576 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g78c49e733
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -25,12 +25,12 @@ ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \
-		RPCS3:llvm:9fb67ecaea74:llvm/llvm \
+		RPCS3:llvm:1394b1ccc8cf:llvm/llvm \
 		Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
 		FNA-XNA:FAudio:20.02:FAudio/3rdparty/FAudio \
 		jbeder:yaml-cpp:yaml-cpp-0.6.2-23-geca9cfd:yamlcpp/3rdparty/yaml-cpp \
 		kobalicek:asmjit:fc251c9:asmjit/asmjit \
-		KhronosGroup:glslang:7.13.3496:glslang/Vulkan/glslang \
+		KhronosGroup:glslang:8.13.3559-55-gae594356:glslang/Vulkan/glslang \
 		tcbrindle:span:9d7559a:span/3rdparty/span \
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml
@@ -53,7 +53,7 @@ LLD_UNSAFE=	yes # XXX ports/219089
 .if make(makesum) || (!exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so))
 MASTER_SITES+=	https://releases.llvm.org/${LLVM_VER}/:libcxx
 DISTFILES+=	libcxx-${LLVM_VER}.src.tar.xz:libcxx
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-no-cotire
+CMAKE_OFF+=	USE_COTIRE
 CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
 LLVM_VER=	8.0.0 # same as FreeBSD 11.3
 .endif

Modified: head/emulators/rpcs3/distinfo
==============================================================================
--- head/emulators/rpcs3/distinfo	Thu Feb 13 00:43:42 2020	(r525991)
+++ head/emulators/rpcs3/distinfo	Thu Feb 13 00:43:49 2020	(r525992)
@@ -1,12 +1,12 @@
-TIMESTAMP = 1581092921
+TIMESTAMP = 1581526938
 SHA256 (libcxx-8.0.0.src.tar.xz) = c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2
 SIZE (libcxx-8.0.0.src.tar.xz) = 1752308
-SHA256 (RPCS3-rpcs3-v0.0.8-9528-g54da9ac7e_GH0.tar.gz) = e8334628b51e83ded8632e978490d79196ced06fa027e3977e550d3d843ef69e
-SIZE (RPCS3-rpcs3-v0.0.8-9528-g54da9ac7e_GH0.tar.gz) = 5447895
+SHA256 (RPCS3-rpcs3-v0.0.8-9576-g78c49e733_GH0.tar.gz) = 940b6fb0d0a2e6143471c6d598215f9d1596844cc5170bcbf39512b3aa1077a7
+SIZE (RPCS3-rpcs3-v0.0.8-9576-g78c49e733_GH0.tar.gz) = 5458839
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
-SHA256 (RPCS3-llvm-9fb67ecaea74_GH0.tar.gz) = 4bac3740721a478b936d7295639b5a048a6ceae72a5b051d34a06bcea49688ff
-SIZE (RPCS3-llvm-9fb67ecaea74_GH0.tar.gz) = 51907533
+SHA256 (RPCS3-llvm-1394b1ccc8cf_GH0.tar.gz) = 7b2337a839566f04b187a6b24f4a5cc5546ed41659b2aee703cdbf8a6e6abd8c
+SIZE (RPCS3-llvm-1394b1ccc8cf_GH0.tar.gz) = 51911523
 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95
 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521
 SHA256 (FNA-XNA-FAudio-20.02_GH0.tar.gz) = 103a6d278921ce757e5427133626f60ce4876b30d81186f78af35d9f1ca4ef16
@@ -15,8 +15,8 @@ SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0
 SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 1397220
 SHA256 (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 0fb6271fccf8ee86d27affda7e27a6d655bfabfda83a7dd0d41f7fd05b384aad
 SIZE (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 446910
-SHA256 (KhronosGroup-glslang-7.13.3496_GH0.tar.gz) = 170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922
-SIZE (KhronosGroup-glslang-7.13.3496_GH0.tar.gz) = 3114482
+SHA256 (KhronosGroup-glslang-8.13.3559-55-gae594356_GH0.tar.gz) = 5f403104322ff939f5b22d60a2043c850cb96afdf8332dbdbf09ec75534b8838
+SIZE (KhronosGroup-glslang-8.13.3559-55-gae594356_GH0.tar.gz) = 3133760
 SHA256 (tcbrindle-span-9d7559a_GH0.tar.gz) = 4fbe8364b8ff9388fd6ca1a11ce39ff448af76394d561d6f879cf1180b14f160
 SIZE (tcbrindle-span-9d7559a_GH0.tar.gz) = 130675
 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1

Added: head/emulators/rpcs3/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/rpcs3/files/patch-CMakeLists.txt	Thu Feb 13 00:43:49 2020	(r525992)
@@ -0,0 +1,18 @@
+-std=gnu++2a works fine with old Clang if libc++ is new enough
+
+CMake Error at CMakeLists.txt:11 (message):
+  RPCS3 requires at least clang-10.0.
+
+--- CMakeLists.txt.orig	2020-02-10 21:39:39 UTC
++++ CMakeLists.txt
+@@ -7,8 +7,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ 		message(FATAL_ERROR "RPCS3 requires at least gcc-9.")
+ 	endif()
+ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+-		message(FATAL_ERROR "RPCS3 requires at least clang-10.0.")
++	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
++		message(FATAL_ERROR "RPCS3 requires at least clang-6.0.")
+ 	endif()
+ endif()
+ 

Added: head/emulators/rpcs3/files/patch-qt-5.13
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/rpcs3/files/patch-qt-5.13	Thu Feb 13 00:43:49 2020	(r525992)
@@ -0,0 +1,105 @@
+CMake Warning at 3rdparty/qt5.cmake:3 (find_package):
+  Could not find a configuration file for package "Qt5" that is compatible
+  with requested version "5.14".
+
+  The following configuration files were considered but not accepted:
+
+    /usr/local/lib/cmake/Qt5/Qt5Config.cmake, version: 5.13.2
+
+--- 3rdparty/qt5.cmake.orig	2020-02-10 21:39:39 UTC
++++ 3rdparty/qt5.cmake
+@@ -1,11 +1,11 @@
+ add_library(3rdparty_qt5 INTERFACE)
+ 
+-find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Network Qml Concurrent)
++find_package(Qt5 5.13 CONFIG COMPONENTS Widgets Network Qml Concurrent)
+ if(WIN32)
+-	find_package(Qt5 5.14 COMPONENTS WinExtras REQUIRED)
++	find_package(Qt5 5.13 COMPONENTS WinExtras REQUIRED)
+ 	target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent)
+ else()
+-	find_package(Qt5 5.14 COMPONENTS DBus Gui)
++	find_package(Qt5 5.13 COMPONENTS DBus Gui)
+ 	if(Qt5DBus_FOUND)
+ 		target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent)
+ 		target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS)
+--- rpcs3/main.cpp.orig	2020-02-10 21:39:39 UTC
++++ rpcs3/main.cpp
+@@ -137,13 +137,19 @@ QCoreApplication* createApplication(int& argc, char* a
+ 		const auto i_hdpi_2 = (argc > (i_hdpi + 1)) ? (i_hdpi + 1) : 0;
+ 		const auto high_dpi_setting = (i_hdpi_2 && !strcmp(cmp_str.c_str(), argv[i_hdpi_2])) ? "0" : "1";
+ 
++#if (QT_VERSION < QT_VERSION_CHECK(5,14,0))
++		// Set QT_AUTO_SCREEN_SCALE_FACTOR from environment. Defaults to cli argument, which defaults to 1.
++		use_high_dpi = "1" == qEnvironmentVariable("QT_AUTO_SCREEN_SCALE_FACTOR", high_dpi_setting);
++#else
+ 		// Set QT_ENABLE_HIGHDPI_SCALING from environment. Defaults to cli argument, which defaults to 1.
+ 		use_high_dpi = "1" == qEnvironmentVariable("QT_ENABLE_HIGHDPI_SCALING", high_dpi_setting);
++#endif
+ 	}
+ 
+ 	// AA_EnableHighDpiScaling has to be set before creating a QApplication
+ 	QApplication::setAttribute(use_high_dpi ? Qt::AA_EnableHighDpiScaling : Qt::AA_DisableHighDpiScaling);
+ 
++#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
+ 	if (use_high_dpi)
+ 	{
+ 		// Set QT_SCALE_FACTOR_ROUNDING_POLICY from environment. Defaults to cli argument, which defaults to RoundPreferFloor.
+@@ -195,6 +201,7 @@ QCoreApplication* createApplication(int& argc, char* a
+ 		}
+ 		QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_val);
+ 	}
++#endif
+ 
+ 	return new gui_application(argc, argv);
+ }
+@@ -236,7 +243,9 @@ int main(int argc, char** argv)
+ 	parser.addOption(QCommandLineOption(arg_headless, "Run RPCS3 in headless mode."));
+ 	parser.addOption(QCommandLineOption(arg_no_gui, "Run RPCS3 without its GUI."));
+ 	parser.addOption(QCommandLineOption(arg_high_dpi, "Enables Qt High Dpi Scaling.", "enabled", "1"));
++#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
+ 	parser.addOption(QCommandLineOption(arg_rounding, "Sets the Qt::HighDpiScaleFactorRoundingPolicy for values like 150% zoom.", "rounding", "4"));
++#endif
+ 	parser.addOption(QCommandLineOption(arg_styles, "Lists the available styles."));
+ 	parser.addOption(QCommandLineOption(arg_style, "Loads a custom style.", "style", ""));
+ 	parser.addOption(QCommandLineOption(arg_stylesheet, "Loads a custom stylesheet.", "path", ""));
+--- rpcs3/rpcs3qt/emu_settings.cpp.orig	2020-02-10 21:39:39 UTC
++++ rpcs3/rpcs3qt/emu_settings.cpp
+@@ -505,7 +505,11 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, S
+ 	spinbox->setRange(min, max);
+ 	spinbox->setValue(val);
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+ 	connect(spinbox, &QSpinBox::textChanged, [=, this](const QString&/* text*/)
++#else
++	connect(spinbox, QOverload<const QString &>::of(&QSpinBox::valueChanged), [=, this](const QString&/* value*/)
++#endif
+ 	{
+ 		SetSetting(type, sstr(spinbox->cleanText()));
+ 	});
+@@ -547,7 +551,11 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox
+ 	spinbox->setRange(min, max);
+ 	spinbox->setValue(val);
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+ 	connect(spinbox, &QDoubleSpinBox::textChanged, [=, this](const QString&/* text*/)
++#else
++	connect(spinbox, QOverload<const QString &>::of(&QDoubleSpinBox::valueChanged), [=, this](const QString&/* value*/)
++#endif
+ 	{
+ 		SetSetting(type, sstr(spinbox->cleanText()));
+ 	});
+--- rpcs3/rpcs3qt/qt_utils.h.orig	2020-02-10 21:39:39 UTC
++++ rpcs3/rpcs3qt/qt_utils.h
+@@ -16,7 +16,11 @@ namespace gui
+ 		template<typename T>
+ 		static QSet<T> list_to_set(const QList<T>& list)
+ 		{
++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+ 			return QSet<T>(list.begin(), list.end());
++#else
++			return QSet<T>::fromList(list);
++#endif
+ 		}
+ 
+ 		// Creates a frame geometry rectangle with given width height that's centered inside the origin,

More information about the svn-ports-head mailing list