x11-wm/chamfer: update to s20200112

Changes:	ed8b707...78168e0

x11-wm/chamfer/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chamfer
-DISTVERSION=	s20191115
-PORTREVISION=	1
+DISTVERSION=	s20200112
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,12 +10,16 @@ COMMENT=	Tiling X11 window manager with Vulkan compositor
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+BUILD_DEPENDS=	spirv-opt:devel/spirv-tools \
+		vulkan-headers>0:devel/vulkan-headers \
 		glslc:graphics/shaderc \
 		glm>0:math/glm
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		${PY_BOOST} \
 		libvulkan.so:graphics/vulkan-loader \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
@@ -28,7 +31,7 @@ USE_GITHUB=	yes
 USE_XORG=	xcb
 GH_ACCOUNT=	jaelpark
 GH_PROJECT=	${PORTNAME}wm
-GH_TAGNAME=	ed8b707
+GH_TAGNAME=	78168e0
 CXXFLAGS+=	-Wno-narrowing
 
 post-patch:

x11-wm/chamfer/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1573823654
-SHA256 (jaelpark-chamferwm-s20191115-ed8b707_GH0.tar.gz) = 53169c187525af8398a7a0c01a9c04d2e17cb7c102f4633fe32627715b41ea59
-SIZE (jaelpark-chamferwm-s20191115-ed8b707_GH0.tar.gz) = 119479
+TIMESTAMP = 1578781326
+SHA256 (jaelpark-chamferwm-s20200112-78168e0_GH0.tar.gz) = b493058ff022f3b31eaaf536c96cec5f8d5a73f5c8ed2b4097a654ee5b5bb7cc
+SIZE (jaelpark-chamferwm-s20200112-78168e0_GH0.tar.gz) = 137316

x11-wm/chamfer/files/patch-main.cpp

@@ -1,11 +1,11 @@
 - Add default shader path
 
---- src/main.cpp.orig	2019-08-02 19:10:02 UTC
+--- src/main.cpp.orig	2020-01-11 22:22:06 UTC
 +++ src/main.cpp
-@@ -806,7 +806,7 @@ int main(sint argc, const char **pargv){	
- 	args::ValueFlag<uint> deviceIndexOpt(group_comp,"id","GPU to use by its index. By default the first device in the list of enumerated GPUs will be used.",{"device-index"});
+@@ -817,7 +817,7 @@ int main(sint argc, const char **pargv){	
  	args::Flag debugLayersOpt(group_comp,"debugLayers","Enable Vulkan debug layers.",{"debug-layers",'l'},false);
  	args::Flag noScissoringOpt(group_comp,"noScissoring","Disable scissoring optimization.",{"no-scissoring"},false);
+ 	args::Flag noHostMemoryImportOpt(group_comp,"noHostMemoryImport","Disable host shared memory import.",{"no-host-memory-import"},false);
 -	args::ValueFlagList<std::string> shaderPaths(group_comp,"path","Shader lookup path. SPIR-V shader objects are identified by an '.spv' extension. Multiple paths may be specified.",{"shader-path"});
 +	args::ValueFlagList<std::string> shaderPaths(group_comp,"path","Shader lookup path. SPIR-V shader objects are identified by an '.spv' extension. Multiple paths may be specified.",{"shader-path"},{"/usr/share/chamfer/shaders"});
  

x11-wm/chamfer/files/patch-src_compositor.cpp

@@ -0,0 +1,15 @@
+../src/compositor.cpp:62:7: error: 'alignas' attribute cannot be applied to types
+        char alignas(16) pushConstantBuffer[128];
+             ^
+
+--- src/compositor.cpp.orig	2020-01-11 22:22:06 UTC
++++ src/compositor.cpp
+@@ -59,7 +59,7 @@ bool Drawable::AssignPipeline(const Pipeline *prenderP
+ }
+ 
+ void Drawable::BindShaderResources(const std::vector<std::pair<ShaderModule::VARIABLE, const void *>> *pVarAddrs, const VkCommandBuffer *pcommandBuffer){
+-	char alignas(16) pushConstantBuffer[128];
++	alignas(16) char pushConstantBuffer[128];
+ 	for(uint i = 0, p = 0; i < Pipeline::SHADER_MODULE_COUNT; ++i){
+ 		//bind descriptor sets
+ 		if(!passignedSet->p->pshaderModule[i])

x11-wm/chamfer/files/patch-src_compositor.h

@@ -0,0 +1,19 @@
+In file included from ../src/CompositorFont.cpp:5:
+../src/compositor.h:75:14: error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
+        std::string title;
+                    ^
+/usr/include/c++/v1/iosfwd:210:32: note: template is declared here
+    class _LIBCPP_TEMPLATE_VIS basic_string;
+                               ^
+
+--- src/compositor.h.orig	2020-01-11 22:22:06 UTC
++++ src/compositor.h
+@@ -9,6 +9,8 @@
+ #include <xcb/shm.h>
+ #include <xcb/dri3.h>
+ 
++#include <string>
++
+ //struct gbm_device;
+ 
+ namespace Backend{

x11-wm/chamfer/files/patch-src_config.cpp

@@ -0,0 +1,15 @@
+../src/config.cpp:198:33: error: ordered comparison between pointer and zero ('const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::value_type *' (aka 'const char *') and 'int')
+                        (*m)->fragmentShader.c_str() > 0?(*m)->fragmentShader.c_str():0
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
+
+--- src/config.cpp.orig	2020-01-11 22:22:06 UTC
++++ src/config.cpp
+@@ -195,7 +195,7 @@ void ContainerInterface::UpdateShaders(){
+ 		const char *pshaderName[Compositor::Pipeline::SHADER_MODULE_COUNT] = {
+ 			(*m)->vertexShader.size() > 0?(*m)->vertexShader.c_str():0,
+ 			(*m)->geometryShader.size() > 0?(*m)->geometryShader.c_str():0,
+-			(*m)->fragmentShader.c_str() > 0?(*m)->fragmentShader.c_str():0
++			(*m)->fragmentShader.size() > 0?(*m)->fragmentShader.c_str():0
+ 		};
+ 		pclientFrame->SetShaders(pshaderName);
+ 

x11-wm/chamfer/files/patch-src_main.cpp

@@ -0,0 +1,11 @@
+--- src/main.cpp.orig	2020-01-11 22:22:06 UTC
++++ src/main.cpp
+@@ -159,7 +159,7 @@ class RunBackend : public Config::BackendConfig{ (publ
+ 		Config::ContainerInterface &containerInt = SetupContainer<T,U>(pcreateInfo);
+ 		containerInt.OnSetupContainer();
+ 
+-		Compositor::CompositorInterface *pcompInt = dynamic_cast<Compositor::CompositorInterface *>(pcomp);
++		Compositor::CompositorInterface *pcompInt = reinterpret_cast<Compositor::CompositorInterface *>(pcomp);
+ 
+ 		WManager::Container::Setup setup;
+ 		if(containerInt.floatingMode == Config::ContainerInterface::FLOAT_ALWAYS ||

x11-wm/chamfer/pkg-plist

@@ -7,4 +7,6 @@ bin/chamfer
 %%DATADIR%%/shaders/frame_geometry.spv
 %%DATADIR%%/shaders/frame_vertex.spv
 %%DATADIR%%/shaders/solid_fragment.spv
+%%DATADIR%%/shaders/text_fragment.spv
+%%DATADIR%%/shaders/text_vertex.spv
 share/xsessions/chamfer.desktop