From c2cb9f1eb51d858c6391e641dd43ed3f2b15d382 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 17 Jan 2018 20:38:40 +0000 Subject: - Fix build with Clang 6.0. [1] - Fix license and prefer HTTPS for WWW. PR: 225006 [1] --- graphics/libgltf/Makefile | 6 +++--- graphics/libgltf/files/patch-src_Shaders.cpp | 11 +++++++++++ graphics/libgltf/pkg-descr | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 graphics/libgltf/files/patch-src_Shaders.cpp (limited to 'graphics/libgltf') diff --git a/graphics/libgltf/Makefile b/graphics/libgltf/Makefile index f4a0c3dd677a..bd7dd039a015 100644 --- a/graphics/libgltf/Makefile +++ b/graphics/libgltf/Makefile @@ -2,15 +2,15 @@ PORTNAME= libgltf PORTVERSION= 0.0.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics devel MASTER_SITES= LODEV MAINTAINER= office@FreeBSD.org COMMENT= C++ Library for rendering OpenGL models stored in glTF format -LICENSE= LGPL21 MPL20 -LICENSE_COMB= dual +LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:devel/boost-libs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm diff --git a/graphics/libgltf/files/patch-src_Shaders.cpp b/graphics/libgltf/files/patch-src_Shaders.cpp new file mode 100644 index 000000000000..a5a68b445ed9 --- /dev/null +++ b/graphics/libgltf/files/patch-src_Shaders.cpp @@ -0,0 +1,11 @@ +--- src/Shaders.cpp.orig 2014-10-01 18:31:43 UTC ++++ src/Shaders.cpp +@@ -175,7 +175,7 @@ bool ShaderProgram::compileShader(const char* pShader, + }; + + const GLint aSizes[] = { +- strlen("#version 130\n"), ++ sizeof("#version 130\n") - 1, + iGLSize, + }; + diff --git a/graphics/libgltf/pkg-descr b/graphics/libgltf/pkg-descr index e4fe49131bad..fe60882a49fb 100644 --- a/graphics/libgltf/pkg-descr +++ b/graphics/libgltf/pkg-descr @@ -1,3 +1,3 @@ Library for rendering OpenGL models stored in glTF format -WWW: http://www.libreoffice.org +WWW: https://www.libreoffice.org -- cgit v1.2.3