diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /x11-toolkits/irrlicht | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'x11-toolkits/irrlicht')
3 files changed, 50 insertions, 3 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 0f5038543f70..aa78017db6d8 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -7,6 +7,7 @@ PORTNAME= irrlicht PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION} @@ -14,13 +15,14 @@ MAINTAINER= acm@FreeBSD.org COMMENT= High performance realtime 3D engine LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_DOS2UNIX= Makefile *.cpp *.h *.txt USE_GMAKE= yes USE_GL= yes USE_LDCONFIG= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} @@ -66,8 +68,6 @@ post-extract: @${RM} ${WRKSRC}/media/Thumbs.db post-patch: - @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/source/Irrlicht/CImageLoaderPNG.cpp @${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \ diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp new file mode 100644 index 000000000000..ac80dbe8964f --- /dev/null +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp @@ -0,0 +1,28 @@ +--- source/Irrlicht/CImageLoaderPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200 ++++ source/Irrlicht/CImageLoaderPNG.cpp 2012-05-26 13:58:05.000000000 +0200 +@@ -12,6 +12,7 @@ + #else // _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include "libpng/png.h" // use irrlicht included lib png + #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_ ++ #include <pngpriv.h> + #endif // _IRR_COMPILE_WITH_LIBPNG_ + + #include "CImage.h" +@@ -28,7 +29,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg) + { + os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + // PNG function for file reading +@@ -162,7 +163,7 @@ + if (BitDepth < 8) + { + if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + else + png_set_packing(png_ptr); + } diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp new file mode 100644 index 000000000000..b8b0b273af26 --- /dev/null +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp @@ -0,0 +1,19 @@ +--- source/Irrlicht/CImageWriterPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200 ++++ source/Irrlicht/CImageWriterPNG.cpp 2012-05-26 14:39:25.000000000 +0200 +@@ -15,6 +15,7 @@ + #ifdef _IRR_COMPILE_WITH_LIBPNG_ + #ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include <png.h> // use system lib png ++ #include <pngpriv.h> + #else // _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include "libpng/png.h" // use irrlicht included lib png + #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_ +@@ -35,7 +36,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg) + { + os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + // PNG function for file writing |