diff options
| author | wiz <wiz@pkgsrc.org> | 2011-01-20 23:37:36 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-01-20 23:37:36 +0000 |
| commit | 997443a2149c0516489980320f35b2834fa4cdd7 (patch) | |
| tree | a60f5e90e67052ff8ac4c768af2b940b4787808f /games | |
| parent | 78b26ed4749a3198691a5712b3fe0d8012ef0633 (diff) | |
| download | pkgsrc-997443a2149c0516489980320f35b2834fa4cdd7.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'games')
| -rw-r--r-- | games/pingus/distinfo | 5 | ||||
| -rw-r--r-- | games/pingus/patches/patch-aa | 6 | ||||
| -rw-r--r-- | games/pingus/patches/patch-ac | 15 |
3 files changed, 21 insertions, 5 deletions
diff --git a/games/pingus/distinfo b/games/pingus/distinfo index 29160a5c915..cca3b6b4e97 100644 --- a/games/pingus/distinfo +++ b/games/pingus/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/01/19 19:47:59 kefren Exp $ +$NetBSD: distinfo,v 1.2 2011/01/20 23:41:02 wiz Exp $ SHA1 (pingus-0.7.3.tar.bz2) = ca7fe5cea65fb3392d1e81056a879831925502f2 RMD160 (pingus-0.7.3.tar.bz2) = 664d259a98a172d10480be9aa4ec87a424ecd6f1 Size (pingus-0.7.3.tar.bz2) = 11127278 bytes -SHA1 (patch-aa) = 32a40991e57918163c9b7c2c740dd29b08ccadef +SHA1 (patch-aa) = 7df701ca791e01d7c6fbff558bca906f56fbb643 SHA1 (patch-ab) = 2f897472e0c006e6fa325c17eda34b05d0ba6a01 +SHA1 (patch-ac) = 34f11e9ba2b259cee4d90f408c214bdbb34330a2 diff --git a/games/pingus/patches/patch-aa b/games/pingus/patches/patch-aa index be299bb74d6..a3bef4eea4d 100644 --- a/games/pingus/patches/patch-aa +++ b/games/pingus/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2011/01/19 19:47:59 kefren Exp $ +$NetBSD: patch-aa,v 1.2 2011/01/20 23:41:02 wiz Exp $ NetBSD config & path fixes @@ -43,8 +43,8 @@ NetBSD config & path fixes - if not config.CheckLibWithHeader('png', 'png.h', 'c++'): - fatal_error += " * library 'png' not found\n" -+ if not config.CheckLibWithHeader('png14', 'png.h', 'c++'): -+ fatal_error += " * library 'png14' not found\n" ++ if not config.CheckLibWithHeader('png15', 'png.h', 'c++'): ++ fatal_error += " * library 'png15' not found\n" if config.CheckMyProgram('sdl-config'): env.ParseConfig('sdl-config --cflags --libs') diff --git a/games/pingus/patches/patch-ac b/games/pingus/patches/patch-ac new file mode 100644 index 00000000000..9260a9bbad4 --- /dev/null +++ b/games/pingus/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2011/01/20 23:41:02 wiz Exp $ + +Fix build with png-1.5. + +--- src/screenshot.cpp.orig 2007-09-30 16:07:08.000000000 +0000 ++++ src/screenshot.cpp +@@ -159,7 +159,7 @@ Screenshot::save_png(const std::string& + return; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem reading the file + fclose(fp); |