Skip to content

Commit

Permalink
games/pink-pony: make compatible with Imath 3.0, update glfw dep
Browse files Browse the repository at this point in the history
The LIB_DEPENDS on glfw2 was tightened up to check the .so major
version component, to avoid it picking up the incompatible glfw (3).

Reported by:	Koichiro Iwao (meta@)
  • Loading branch information
mandree committed Apr 12, 2021
1 parent 3490a53 commit 5ac091e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
11 changes: 4 additions & 7 deletions games/pink-pony/Makefile
@@ -1,22 +1,19 @@
PORTNAME= pink-pony
PORTVERSION= 1.4.1
PORTREVISION= 28
PORTREVISION= 29
CATEGORIES= games

MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Tron-like multiplayer racing game

LICENSE= GPLv3+

BROKEN= depends on removed port graphics/ilmbase

LIB_DEPENDS= libIL.so:graphics/devil \
libprotobuf.so:devel/protobuf \
libglfw.so:graphics/glfw2 \
libglfw.so.0:graphics/glfw2 \
libftgl.so:graphics/ftgl \
libsigc-2.0.so:devel/libsigc++20
# FIXME: which port has a drop-in replacement of libHalf.so?
# libHalf.so:graphics/ilmbase
libsigc-2.0.so:devel/libsigc++20 \
libImath.so:math/Imath

USE_GITHUB= yes
GH_ACCOUNT= ginkgo
Expand Down
9 changes: 6 additions & 3 deletions games/pink-pony/files/patch-SConstruct
@@ -1,17 +1,20 @@
--- SConstruct.orig 2014-01-01 01:39:36 UTC
+++ SConstruct
@@ -3,11 +3,10 @@ import os
@@ -3,13 +3,12 @@ import os
optimization_flags = ['-O3']
#optimization_flags = ['-O0', '-ggdb']

-env = Environment()
+env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.items()))
-env['CC'] = 'g++'
-env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'] + optimization_flags
+env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.items()))
+env.Append(CCFLAGS = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'])
env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL']
-env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/', '/usr/include/OpenEXR']
+env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/']

env.ParseConfig("pkg-config IlmBase --cflags --libs")
-env.ParseConfig("pkg-config IlmBase --cflags --libs")
+env.ParseConfig("pkg-config Imath --cflags --libs")
env.ParseConfig("pkg-config libglfw --cflags --libs")
env.ParseConfig("pkg-config ftgl --cflags --libs")
env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs")
9 changes: 9 additions & 0 deletions games/pink-pony/files/patch-src_Line.cc
@@ -0,0 +1,9 @@
--- src/Line.cc.orig 2014-01-01 01:39:36 UTC
+++ src/Line.cc
@@ -1,5 +1,5 @@
#include "Line.hh"
-#include <ImathLimits.h>
+#include <halfLimits.h>

#define EPSILON limits<double>::epsilon()

0 comments on commit 5ac091e

Please sign in to comment.