Index: head/emulators/rpcs3/Makefile =================================================================== --- head/emulators/rpcs3/Makefile (revision 503203) +++ head/emulators/rpcs3/Makefile (revision 503204) @@ -1,83 +1,83 @@ # $FreeBSD$ 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/ PATCHFILES+= 1e28a22860c0.patch:-p1 # Clang 7 MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger LICENSE= BSD3CLAUSE BSL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE LICENSE_FILE_MIT= ${WRKSRC_GSL}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md LIB_DEPENDS= libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg ONLY_FOR_ARCHS= amd64 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:b860b5e8f4ee:llvm/llvm \ 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 USES= cmake compiler:c++17-lang iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig qt:5 USE_GL= gl glew USE_QT= qmake_build buildtools_build core dbus declarative gui network widgets USE_XORG= x11 LLD_UNSAFE= yes # XXX ports/219089 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config LDFLAGS+= -Wl,--as-needed # GLU OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=ALSA LLVM VULKAN ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA EVDEV_DESC= libevdev-based joystick support EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev GDB_DESC= GDB remote stub (powerpc64 target) GDB_CMAKE_BOOL= WITH_GDB GDB_BROKEN= https://github.com/RPCS3/rpcs3/issues/5946 LLVM_DESC= LLVM-based PPU recompiler LLVM_CMAKE_BOOL_OFF= WITHOUT_LLVM PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ -e '/GIT_TAG/s/unknown/${GH_TAGNAME:C/-.*//}/' \ -e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include Index: head/emulators/rpcs3/distinfo =================================================================== --- head/emulators/rpcs3/distinfo (revision 503203) +++ head/emulators/rpcs3/distinfo (revision 503204) @@ -1,23 +1,23 @@ -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 SIZE (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = 47286737 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 554f6fac1d9524f807345f95ba9223332c644e56d7a7fdb2bcea1f5793b764fa 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 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 SHA256 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956 SHA256 (1e28a22860c0.patch) = d3724271593ea91093e4adfcb98a4ada9741a9204961a3737f60461bdcf13393 SIZE (1e28a22860c0.patch) = 1052 Index: head/emulators/rpcs3/files/patch-no-cotire =================================================================== --- head/emulators/rpcs3/files/patch-no-cotire (nonexistent) +++ head/emulators/rpcs3/files/patch-no-cotire (revision 503204) @@ -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) Property changes on: head/emulators/rpcs3/files/patch-no-cotire ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property