Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jun 2019 00:46:13 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503204 - in head/emulators/rpcs3: . files
Message-ID:  <201906010046.x510kDZV088379@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun  1 00:46:13 2019
New Revision: 503204
URL: https://svnweb.freebsd.org/changeset/ports/503204

Log:
  emulators/rpcs3: update to 0.0.6.8179
  
  Changes:	https://github.com/RPCS3/rpcs3/compare/c638e8267...cafa4521e

Added:
  head/emulators/rpcs3/files/patch-no-cotire   (contents, props changed)
Modified:
  head/emulators/rpcs3/Makefile   (contents, props changed)
  head/emulators/rpcs3/distinfo   (contents, props changed)

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Sat Jun  1 00:46:03 2019	(r503203)
+++ head/emulators/rpcs3/Makefile	Sat Jun  1 00:46:13 2019	(r503204)
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.6-8171 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-gc638e8267
+DISTVERSION=	0.0.6-8179 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gcafa4521e
 CATEGORIES=	emulators
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -31,7 +31,7 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hi
 		Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
 		jbeder:yaml-cpp:yaml-cpp-0.6.2-23-geca9cfd:yamlcpp/3rdparty/yaml-cpp \
 		kobalicek:asmjit:1e550aa:asmjit/asmjit \
-		KhronosGroup:glslang:5.1-184-gc99304c5:glslang/Vulkan/glslang \
+		KhronosGroup:glslang:7.11.3214:glslang/Vulkan/glslang \
 		Microsoft:GSL:v2.0.0:GSL/3rdparty/GSL \
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml

Modified: head/emulators/rpcs3/distinfo
==============================================================================
--- head/emulators/rpcs3/distinfo	Sat Jun  1 00:46:03 2019	(r503203)
+++ head/emulators/rpcs3/distinfo	Sat Jun  1 00:46:13 2019	(r503204)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1559072869
-SHA256 (RPCS3-rpcs3-v0.0.6-8171-gc638e8267_GH0.tar.gz) = 8b98bc3ff981a4351df03dd21bf1f619fc4df49c6f7f829ac44854cc989ac25a
-SIZE (RPCS3-rpcs3-v0.0.6-8171-gc638e8267_GH0.tar.gz) = 5388337
+TIMESTAMP = 1559340750
+SHA256 (RPCS3-rpcs3-v0.0.6-8179-gcafa4521e_GH0.tar.gz) = 20a4c7ff12796285dee5db43f6d3600a63c38969a038aa10996a176f976e3cf8
+SIZE (RPCS3-rpcs3-v0.0.6-8179-gcafa4521e_GH0.tar.gz) = 5388852
 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-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e
@@ -11,8 +11,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-1e550aa_GH0.tar.gz) = 89bdf974211da90940b0b58ea515234885aefc3b0af9385612d1c73da9bea4a2
 SIZE (kobalicek-asmjit-1e550aa_GH0.tar.gz) = 446874
-SHA256 (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = b6a3b853a31b6aace0826bdeafce2d1f26c00ba349664e87fb35d189b99c0b58
-SIZE (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = 2329404
+SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9
+SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979
 SHA256 (Microsoft-GSL-v2.0.0_GH0.tar.gz) = 6cce6fb16b651e62711a4f58e484931013c33979b795d1b1f7646f640cfa9c8e
 SIZE (Microsoft-GSL-v2.0.0_GH0.tar.gz) = 64726
 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1

Added: head/emulators/rpcs3/files/patch-no-cotire
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/rpcs3/files/patch-no-cotire	Sat Jun  1 00:46:13 2019	(r503204)
@@ -0,0 +1,44 @@
+Cotire uses precompiled headers which are more fragile with Clang.
+For one, https://github.com/KhronosGroup/glslang/commit/f0e911c80926 casues
+
+error: POSIX thread support was disabled in PCH file but is currently enabled
+
+--- rpcs3/CMakeLists.txt.orig	2019-05-31 16:49:32 UTC
++++ rpcs3/CMakeLists.txt
+@@ -1,7 +1,5 @@
+ cmake_minimum_required(VERSION 3.8.2)
+ 
+-include(cotire)
+-
+ # Generate git-version.h at build time.
+ include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
+ 
+@@ -80,12 +78,6 @@ if(WIN32)
+ else()
+ 	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS})
+ endif()
+-
+-set_target_properties(rpcs3 PROPERTIES
+-	COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+-	COTIRE_ADD_UNITY_BUILD OFF)
+-
+-cotire(rpcs3)
+ 
+ # Copy icons to executable directory
+ if(APPLE)
+--- rpcs3/Emu/CMakeLists.txt.orig	2019-05-31 16:49:32 UTC
++++ rpcs3/Emu/CMakeLists.txt
+@@ -115,13 +115,3 @@ target_link_libraries(rpcs3_emu
+ 	PRIVATE
+ 		3rdparty::gsl 3rdparty::xxhash
+ 		3rdparty::dx12)
+-
+-
+-# Setup cotire
+-option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
+-
+-set_target_properties(rpcs3_emu PROPERTIES
+-	COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+-	COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
+-
+-cotire(rpcs3_emu)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906010046.x510kDZV088379>