svn commit: r469494 - in branches/2018Q2/emulators/rpcs3: . files

[Jan Beich]

Author: jbeich
Date: Thu May 10 00:29:45 2018
New Revision: 469494
URL: https://svnweb.freebsd.org/changeset/ports/469494

Log:
  MFH: r469492
  
  emulators/rpcs3: update to 0.0.5.259
  
  - Switch to bundled LLVM 6.0 due to downstream changes
  
  Changes:	https://github.com/RPCS3/rpcs3/compare/753d8170d...76a1d0d8f
  Changes:	https://github.com/RPCS3/llvm/compare/f1b37feef3d5...6154c0dcaf1a
  Approved by:	ports-secteam (junovitch, implicit for snapshots)

Added:
  branches/2018Q2/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake
     - copied unchanged from r469492, head/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake
Deleted:
  branches/2018Q2/emulators/rpcs3/files/patch-llvm6
Modified:
  branches/2018Q2/emulators/rpcs3/Makefile
  branches/2018Q2/emulators/rpcs3/distinfo
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/emulators/rpcs3/Makefile
==============================================================================
--- branches/2018Q2/emulators/rpcs3/Makefile	Thu May 10 00:09:02 2018	(r469493)
+++ branches/2018Q2/emulators/rpcs3/Makefile	Thu May 10 00:29:45 2018	(r469494)
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.5-237
-DISTVERSIONSUFFIX=	-g753d8170d
+DISTVERSION=	0.0.5-259
+DISTVERSIONSUFFIX=	-g76a1d0d8f
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -25,6 +25,7 @@ ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \
+		RPCS3:llvm:6154c0dcaf1:llvm/llvm \
 		RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \
 		akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \
 		kobalicek:asmjit:673dcef:asmjit/asmjit \
@@ -32,7 +33,7 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hi
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.8.1-148-g257fbb4:pugixml/3rdparty/pugixml
 
-USES=		cmake compiler:c++14-lang iconv:wchar_t localbase:ldflags \
+USES=		cmake:outsource compiler:c++14-lang iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig
 USE_GL=		gl glew
 USE_QT5=	qmake_build buildtools_build core dbus gui network widgets qml
@@ -44,7 +45,6 @@ CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 CXXFLAGS+=	-Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config
 LDFLAGS+=	-Wl,--as-needed # GLU
-MESA_LLVM_VER?=	50
 
 OPTIONS_DEFINE=	ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=ALSA LLVM VULKAN
@@ -64,8 +64,6 @@ GDB_DESC=		GDB remote stub (powerpc64 target)
 GDB_CMAKE_BOOL=		WITH_GDB
 
 LLVM_DESC=		LLVM-based PPU recompiler
-LLVM_BUILD_DEPENDS=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
-LLVM_CMAKE_ON=		-DLLVM_DIR:PATH=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib/cmake/llvm
 LLVM_CMAKE_BOOL_OFF=	WITHOUT_LLVM
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio

Modified: branches/2018Q2/emulators/rpcs3/distinfo
==============================================================================
--- branches/2018Q2/emulators/rpcs3/distinfo	Thu May 10 00:09:02 2018	(r469493)
+++ branches/2018Q2/emulators/rpcs3/distinfo	Thu May 10 00:29:45 2018	(r469494)
@@ -1,8 +1,10 @@
-TIMESTAMP = 1525719847
-SHA256 (RPCS3-rpcs3-v0.0.5-237-g753d8170d_GH0.tar.gz) = 8e7cc80279e78482501b111eec25532c4f9a8b3eb5ed5ece7baf4ced2c8cfa66
-SIZE (RPCS3-rpcs3-v0.0.5-237-g753d8170d_GH0.tar.gz) = 4824041
+TIMESTAMP = 1525898306
+SHA256 (RPCS3-rpcs3-v0.0.5-259-g76a1d0d8f_GH0.tar.gz) = 8398bb419320cd433add13f3f1d72842d32e1aac4eca5262c24feb89ded990b5
+SIZE (RPCS3-rpcs3-v0.0.5-259-g76a1d0d8f_GH0.tar.gz) = 4842636
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623
+SHA256 (RPCS3-llvm-6154c0dcaf1_GH0.tar.gz) = 7623cfb81e587c7ae8db783676689eee1249d8332b7b9a688cbb76763f172127
+SIZE (RPCS3-llvm-6154c0dcaf1_GH0.tar.gz) = 37831787
 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841
 SIZE (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 65888
 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1

Copied: branches/2018Q2/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake (from r469492, head/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake	Thu May 10 00:29:45 2018	(r469494, copy of r469492, head/emulators/rpcs3/files/patch-llvm_cmake_modules_HandleLLVMOptions.cmake)
@@ -0,0 +1,14 @@
+/usr/bin/ld: unrecognized option '--color-diagnostics'
+/usr/bin/ld: use the --help option for usage information
+c++: error: linker command failed with exit code 1 (use -v to see invocation)
+
+--- llvm/cmake/modules/HandleLLVMOptions.cmake.orig	2018-05-03 16:52:23 UTC
++++ llvm/cmake/modules/HandleLLVMOptions.cmake
+@@ -717,7 +717,6 @@ endif()
+ # lld doesn't print colored diagnostics when invoked from Ninja
+ if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja")
+   include(CheckLinkerFlag)
+-  check_linker_flag("-Wl,--color-diagnostics" LINKER_SUPPORTS_COLOR_DIAGNOSTICS)
+   append_if(LINKER_SUPPORTS_COLOR_DIAGNOSTICS "-Wl,--color-diagnostics"
+     CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
+ endif()