Index: head/emulators/rpcs3/Makefile =================================================================== --- head/emulators/rpcs3/Makefile (revision 450230) +++ head/emulators/rpcs3/Makefile (revision 450231) @@ -1,87 +1,85 @@ # $FreeBSD$ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.3-348 DISTVERSIONSUFFIX= -g5c93acef CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger LICENSE= BSD3CLAUSE BSL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/3rdparty/cereal/LICENSE LICENSE_FILE_BSL= ${WRKSRC}/Utilities/LICENSE_1_0.txt LICENSE_FILE_MIT= ${WRKSRC}/3rdparty/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 \ kobalicek:asmjit:1370fe6:asmjit/asmjit \ Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \ USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal 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+= -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 -# XXX Unbundle via CMAKE_ARGS+=-DVULKAN_PREBUILT=on -VULKAN_VARS= LICENSE+=APACHE20 -VULKAN_GH_TUPLE= KhronosGroup:glslang:3.0-1379-g0e07119a:glslang/Vulkan/glslang \ - KhronosGroup:Vulkan-LoaderAndValidationLayers:sdk-1.0.30.0-1550-g115665a3:vulkan_icd/Vulkan/Vulkan-LoaderAndValidationLayers +VULKAN_BUILD_DEPENDS= ${LOCALBASE}/lib/libglslang.a:devel/glslang VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-sdk VULKAN_CMAKE_BOOL= USE_VULKAN +VULKAN_CMAKE_ON= -DVULKAN_PREBUILT=on 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 450230) +++ head/emulators/rpcs3/distinfo (revision 450231) @@ -1,19 +1,15 @@ TIMESTAMP = 1505822827 SHA256 (RPCS3-rpcs3-v0.0.3-348-g5c93acef_GH0.tar.gz) = b283e036663f52f88845b4fdc0d6ccd55361015914a481e96d4e419631b8263e SIZE (RPCS3-rpcs3-v0.0.3-348-g5c93acef_GH0.tar.gz) = 4169501 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 (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 (KhronosGroup-glslang-3.0-1379-g0e07119a_GH0.tar.gz) = f1caf9c76c0104d46128426e3bfd731938b3bf8b4b8cd9bf0102ac59cc4ea90f -SIZE (KhronosGroup-glslang-3.0-1379-g0e07119a_GH0.tar.gz) = 1786108 -SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.30.0-1550-g115665a3_GH0.tar.gz) = d59f98eba91ed5b37f138a353c4e1cdff769a23e529650b0bf07b456dfedee58 -SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.30.0-1550-g115665a3_GH0.tar.gz) = 3808601 Index: head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt (nonexistent) +++ head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt (revision 450231) @@ -0,0 +1,12 @@ +--- 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 ___________________________________________________________________ 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 Index: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp (nonexistent) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp (revision 450231) @@ -0,0 +1,11 @@ +--- 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 ___________________________________________________________________ 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