Date: Wed, 31 Oct 2018 02:32:50 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483546 - in head/x11-toolkits/nucleo: . files Message-ID: <201810310232.w9V2Wo7W061718@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Oct 31 02:32:50 2018 New Revision: 483546 URL: https://svnweb.freebsd.org/changeset/ports/483546 Log: In r483285, compiler:c++11-lang was added to USES in order to unbreak the port on GCC-based architectures, while actually the code predates 2011 by couple of years. Turns out that the build against GCC was failing because of the -Wno-c++11-narrowing option added back in r474518 to unbreak the build against Clang 6. Fix the underlying problem with the code instead, so we can remove offending option from CXXFLAGS and stop bogusly require C++11-capable compiler just because of that option. Tested on: Mac mini G4 (powerpc, gcc-4.2.1-based) Added: head/x11-toolkits/nucleo/files/patch-nucleo_gl_texture_glTexture.cxx (contents, props changed) Modified: head/x11-toolkits/nucleo/Makefile Modified: head/x11-toolkits/nucleo/Makefile ============================================================================== --- head/x11-toolkits/nucleo/Makefile Wed Oct 31 02:29:03 2018 (r483545) +++ head/x11-toolkits/nucleo/Makefile Wed Oct 31 02:32:50 2018 (r483546) @@ -18,7 +18,7 @@ LIB_DEPENDS= libexif.so:graphics/libexif \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -USES= compiler:c++11-lang gl gmake jpeg libtool localbase:ldflags \ +USES= gl gmake jpeg libtool localbase:ldflags \ pathfix pkgconfig python:run shebangfix tar:bzip2 USE_GL= gl glu GNU_CONFIGURE= yes @@ -26,8 +26,6 @@ CONFIGURE_ARGS= --without-opencv USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHEBANG_FILES= docs/MacOSX/nBundle.in - -CXXFLAGS+= -Wno-c++11-narrowing OPTIONS_DEFINE= FFMPEG GD GNUTLS QT4 OPTIONS_RADIO= DNSSD Added: head/x11-toolkits/nucleo/files/patch-nucleo_gl_texture_glTexture.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/nucleo/files/patch-nucleo_gl_texture_glTexture.cxx Wed Oct 31 02:32:50 2018 (r483546) @@ -0,0 +1,13 @@ +--- nucleo/gl/texture/glTexture.cxx.orig 2009-06-02 09:34:34 UTC ++++ nucleo/gl/texture/glTexture.cxx +@@ -426,7 +426,9 @@ namespace nucleo { + {left, top, 0.0} + } ; + +- GLdouble texinfo[] = { left, bottom, tWidth, tHeight, 1.0, 1.0 } ; ++ GLdouble texinfo[] = { left, bottom, ++ static_cast<GLdouble>(tWidth), static_cast<GLdouble>(tHeight), ++ 1.0, 1.0 } ; + if (tTarget==GL_TEXTURE_2D) { + texinfo[4] = t->getTextureWidth() ; + texinfo[5] = t->getTextureHeight() ;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810310232.w9V2Wo7W061718>