diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-09-21 04:43:39 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-09-21 04:43:39 +0800 |
| commit | d9d0e69fe9ef930cc87cc8525ae9b596853c4d11 (patch) | |
| tree | d931796df3b9d7205a8f1bec1bca66f6fb47b6e0 /emulators | |
| parent | 57f26d4413c571bbfe1acd7795a44a256dd18113 (diff) | |
| download | freebsd-ports-gnome-d9d0e69fe9ef930cc87cc8525ae9b596853c4d11.tar.gz freebsd-ports-gnome-d9d0e69fe9ef930cc87cc8525ae9b596853c4d11.tar.zst freebsd-ports-gnome-d9d0e69fe9ef930cc87cc8525ae9b596853c4d11.zip | |
emulators/rpcs3: unbundle glslang
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/rpcs3/Makefile | 6 | ||||
| -rw-r--r-- | emulators/rpcs3/distinfo | 4 | ||||
| -rw-r--r-- | emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp | 11 |
4 files changed, 25 insertions, 8 deletions
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 8d30d6623b6f..20d2689d65be 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -72,12 +72,10 @@ 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/' \ diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index a9e94259dfee..ee83b660aec9 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -13,7 +13,3 @@ SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376f 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 diff --git a/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt b/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt new file mode 100644 index 000000000000..4c8190e60a0b --- /dev/null +++ b/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt @@ -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() diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp new file mode 100644 index 000000000000..d7bafa8af579 --- /dev/null +++ b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp @@ -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 |