[pkgsrc/trunk]: pkgsrc/games/pingus pingus: use pkgconfig to find libGL. Resu...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/280f7600d857
branches:  trunk
changeset: 334451:280f7600d857
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon May 27 16:07:30 2019 +0000

description:
pingus: use pkgconfig to find libGL. Results in adding /usr/X11R7/lib to
RPATH on netbsd, meaning this program can run.
Avoid accidental expansion of DATADIR in pingus_main.cpp.

This now runs for me.
Bump PKGREVISION.

diffstat:

 games/pingus/Makefile                                  |   3 ++-
 games/pingus/distinfo                                  |   6 +++---
 games/pingus/patches/patch-SConscript                  |  16 ++++++++++++++--
 games/pingus/patches/patch-src_pingus_pingus__main.cpp |   4 ++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diffs (86 lines):

diff -r 054ee5e9ef64 -r 280f7600d857 games/pingus/Makefile
--- a/games/pingus/Makefile     Mon May 27 15:53:30 2019 +0000
+++ b/games/pingus/Makefile     Mon May 27 16:07:30 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2019/05/13 04:50:46 triaxx Exp $
+# $NetBSD: Makefile,v 1.34 2019/05/27 16:07:30 maya Exp $
 
 DISTNAME=      pingus-0.7.6
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Pingus/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
diff -r 054ee5e9ef64 -r 280f7600d857 games/pingus/distinfo
--- a/games/pingus/distinfo     Mon May 27 15:53:30 2019 +0000
+++ b/games/pingus/distinfo     Mon May 27 16:07:30 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2019/05/27 15:37:56 maya Exp $
+$NetBSD: distinfo,v 1.12 2019/05/27 16:07:30 maya Exp $
 
 SHA1 (pingus-0.7.6.tar.gz) = c888c277995bed84052b62d0eacbd77d0346a276
 RMD160 (pingus-0.7.6.tar.gz) = e58ced4252caea3ca642a82a47468ed49eaa7851
 SHA512 (pingus-0.7.6.tar.gz) = ea0e7fd2cc1f6c23e62e222dffa1eb4764313ccecd716083c516fa4720c19562c9940da1dae4cbc527b85de9c0094f482e4f907212226b39ad044222b477769b
 Size (pingus-0.7.6.tar.gz) = 13410576 bytes
 SHA1 (patch-Makefile) = 6fb2ea04cc97381530b3e61e06c74b478f62a6e7
-SHA1 (patch-SConscript) = 39aa7f18a05cb45eed4393e6462fe9ec656d8297
+SHA1 (patch-SConscript) = 0f53571c6b0d6249abc22bbe428476aca31ed26c
 SHA1 (patch-src_editor_button.hpp) = a640979ed318233401147880d59f30f90aa0ed49
 SHA1 (patch-src_editor_checkbox.hpp) = 51d605b2cb5e51acce37b9626c68c236c1b5cc9c
 SHA1 (patch-src_editor_combobox.hpp) = 41511fb02e6378ea9c4ec76af4d77738b28f29dc
@@ -19,7 +19,7 @@
 SHA1 (patch-src_pingus_components_choice__box.hpp) = 4d2faefe2db205c8cbc695c6b45df4ee549261e8
 SHA1 (patch-src_pingus_components_slider__box.hpp) = 0c247a42dcf17a214fb2347177e95e0a5393807d
 SHA1 (patch-src_pingus_config__manager.hpp) = 3aa3c4947accec1360ee71d03aec8582c68c226a
-SHA1 (patch-src_pingus_pingus__main.cpp) = d7e5b778c3bab1f5c36d0a1fd97e9a477c499d27
+SHA1 (patch-src_pingus_pingus__main.cpp) = c3e4e20c2ffe8000761a79f72711ab7c5e88c583
 SHA1 (patch-src_pingus_screens_demo__session.hpp) = 4f601d78e7962d93ee5610e60e9f1d9e7df1c303
 SHA1 (patch-src_pingus_screens_option__menu.hpp) = bf7da1b212fde00b9dd3d2f972ec587f629771da
 SHA1 (patch-src_pingus_screens_pingus__menu.cpp) = 18c2f3762fd5d7adf6a6a9b4561cc6af1289ff15
diff -r 054ee5e9ef64 -r 280f7600d857 games/pingus/patches/patch-SConscript
--- a/games/pingus/patches/patch-SConscript     Mon May 27 15:53:30 2019 +0000
+++ b/games/pingus/patches/patch-SConscript     Mon May 27 16:07:30 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConscript,v 1.1 2019/05/12 06:17:30 triaxx Exp $
+$NetBSD: patch-SConscript,v 1.2 2019/05/27 16:07:30 maya Exp $
 
 * Python 3.x support.
 * Boost does not maintain Signals anymore (Signals2 does not require linkage).
@@ -30,7 +30,19 @@
              Exit(1)
  
      def configure_gxx(self): 
-@@ -186,11 +185,6 @@ class Project:
+@@ -151,7 +150,10 @@ class Project:
+             if sys.platform == "darwin":
+                 self.conf.env.Append(LINKFLAGS = [ '-framework', 'OpenGL' ])
+             else:
+-                self.conf.env.Append(LIBS = ['GL'])
++                if self.conf.CheckMyProgram('pkg-config'):
++                    self.conf.env.ParseConfig("pkg-config  --cflags --libs gl")
++                else:
++                    self.conf.env.Append(LIBS = ['GL'])
+ 
+     def configure_linuxevdev(self):
+         if not self.env['with_linuxevdev']:
+@@ -186,11 +188,6 @@ class Project:
              self.conf.env.Append(optional_sources = ['src/engine/input/xinput/xinput_driver.cpp',
                                                       'src/engine/input/xinput/xinput_device.cpp'])
              
diff -r 054ee5e9ef64 -r 280f7600d857 games/pingus/patches/patch-src_pingus_pingus__main.cpp
--- a/games/pingus/patches/patch-src_pingus_pingus__main.cpp    Mon May 27 15:53:30 2019 +0000
+++ b/games/pingus/patches/patch-src_pingus_pingus__main.cpp    Mon May 27 16:07:30 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_pingus_pingus__main.cpp,v 1.1 2019/05/12 06:17:30 triaxx Exp $
+$NetBSD: patch-src_pingus_pingus__main.cpp,v 1.2 2019/05/27 16:07:30 maya Exp $
 
 * Set DATADIR according to pkgsrc (program is not launched from source dir).
 * Insert space to appease C++11.
@@ -24,7 +24,7 @@
 -    g_path_manager.set_path("data"); // assume game is run from source dir
 -#endif
 +  {
-+    g_path_manager.set_path("/mnt/ccd0/pkg/share/pingus"); // assume game is run from source dir
++    g_path_manager.set_path("@DATADIR@"); // assume game is run from source dir
    }
  
    // Language is automatically picked from env variable