From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 21:35:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA41D5DF9C4; Mon, 12 Apr 2021 21:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FK28T2xT6z4vps; Mon, 12 Apr 2021 21:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E4131EDB9; Mon, 12 Apr 2021 21:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13CLZLBK070494; Mon, 12 Apr 2021 21:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CLZLQ3070493; Mon, 12 Apr 2021 21:35:21 GMT (envelope-from git) Date: Mon, 12 Apr 2021 21:35:21 GMT Message-Id: <202104122135.13CLZLQ3070493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 5ac091e57e9c - main - games/pink-pony: make compatible with Imath 3.0, update glfw dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac091e57e9c9e320afe391aab57deb6ed6f2118 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 21:35:21 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac091e57e9c9e320afe391aab57deb6ed6f2118 commit 5ac091e57e9c9e320afe391aab57deb6ed6f2118 Author: Matthias Andree AuthorDate: 2021-04-12 21:33:19 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 21:35:17 +0000 games/pink-pony: make compatible with Imath 3.0, update glfw dep 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@) --- games/pink-pony/Makefile | 11 ++++------- games/pink-pony/files/patch-SConstruct | 9 ++++++--- games/pink-pony/files/patch-src_Line.cc | 9 +++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index fbceaa1d4bca..6100c2bad0dc 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -1,6 +1,6 @@ PORTNAME= pink-pony PORTVERSION= 1.4.1 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -8,15 +8,12 @@ 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 diff --git a/games/pink-pony/files/patch-SConstruct b/games/pink-pony/files/patch-SConstruct index ed8805c988e1..c8224a1d424a 100644 --- a/games/pink-pony/files/patch-SConstruct +++ b/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") diff --git a/games/pink-pony/files/patch-src_Line.cc b/games/pink-pony/files/patch-src_Line.cc new file mode 100644 index 000000000000..42a19e5ea01e --- /dev/null +++ b/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 ++#include + + #define EPSILON limits::epsilon() +