summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-06-20 20:57:02 +0000
committernia <nia@pkgsrc.org>2020-06-20 20:57:02 +0000
commit0babdea72941cb3359cb32bbe224424a72e9ef04 (patch)
treed75d1dfbd8f17990c1848b218c9d74e8f69e21c7 /games
parent2c9148d04aca426eb05f732aee35028276fb3b4f (diff)
downloadpkgsrc-0babdea72941cb3359cb32bbe224424a72e9ef04.tar.gz
powder-toy: Use pkgconf to find libX11 to avoid rpath problems
Diffstat (limited to 'games')
-rw-r--r--games/powder-toy/distinfo5
-rw-r--r--games/powder-toy/patches/patch-SConscript11
2 files changed, 11 insertions, 5 deletions
diff --git a/games/powder-toy/distinfo b/games/powder-toy/distinfo
index 5ed8b3bba4c..e120882e867 100644
--- a/games/powder-toy/distinfo
+++ b/games/powder-toy/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.1 2019/04/13 12:08:04 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/06/20 20:57:02 nia Exp $
SHA1 (powder-toy-94.1.tar.gz) = 14249c100e38971444bb96fd31ff26fd24cc2190
RMD160 (powder-toy-94.1.tar.gz) = 88671b2007f2f1a2ecc3a079cc961d3475742f56
SHA512 (powder-toy-94.1.tar.gz) = ecda20d206298ff605a3a361255a0766caceece4d268355e4dbf1d56ef78bd7c43e54560d1ad71f29a8c3572d66eca875d5539e1006b260e029561ab91bf34d4
Size (powder-toy-94.1.tar.gz) = 1254309 bytes
-SHA1 (patch-SConscript) = e1b11abaf9100b2a509cefbfa713baf3c11a2c5a
+SHA1 (patch-SConscript) = 73cb6c1efb0bfe7db2f8e67c3b8cff6aa93da313
SHA1 (patch-resources_powder.appdata.xml) = e687b33b50c286ec2858bdf2024e201df4b8be8e
SHA1 (patch-resources_powder.desktop) = 9c77feb557afbd2e5ad4fb0b5f15be1809214555
SHA1 (patch-src_Config.h) = 01d9cced7a87b6f33b1974bf51dd9d93949d41a2
+SHA1 (patch-src_lua_luascripts_eventcompat.lua) = 8d32490978be03c85ccd3131e52fae0b750b34af
diff --git a/games/powder-toy/patches/patch-SConscript b/games/powder-toy/patches/patch-SConscript
index 41b9c140572..f50fc50f2db 100644
--- a/games/powder-toy/patches/patch-SConscript
+++ b/games/powder-toy/patches/patch-SConscript
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConscript,v 1.1 2019/04/13 12:08:04 nia Exp $
+$NetBSD: patch-SConscript,v 1.2 2020/06/20 20:57:02 nia Exp $
Support NetBSD.
@@ -58,7 +58,7 @@ Support NetBSD.
if not conf.CheckLib('GL'):
FatalError("libGL not found or not installed")
try:
-@@ -363,7 +360,7 @@ def findLibs(env, conf):
+@@ -363,10 +360,12 @@ def findLibs(env, conf):
if not conf.CheckFramework("OpenGL"):
FatalError("OpenGL framework not found or not installed")
@@ -67,7 +67,12 @@ Support NetBSD.
if not conf.CheckLib('X11'):
FatalError("X11 development library not found or not installed")
-@@ -418,7 +415,7 @@ if platform == "Windows":
++ env.ParseConfig('pkg-config --libs x11')
++
+ if not conf.CheckLib('rt'):
+ FatalError("librt not found or not installed")
+ elif platform == "Windows":
+@@ -418,7 +417,7 @@ if platform == "Windows":
env.Append(LINKFLAGS=['/NODEFAULTLIB:msvcrtd.lib'])
else:
env.Append(LINKFLAGS=['-mwindows'])