Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Dec 2018 05:38:20 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486584 - in head/graphics/libprojectm: . files
Message-ID:  <201812040538.wB45cKOD082089@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Tue Dec  4 05:38:19 2018
New Revision: 486584
URL: https://svnweb.freebsd.org/changeset/ports/486584

Log:
  graphics/libprojectm: fix build with GCC-based architectures
  
  There are two issues here:
  1. GLM requires at least GCC 4.7, base has 4.2. Add USES=compiler:c++11-lang to solve it.
  2. the port uses typedefs from sys/types.h, but those are not included by default by GCC.
  
  PR:		233748
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

Added:
  head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_ShaderEngine.cpp   (contents, props changed)
  head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_hlslparser_src_HLSLParser.cpp   (contents, props changed)
Modified:
  head/graphics/libprojectm/Makefile

Modified: head/graphics/libprojectm/Makefile
==============================================================================
--- head/graphics/libprojectm/Makefile	Tue Dec  4 05:38:12 2018	(r486583)
+++ head/graphics/libprojectm/Makefile	Tue Dec  4 05:38:19 2018	(r486584)
@@ -17,7 +17,8 @@ LIB_DEPENDS=	libftgl.so:graphics/ftgl \
 		libvisual-0.4.so:graphics/libvisual04
 RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 
-USES=		autoreconf:build gl gmake libtool localbase:ldflags pkgconfig qt:5
+USES=		autoreconf:build compiler:c++11-lang gl gmake libtool \
+		localbase:ldflags pkgconfig qt:5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	projectM-visualizer

Added: head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_ShaderEngine.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_ShaderEngine.cpp	Tue Dec  4 05:38:19 2018	(r486584)
@@ -0,0 +1,12 @@
+--- src/libprojectM/Renderer/ShaderEngine.cpp.orig	2018-12-03 11:18:41 UTC
++++ src/libprojectM/Renderer/ShaderEngine.cpp
+@@ -16,6 +16,9 @@
+ #include <glm/gtc/type_ptr.hpp>
+ #include <set>
+ #include <regex>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
+ 
+ #ifdef USE_GLES
+     #define GLSL_VERSION "300 es"

Added: head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_hlslparser_src_HLSLParser.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libprojectm/files/patch-src_libprojectM_Renderer_hlslparser_src_HLSLParser.cpp	Tue Dec  4 05:38:19 2018	(r486584)
@@ -0,0 +1,12 @@
+--- src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp.orig	2018-12-03 11:23:19 UTC
++++ src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp
+@@ -20,6 +20,9 @@
+ #include <iostream>
+ #include <cmath>
+ #include <cstdlib>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
+ 
+ namespace M4
+ {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812040538.wB45cKOD082089>