kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emulators/rpcs3: unbundle glslang

Browse source
This commit is contained in:
Jan Beich 2017-09-20 20:43:39 +00:00
parent 22aad8d26a
commit 36c4c2d1ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=450231
4 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emulators/rpcs3/Makefile
View file

@ -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/' \

4
emulators/rpcs3/distinfo
View file

@ -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

12
emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt Normal file
View file

@ -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()

11
emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp Normal file
View file

@ -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