diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-04-01 04:59:04 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-04-01 04:59:04 +0000 |
| commit | 08a2e61d8a80056b49456688a226da265e78733a (patch) | |
| tree | e831c762a6745027e7de7ca2367716c3d5728611 /games/vegastrike | |
| parent | b8096ed6f0b2a6f7ddf6942c5de48889bd601317 (diff) | |
| download | ports-08a2e61d8a80056b49456688a226da265e78733a.tar.gz ports-08a2e61d8a80056b49456688a226da265e78733a.zip | |
- fix build for png-1.4.1
PR: 145223
Notes
Notes:
svn path=/head/; revision=251919
Diffstat (limited to 'games/vegastrike')
| -rw-r--r-- | games/vegastrike/files/patch-objconv-basemaker-base_maker_texture.cpp | 20 | ||||
| -rw-r--r-- | games/vegastrike/files/patch-src-gfx-vsimage.cpp | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/games/vegastrike/files/patch-objconv-basemaker-base_maker_texture.cpp b/games/vegastrike/files/patch-objconv-basemaker-base_maker_texture.cpp new file mode 100644 index 000000000000..c54e100c76e2 --- /dev/null +++ b/games/vegastrike/files/patch-objconv-basemaker-base_maker_texture.cpp @@ -0,0 +1,20 @@ +--- objconv/basemaker/base_maker_texture.cpp.orig 2008-04-24 14:12:53.000000000 +0200 ++++ objconv/basemaker/base_maker_texture.cpp 2010-04-01 06:40:29.000000000 +0200 +@@ -73,7 +73,7 @@ + png_set_palette_to_rgb(png_ptr); + + if (ctype == PNG_COLOR_TYPE_GRAY && data->bpp < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + + png_set_expand (png_ptr); + png_read_update_info (png_ptr,info_ptr); +@@ -211,7 +211,7 @@ + unsigned char sig[8]; + fread(sig, sizeof(char), 8, fp); + fseek(fp,0,SEEK_SET); +- if (png_check_sig(sig, 8)) { ++ if (!png_sig_cmp(sig, 0, 8)) { + return FORMAT_PNG; + } + } diff --git a/games/vegastrike/files/patch-src-gfx-vsimage.cpp b/games/vegastrike/files/patch-src-gfx-vsimage.cpp new file mode 100644 index 000000000000..7ce8c9d06513 --- /dev/null +++ b/games/vegastrike/files/patch-src-gfx-vsimage.cpp @@ -0,0 +1,20 @@ +--- src/gfx/vsimage.cpp.orig 2008-04-24 14:12:37.000000000 +0200 ++++ src/gfx/vsimage.cpp 2010-03-31 16:39:55.000000000 +0200 +@@ -147,7 +147,7 @@ + unsigned char sig[8]; + file->Begin(); + file->Read(sig, 8); +- if (!png_check_sig(sig, 8)) ++ if (png_sig_cmp(sig, 0, 8)) + ret = BadFormat; + + return ret; +@@ -349,7 +349,7 @@ + png_set_palette_to_rgb(png_ptr); + + if (this->img_color_type == PNG_COLOR_TYPE_GRAY && this->img_depth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + + png_set_expand (png_ptr); + png_read_update_info (png_ptr,info_ptr); |