From owner-svn-ports-all@freebsd.org Mon May 14 19:38:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FA95E6E984; Mon, 14 May 2018 19:38:33 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C943B7671E; Mon, 14 May 2018 19:38:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA6292088D; Mon, 14 May 2018 19:38:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EJcWnf018563; Mon, 14 May 2018 19:38:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EJcWuO018561; Mon, 14 May 2018 19:38:32 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201805141938.w4EJcWuO018561@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 14 May 2018 19:38:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469961 - in head/graphics/glosm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/graphics/glosm: . files X-SVN-Commit-Revision: 469961 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 19:38:33 -0000 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@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_);