diff options
| -rw-r--r-- | misc/celestia/distinfo | 5 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ap | 16 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-src_celengine_texture.cpp | 14 |
3 files changed, 30 insertions, 5 deletions
diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo index f3e159d93b0..11d4b07a164 100644 --- a/misc/celestia/distinfo +++ b/misc/celestia/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2012/07/10 20:23:14 dholland Exp $ +$NetBSD: distinfo,v 1.23 2013/02/17 09:39:09 dholland Exp $ SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0 @@ -18,11 +18,12 @@ SHA1 (patch-al) = 1fff49adf00c67dfd99bd79700336fd3d6186e63 SHA1 (patch-am) = 6cfa8ebc978ec35203613f26c3606ed1fb787b60 SHA1 (patch-an) = 089ecfe539186f20191595c79bcf84cb37daffef SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99 -SHA1 (patch-ap) = 768ada9965afdbcfa8f797a9627ad90cb0b920b0 +SHA1 (patch-ap) = 81dece8ed5cc38442655865299cb302080a6acef SHA1 (patch-aq) = fdc7b7f0ff04672f93af144f41e09751b4de0c1a SHA1 (patch-src_celengine_console.cpp) = c837f465aa4c8ad67211d883af6157bcfa89dc55 SHA1 (patch-src_celengine_galaxy.cpp) = 26cff89cb98757a1ea4f5d2727bacf76b82179cb SHA1 (patch-src_celengine_stardb.cpp) = 43d1998fcdd0116db43267b334533ec5fa3dfc72 +SHA1 (patch-src_celengine_texture.cpp) = eb60e81aab7097a3cb2481b052a3a9fe98bfb8e6 SHA1 (patch-src_celengine_vecgl.h) = fbb6982731fdb7bd3561a091fe8c4910b55a4071 SHA1 (patch-src_celestia_eclipsefinder.cpp) = 0ee3adf6dcf8393b8dbb708fad9d09d6fe9aaf5a SHA1 (patch-src_celestia_url.cpp) = 895af96b6476d528e7e87ec1fc7e81d41ff94ec0 diff --git a/misc/celestia/patches/patch-ap b/misc/celestia/patches/patch-ap index 4b74bb5dd3a..2948c9c535a 100644 --- a/misc/celestia/patches/patch-ap +++ b/misc/celestia/patches/patch-ap @@ -1,10 +1,20 @@ -$NetBSD: patch-ap,v 1.2 2010/06/20 15:05:43 wiz Exp $ +$NetBSD: patch-ap,v 1.3 2013/02/17 09:39:09 dholland Exp $ https://sourceforge.net/tracker/?func=detail&aid=3018741&group_id=21302&atid=121302 +Also, add <cstring> to fix build with png 1.6. + --- src/celengine/image.cpp.orig 2005-07-19 20:30:54.000000000 +0000 +++ src/celengine/image.cpp -@@ -78,7 +78,7 @@ using namespace std; +@@ -7,6 +7,7 @@ + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + ++#include <cstring> + #include <fstream> + + #ifndef MACOSX +@@ -78,7 +79,7 @@ using namespace std; // Define various expansion transformations for old versions of libpng #if PNG_LIBPNG_VER < 10004 #define png_set_palette_to_rgb(p) png_set_expand(p) @@ -13,7 +23,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3018741&group_id=21302&atid=121 #define png_set_tRNS_to_alpha(p) png_set_expand(p) #endif // PNG_LIBPNG_VER < 10004 -@@ -720,7 +720,7 @@ Image* LoadPNGImage(const string& filena +@@ -720,7 +721,7 @@ Image* LoadPNGImage(const string& filena if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { diff --git a/misc/celestia/patches/patch-src_celengine_texture.cpp b/misc/celestia/patches/patch-src_celengine_texture.cpp new file mode 100644 index 00000000000..5a87785f6c8 --- /dev/null +++ b/misc/celestia/patches/patch-src_celengine_texture.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_celengine_texture.cpp,v 1.1 2013/02/17 09:39:09 dholland Exp $ + +Fix build with png 1.6. + +--- src/celengine/texture.cpp~ 2004-02-22 00:35:52.000000000 +0000 ++++ src/celengine/texture.cpp +@@ -27,6 +27,7 @@ + #include <fstream> + #include <cstdlib> + #include <cstdio> ++#include <cstring> + #include <cassert> + + #ifndef _WIN32 |