svn commit: r469961 - in head/graphics/glosm: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Mon May 14 19:38:32 2018
New Revision: 469961
URL: https://svnweb.freebsd.org/changeset/ports/469961

Log:
  - Add LICENSE
  - Add missing dependency
  - Fix build with clang 6.0

Added:
  head/graphics/glosm/files/patch-tiler_PBuffer.cc   (contents, props changed)
Modified:
  head/graphics/glosm/Makefile

Modified: head/graphics/glosm/Makefile
==============================================================================
--- head/graphics/glosm/Makefile	Mon May 14 19:32:09 2018	(r469960)
+++ head/graphics/glosm/Makefile	Mon May 14 19:38:32 2018	(r469961)
@@ -10,22 +10,28 @@ MASTER_SITES=	GHC http://mirror.amdmi3.ru/distfiles/
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	3D OpenGL renderer for OpenStreetMap
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libexpat.so:textproc/expat2
 
 USES=		tar:bzip2 cmake
 USE_GL=		gl
+USE_XORG=	x11
 USE_SDL=	sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
 TEST_TARGET=	test
 
+CXXFLAGS+=	-Wno-c++11-narrowing
+
 PORTDOCS=	README ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor

Added: head/graphics/glosm/files/patch-tiler_PBuffer.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/glosm/files/patch-tiler_PBuffer.cc	Mon May 14 19:38:32 2018	(r469961)
@@ -0,0 +1,20 @@
+--- tiler/PBuffer.cc.orig	2011-02-27 15:05:45 UTC
++++ tiler/PBuffer.cc
+@@ -38,7 +38,7 @@ static bool CheckGLXVersion(Display* dis
+ 	return true;
+ }
+ 
+-PBuffer::PBuffer(int width, int height, int samples) : width_(width), height_(height), display_(NULL), context_(NULL), pbuffer_(NULL) {
++PBuffer::PBuffer(int width, int height, int samples) : width_(width), height_(height), display_(NULL), context_(NULL), pbuffer_(None) {
+ 	if ((display_ = XOpenDisplay(NULL)) == NULL)
+ 		throw PBufferException() << "cannot open default X display";
+ 
+@@ -113,7 +113,7 @@ PBuffer::PBuffer(int width, int height, 
+ }
+ 
+ PBuffer::~PBuffer() {
+-	if (!glXMakeCurrent(display_, NULL, NULL))
++	if (!glXMakeCurrent(display_, None, NULL))
+ 		warnx("cannot reset GLX context: glXMakeCurrent failed");
+ 	glXDestroyContext(display_, context_);
+ 	glXDestroyPbuffer(display_, pbuffer_);