Index: head/emulators/rpcs3/Makefile =================================================================== --- head/emulators/rpcs3/Makefile (revision 454574) +++ head/emulators/rpcs3/Makefile (revision 454575) @@ -1,86 +1,85 @@ # $FreeBSD$ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-14 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gc435b328 +DISTVERSION= 0.0.4-36 +DISTVERSIONSUFFIX= -g75298f59 CATEGORIES= emulators 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_BSL= ${WRKSRC_Optional}/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 SSSE3 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \ - RPCS3:pugixml:f205aaf:pugixml/3rdparty/pugixml \ RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \ kobalicek:asmjit:1370fe6:asmjit/asmjit \ Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \ - USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal + 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 \ openal:soft pkgconfig USE_GL= gl glew USE_QT5= qmake_build buildtools_build core dbus gui widgets USE_XORG= x11 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}} EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-no-thread_local CMAKE_ARGS+= -DCMAKE_SKIP_RPATH=on -DUSE_SYSTEM_LIBPNG=on -DUSE_SYSTEM_FFMPEG=on 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 PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=ALSA LLVM VULKAN .if !exists(${.CURDIR:H:H}/graphics/vulkan-sdk) OPTIONS_EXCLUDE=VULKAN # XXX ports/222175 .endif 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_LIB_DEPENDS= libevdev.so:devel/libevdev GDB_DESC= GDB remote stub (powerpc64 target) GDB_CMAKE_BOOL= WITH_GDB LLVM_DESC= LLVM-based PPU recompiler LLVM_BUILD_DEPENDS= llvm40>0:devel/llvm40 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}/lib/libglslang.a:devel/glslang VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-sdk VULKAN_CMAKE_BOOL= USE_VULKAN VULKAN_PREBUILT post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ -e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include Index: head/emulators/rpcs3/distinfo =================================================================== --- head/emulators/rpcs3/distinfo (revision 454574) +++ head/emulators/rpcs3/distinfo (revision 454575) @@ -1,17 +1,17 @@ -TIMESTAMP = 1510768802 -SHA256 (RPCS3-rpcs3-v0.0.4-14-gc435b328_GH0.tar.gz) = 4677caee19a192ec9490e76c6167d0d0a8eb9bc943b9bfddafb5232a36a3c874 -SIZE (RPCS3-rpcs3-v0.0.4-14-gc435b328_GH0.tar.gz) = 3562247 +TIMESTAMP = 1511203562 +SHA256 (RPCS3-rpcs3-v0.0.4-36-g75298f59_GH0.tar.gz) = c7d40457826988d62af10b7f839aa904c685376dd84802b86759cc0e8443b3f7 +SIZE (RPCS3-rpcs3-v0.0.4-36-g75298f59_GH0.tar.gz) = 3565642 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-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5 -SIZE (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 76332 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 SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055 SHA256 (kobalicek-asmjit-1370fe6_GH0.tar.gz) = cc064a8e495959ee525803bd83a4f9b2b3bf6e9aacbc7538e8ac3c20fb12e83e SIZE (kobalicek-asmjit-1370fe6_GH0.tar.gz) = 447958 SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 +SHA256 (zeux-pugixml-v1.8.1-148-g257fbb4_GH0.tar.gz) = 0b37a212bd64ae2336b5f8401e44b0f5f8cb16460e80d1cd9bee1c6acdee0552 +SIZE (zeux-pugixml-v1.8.1-148-g257fbb4_GH0.tar.gz) = 539220 Index: head/emulators/rpcs3/files/patch-Utilities_Thread.cpp =================================================================== --- head/emulators/rpcs3/files/patch-Utilities_Thread.cpp (revision 454574) +++ head/emulators/rpcs3/files/patch-Utilities_Thread.cpp (nonexistent) @@ -1,41 +0,0 @@ -Utilities/Thread.cpp:1920:2: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'? - cpu_set_t cs; - ^~~~~~~~~ - cpusetid_t -/usr/include/sys/types.h:84:22: note: 'cpusetid_t' declared here -typedef __cpusetid_t cpusetid_t; - ^ -Utilities/Thread.cpp:1921:2: error: use of undeclared identifier 'CPU_ZERO' - CPU_ZERO(&cs); - ^ -Utilities/Thread.cpp:1922:2: error: use of undeclared identifier 'CPU_SET' - CPU_SET(core, &cs); - ^ -Utilities/Thread.cpp:1923:48: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'? - pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs); - ^~~~~~~~~ - cpusetid_t - ---- Utilities/Thread.cpp.orig 2017-11-15 18:00:02 UTC -+++ Utilities/Thread.cpp -@@ -25,6 +25,11 @@ - #include - #endif - -+#if defined(__DragonFly__) || defined(__FreeBSD__) -+#include -+#define cpu_set_t cpuset_t -+#endif -+ - #include "sync.h" - - thread_local u64 g_tls_fault_all = 0; -@@ -1916,7 +1921,7 @@ void thread_ctrl::set_ideal_processor_core(int core) - #ifdef _WIN32 - HANDLE _this_thread = GetCurrentThread(); - SetThreadIdealProcessor(_this_thread, core); --#else -+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) - cpu_set_t cs; - CPU_ZERO(&cs); - CPU_SET(core, &cs); Property changes on: head/emulators/rpcs3/files/patch-Utilities_Thread.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/rpcs3/files/patch-Utilities_JIT.cpp =================================================================== --- head/emulators/rpcs3/files/patch-Utilities_JIT.cpp (revision 454574) +++ head/emulators/rpcs3/files/patch-Utilities_JIT.cpp (nonexistent) @@ -1,33 +0,0 @@ -FreeBSD ignores address hints with default RLIMIT_DATA - ---- Utilities/JIT.cpp.orig 2017-07-20 15:05:34 UTC -+++ Utilities/JIT.cpp -@@ -30,6 +30,8 @@ - - #ifdef _WIN32 - #include -+#else -+#include - #endif - - #include "JIT.h" -@@ -47,6 +49,11 @@ static void* const s_memory = []() -> void* - llvm::InitializeNativeTargetAsmPrinter(); - LLVMLinkInMCJIT(); - -+#ifdef MAP_32BIT -+ auto ptr = ::mmap(nullptr, s_memory_size, PROT_NONE, MAP_ANON | MAP_PRIVATE | MAP_32BIT, -1, 0); -+ if (ptr != MAP_FAILED) -+ return ptr; -+#else - for (u64 addr = 0x10000000; addr <= 0x80000000 - s_memory_size; addr += 0x1000000) - { - if (auto ptr = utils::memory_reserve(s_memory_size, (void*)addr)) -@@ -54,6 +61,7 @@ static void* const s_memory = []() -> void* - return ptr; - } - } -+#endif - - return utils::memory_reserve(s_memory_size); - }(); Property changes on: head/emulators/rpcs3/files/patch-Utilities_JIT.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp (revision 454574) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp.orig 2017-09-19 12:07:07 UTC -+++ rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp -@@ -1,7 +1,7 @@ - #include "stdafx.h" - #include "VKCommonDecompiler.h" - #include "restore_new.h" --#include "../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h" -+#include "SPIRV/GlslangToSpv.h" - #include "define_new_memleakdetect.h" - - namespace vk Property changes on: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt (revision 454574) +++ head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt (nonexistent) @@ -1,12 +0,0 @@ ---- rpcs3/CMakeLists.txt.orig 2017-09-19 12:07:07 UTC -+++ rpcs3/CMakeLists.txt -@@ -213,6 +213,9 @@ if(NOT WIN32 AND USE_VULKAN) - if(VULKAN_FOUND) - add_definitions(-DHAVE_VULKAN) - list(APPEND ADDITIONAL_LIBS ${VULKAN_LIBRARY}) -+ if(VULKAN_PREBUILT) -+ list(APPEND ADDITIONAL_LIBS glslang HLSL OGLCompiler SPIRV OSDependent) -+ endif() - else() - message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.") - endif() Property changes on: head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property