diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2005-10-06 15:29:40 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2005-10-06 15:29:40 +0000 |
| commit | 58f9523a55ade4cd92851e12531ff7145671857d (patch) | |
| tree | 5ff6e8bc546a88b89a208c0d295c10015bb62e78 /graphics/devil | |
| parent | update to 2.2 (diff) | |
- enable SDL support on request (OPTIONS)
- fill CONFIGURE_ENV to detect more libraries which are installed because
of LIB_DEPENDS anyway e.g. libpng (until that change, devil had no png
support - even if libpng was installed)
- fix a png-support bug for 64bit systems.
- bump PORTREVISION
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=144409
Diffstat (limited to 'graphics/devil')
| -rw-r--r-- | graphics/devil/Makefile | 20 | ||||
| -rw-r--r-- | graphics/devil/files/patch-src-IL-src-il_png.c | 18 |
2 files changed, 37 insertions, 1 deletions
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index f13816bebb5d..87765a209aee 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -7,6 +7,7 @@ PORTNAME= devil PORTVERSION= 1.6.7 +PATCHREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openil @@ -21,7 +22,24 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ lcms.1:${PORTSDIR}/graphics/lcms +OPTIONS= SDL "Enable SDL support" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_SDL) +USE_SDL= yes +USE_REINPLACE= yes +CFLAGS+= "-I${LOCALBASE}/include/SDL11" +.endif + INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 +CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \ + -L${X11BASE}/lib" + +.if defined(WITH_SDL) +post-patch: + @${REINPLACE_CMD} 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/devil/files/patch-src-IL-src-il_png.c b/graphics/devil/files/patch-src-IL-src-il_png.c new file mode 100644 index 000000000000..c819f3fcde1a --- /dev/null +++ b/graphics/devil/files/patch-src-IL-src-il_png.c @@ -0,0 +1,18 @@ +--- src-IL/src/il_png.c.orig Thu Jun 24 11:38:54 2004 ++++ src-IL/src/il_png.c Wed Oct 5 22:44:17 2005 +@@ -282,11 +282,11 @@ + + ILboolean readpng_get_image(ILdouble display_exponent) + { +- ILuint i; + png_bytepp row_pointers = NULL; +- ILuint width, height, channels; +- ILdouble screen_gamma = 1.0, image_gamma; +- ILuint bit_depth; ++ png_uint_32 width, height; ++ ILuint i, channels, bit_depth; ++ ILdouble screen_gamma = 1.0, image_gamma; ++ + + + /* setjmp() must be called in every function that calls a PNG-reading |