gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prboom: fix png support

Browse Source 
Ensure libpng gets built before prboom so configure finds it, and fix
build with libpng 1.4.x (NULL defines removed).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-10-14 20:31:04 +02:00
parent dc6d5d9b3c
commit c4e6bc74de
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/games/prboom/prboom-2.5.0-libpng-1.4.patch Normal file
View File

@ -0,0 +1,32 @@
[PATCH] fix build with libpng 1.4.x
In 1.4.x the png_*_NULL defines are gone. Replace them with a normal
NULL instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
src/SDL/i_sshot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: prboom-2.5.0/src/SDL/i_sshot.c
===================================================================
--- prboom-2.5.0.orig/src/SDL/i_sshot.c
+++ prboom-2.5.0/src/SDL/i_sshot.c
@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
if (fp)
{
png_struct *png_ptr = png_create_write_struct(
- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
if (png_ptr)
{
@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
break;
}
}
- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
+ png_destroy_write_struct(&png_ptr, NULL);
}
fclose(fp);
}

4
package/games/prboom/prboom.mk
View File

@ -7,6 +7,10 @@ PRBOOM_VERSION = 2.5.0
PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer
ifeq ($(BR2_PACKAGE_LIBPNG),y)
PRBOOM_DEPENDENCIES += libpng
endif
PRBOOM_CONF_OPT = \
--oldincludedir=$(STAGING_DIR)/usr/include \
--with-sdl-prefix=$(STAGING_DIR)/usr \