Date: Wed, 20 Sep 2017 20:43:39 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450231 - in head/emulators/rpcs3: . files Message-ID: <201709202043.v8KKhdMV040767@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Sep 20 20:43:39 2017 New Revision: 450231 URL: https://svnweb.freebsd.org/changeset/ports/450231 Log: emulators/rpcs3: unbundle glslang Added: head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt (contents, props changed) head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp (contents, props changed) Modified: head/emulators/rpcs3/Makefile (contents, props changed) head/emulators/rpcs3/distinfo (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Wed Sep 20 19:48:38 2017 (r450230) +++ head/emulators/rpcs3/Makefile Wed Sep 20 20:43:39 2017 (r450231) @@ -72,12 +72,10 @@ PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulse 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/' \ Modified: head/emulators/rpcs3/distinfo ============================================================================== --- head/emulators/rpcs3/distinfo Wed Sep 20 19:48:38 2017 (r450230) +++ head/emulators/rpcs3/distinfo Wed Sep 20 20:43:39 2017 (r450231) @@ -13,7 +13,3 @@ SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff2 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 Added: head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt Wed Sep 20 20:43:39 2017 (r450231) @@ -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() Added: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp Wed Sep 20 20:43:39 2017 (r450231) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709202043.v8KKhdMV040767>