diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile index 60428790bb41..aa450c0c5cdb 100644 --- a/x11-wm/chamfer/Makefile +++ b/x11-wm/chamfer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= chamfer -DISTVERSION= s20200112 +DISTVERSION= s20200115 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -31,8 +31,7 @@ USE_GITHUB= yes USE_XORG= xcb GH_ACCOUNT= jaelpark GH_PROJECT= ${PORTNAME}wm -GH_TAGNAME= 78168e0 -CXXFLAGS+= -Wno-narrowing +GH_TAGNAME= 99ed237 post-patch: @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \ diff --git a/x11-wm/chamfer/distinfo b/x11-wm/chamfer/distinfo index 056eae0712f9..f78fd246aa20 100644 --- a/x11-wm/chamfer/distinfo +++ b/x11-wm/chamfer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578781326 -SHA256 (jaelpark-chamferwm-s20200112-78168e0_GH0.tar.gz) = b493058ff022f3b31eaaf536c96cec5f8d5a73f5c8ed2b4097a654ee5b5bb7cc -SIZE (jaelpark-chamferwm-s20200112-78168e0_GH0.tar.gz) = 137316 +TIMESTAMP = 1579092641 +SHA256 (jaelpark-chamferwm-s20200115-99ed237_GH0.tar.gz) = 25b8995030428fcab572eeacce38899a2c06e64fb2915f6abc19626e1295eb13 +SIZE (jaelpark-chamferwm-s20200115-99ed237_GH0.tar.gz) = 137343 diff --git a/x11-wm/chamfer/files/patch-main.cpp b/x11-wm/chamfer/files/patch-main.cpp deleted file mode 100644 index 07d4b2f48c7f..000000000000 --- a/x11-wm/chamfer/files/patch-main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -- Add default shader path - ---- src/main.cpp.orig 2020-01-11 22:22:06 UTC -+++ src/main.cpp -@@ -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 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 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"}); - - try{ - parser.ParseCLI(argc,pargv); diff --git a/x11-wm/chamfer/files/patch-src_compositor.cpp b/x11-wm/chamfer/files/patch-src_compositor.cpp deleted file mode 100644 index 65133a6d93dc..000000000000 --- a/x11-wm/chamfer/files/patch-src_compositor.cpp +++ /dev/null @@ -1,15 +0,0 @@ -../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> *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]) diff --git a/x11-wm/chamfer/files/patch-src_compositor.h b/x11-wm/chamfer/files/patch-src_compositor.h deleted file mode 100644 index 389adfc816f1..000000000000 --- a/x11-wm/chamfer/files/patch-src_compositor.h +++ /dev/null @@ -1,19 +0,0 @@ -In file included from ../src/CompositorFont.cpp:5: -../src/compositor.h:75:14: error: implicit instantiation of undefined template 'std::__1::basic_string, std::__1::allocator >' - 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 - #include - -+#include -+ - //struct gbm_device; - - namespace Backend{ diff --git a/x11-wm/chamfer/files/patch-src_config.cpp b/x11-wm/chamfer/files/patch-src_config.cpp deleted file mode 100644 index b65d0593f0b9..000000000000 --- a/x11-wm/chamfer/files/patch-src_config.cpp +++ /dev/null @@ -1,15 +0,0 @@ -../src/config.cpp:198:33: error: ordered comparison between pointer and zero ('const std::__1::basic_string, std::__1::allocator >::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); - diff --git a/x11-wm/chamfer/files/patch-src_main.cpp b/x11-wm/chamfer/files/patch-src_main.cpp deleted file mode 100644 index 4bc3e421bd29..000000000000 --- a/x11-wm/chamfer/files/patch-src_main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -../src/main.cpp:162:47: error: 'RunCompositor' is an incomplete type - Compositor::CompositorInterface *pcompInt = dynamic_cast(pcomp); - ^ ~~~~~ -../src/main.cpp:109:27: note: forward declaration of 'RunCompositor' - void SetCompositor(class RunCompositor *pcomp){ - ^ - ---- 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(pcreateInfo); - containerInt.OnSetupContainer(); - -- Compositor::CompositorInterface *pcompInt = dynamic_cast(pcomp); -+ Compositor::CompositorInterface *pcompInt = reinterpret_cast(pcomp); - - WManager::Container::Setup setup; - if(containerInt.floatingMode == Config::ContainerInterface::FLOAT_ALWAYS ||