Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 30 Mar 2020 06:08:21 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529862 - in head/games/dangerdeep: . files
Message-ID:  <202003300608.02U68LED043106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tobik
Date: Mon Mar 30 06:08:21 2020
New Revision: 529862
URL: https://svnweb.freebsd.org/changeset/ports/529862

Log:
  games/dangerdeep: Fix compiling GLSL shaders
  
  compiling failed, log:
  0:2(1): preprocessor error: #version must appear on the first line
  
  Reported by:	lme

Added:
  head/games/dangerdeep/files/patch-src_shader.cpp   (contents, props changed)
Modified:
  head/games/dangerdeep/Makefile

Modified: head/games/dangerdeep/Makefile
==============================================================================
--- head/games/dangerdeep/Makefile	Mon Mar 30 05:56:15 2020	(r529861)
+++ head/games/dangerdeep/Makefile	Mon Mar 30 06:08:21 2020	(r529862)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dangerdeep
 PORTVERSION=	0.3.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/danger_from_the_deep-src/${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}

Added: head/games/dangerdeep/files/patch-src_shader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/dangerdeep/files/patch-src_shader.cpp	Mon Mar 30 06:08:21 2020	(r529862)
@@ -0,0 +1,26 @@
+compiling failed, log:
+0:2(1): preprocessor error: #version must appear on the first line
+
+--- src/shader.cpp.orig	2020-03-29 17:02:18 UTC
++++ src/shader.cpp
+@@ -74,6 +74,8 @@ glsl_shader::glsl_shader(const string& filename, type 
+ 		// the program as string
+ 		string prg;
+ 
++		prg += "#version 110\n";
++
+ 		// add defines to top of list for preprocessor
+ 		for (defines_list::const_iterator it = dl.begin(); it != dl.end(); ++it) {
+ 			prg += string("#define ") + *it + "\n";
+@@ -83,7 +85,10 @@ glsl_shader::glsl_shader(const string& filename, type 
+ 		while (!ifprg.eof()) {
+ 			string s;
+ 			getline(ifprg, s);
+-			prg += s + "\n";
++			string prefix("#version");
++			if (0 != s.compare(0, prefix.size(), prefix)) {
++				prg += s + "\n";
++			}
+ 		}
+ 
+ 		const char* prg_cstr = prg.c_str();

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