Attachment #92723 for bug #130435

View | Details | Raw Unified | Return to bug 130435
Collapse All | Expand All




#

PORTNAME=	devil
PORTVERSION=	1.7.5
PORTREVISION=	6
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	SF/openil
MASTER_SITE_SUBDIR=	openil
DISTNAME=	DevIL-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A full featured cross-platform image library

OPTIONS=	JPEG	"Enable JPEG support"		on \
		JASPER	"Enable JPEG2000 support"	on \
		LCMS	"Enable LCMS support"		on \
		MNG	"Enable MNG support"		on \
		PNG	"Enable PNG support"		on \
		TIFF	"Enable TIFF support"		on \
		X11	"Enable X11 support"		on \
		SDL	"Enable SDL support"		off

WRKSRC=		${WRKDIR}/${DISTNAME:L}

USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS=	--add-missing --copy --force-missing
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--enable-ILU \
		--disable-allegro --disable-directx8 --disable-directx9 \
		--disable-altivec --disable-sse --disable-sse2 --disable-sse3
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-allegro
CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"

CFLAGS+=	-DIL_NO_VTF
CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.include <bsd.port.pre.mk>

.if defined(WITHOUT_JPEG)
CONFIGURE_ARGS+=--disable-jpeg
.else
LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
CONFIGURE_ARGS+=--enable-jpeg
.endif

.if defined(WITHOUT_JASPER)
CONFIGURE_ARGS+=--disable-jp2
.else
LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
CONFIGURE_ARGS+=--enable-jp2
.endif

.if defined(WITHOUT_LCMS)
CONFIGURE_ARGS+=--disable-lcms
.else
LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
CONFIGURE_ARGS+=--enable-lcms
.endif

.if defined(WITHOUT_MNG)
CONFIGURE_ARGS+=--disable-mng
.else
LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
CONFIGURE_ARGS+=--enable-mng
.endif

.if defined(WITHOUT_PNG)
CONFIGURE_ENV+=	libpng_app=no
CONFIGURE_ARGS+=--disable-png
.else
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
.endif

.if defined(WITHOUT_TIFF)
CONFIGURE_ARGS+=--disable-tiff
.else
LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+=--enable-tiff
.endif

.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--disable-opengl --disable-x11 --disable-xpm --disable-shm
PLIST_SUB+=	X11="@comment "
.else
USE_GL=		glut
CONFIGURE_ARGS+=--enable-ILUT
PLIST_SUB+=	X11=""
.endif

.if defined(WITH_SDL)
USE_SDL=	sdl
.else
CONFIGURE_ARGS+=--disable-sdl
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/configure.ac
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in AUTHORS CREDITS ChangeLog Libraries.txt README TODO
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)graphics/devil/distinfo (-3 / +3 lines)
1	MD5 (DevIL-1.6.7.tar.gz) = 0d0c3842196d85c4e24bedabcd84f626	1	MD5 (DevIL-1.7.5.tar.gz) = 2a74578507a21d75d7fcc5afd41444d0
2	SHA256 (DevIL-1.6.7.tar.gz) = 61cc4d203d9c4272d10b7ba19b45ef53882bb545936389092361302d94b5f907	2	SHA256 (DevIL-1.7.5.tar.gz) = c27bce29bf1113fd5914b669c2eb72aa083ac4e925b5b62246e508f1f8ba942d
3	SIZE (DevIL-1.6.7.tar.gz) = 3013312	3	SIZE (DevIL-1.7.5.tar.gz) = 1199330




--- include/IL/il.h.orig	Mon Jul 12 18:55:08 2004
+++ include/IL/il.h	Mon Sep 17 19:36:05 2007
@@ -125,7 +125,6 @@
 typedef float			ILclampf;
 typedef double			ILdouble;
 typedef double			ILclampd;
-typedef void			ILvoid;
 
 #ifdef _UNICODE
 	#ifndef _WIN32_WCE
@@ -460,7 +459,7 @@
 
 // Callback functions for file reading
 typedef void* ILHANDLE;
-typedef ILvoid		(ILAPIENTRY *fCloseRProc)(ILHANDLE);
+typedef void		(ILAPIENTRY *fCloseRProc)(ILHANDLE);
 typedef ILboolean	(ILAPIENTRY *fEofProc)   (ILHANDLE);
 typedef ILint		(ILAPIENTRY *fGetcProc)  (ILHANDLE);
 typedef ILHANDLE	(ILAPIENTRY *fOpenRProc) (const ILstring);
@@ -469,7 +468,7 @@
 typedef ILint		(ILAPIENTRY *fTellRProc) (ILHANDLE);
 
 // Callback functions for file writing
-typedef ILvoid		(ILAPIENTRY *fCloseWProc)(ILHANDLE);
+typedef void		(ILAPIENTRY *fCloseWProc)(ILHANDLE);
 typedef ILHANDLE	(ILAPIENTRY *fOpenWProc) (const ILstring);
 typedef ILint		(ILAPIENTRY *fPutcProc)  (ILubyte, ILHANDLE);
 typedef ILint		(ILAPIENTRY *fSeekWProc) (ILHANDLE, ILint, ILint);
@@ -477,8 +476,8 @@
 typedef ILint		(ILAPIENTRY *fWriteProc) (const void*, ILuint, ILuint, ILHANDLE);
 
 // Callback functions for allocation and deallocation
-typedef ILvoid*		(ILAPIENTRY *mAlloc)(ILuint);
-typedef ILvoid		(ILAPIENTRY *mFree) (ILvoid*);
+typedef void*		(ILAPIENTRY *mAlloc)(ILuint);
+typedef void		(ILAPIENTRY *mFree) (void*);
 
 // Registered format procedures
 typedef ILenum		(ILAPIENTRY *IL_LOADPROC)(const ILstring);
@@ -491,91 +490,91 @@
 ILAPI ILboolean		ILAPIENTRY ilActiveMipmap(ILuint Number);
 ILAPI ILboolean		ILAPIENTRY ilApplyPal(const ILstring FileName);
 ILAPI ILboolean		ILAPIENTRY ilApplyProfile(const ILstring InProfile, const ILstring OutProfile);
-ILAPI ILvoid		ILAPIENTRY ilBindImage(ILuint Image);
+ILAPI void		ILAPIENTRY ilBindImage(ILuint Image);
 ILAPI ILboolean		ILAPIENTRY ilBlit(ILuint Source, ILint DestX, ILint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Width, ILuint Height, ILuint Depth);
-ILAPI ILvoid		ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
-ILAPI ILboolean		ILAPIENTRY ilClearImage(ILvoid);
-ILAPI ILuint		ILAPIENTRY ilCloneCurImage(ILvoid);
+ILAPI void		ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
+ILAPI ILboolean		ILAPIENTRY ilClearImage(void);
+ILAPI ILuint		ILAPIENTRY ilCloneCurImage(void);
 ILAPI ILboolean		ILAPIENTRY ilCompressFunc(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilConvertImage(ILenum DestFormat, ILenum DestType);
 ILAPI ILboolean		ILAPIENTRY ilConvertPal(ILenum DestFormat);
 ILAPI ILboolean		ILAPIENTRY ilCopyImage(ILuint Src);
-ILAPI ILuint		ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
+ILAPI ILuint		ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
 ILAPI ILuint		ILAPIENTRY ilCreateSubImage(ILenum Type, ILuint Num);
-ILAPI ILboolean		ILAPIENTRY ilDefaultImage(ILvoid);
-ILAPI ILvoid		ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
+ILAPI ILboolean		ILAPIENTRY ilDefaultImage(void);
+ILAPI void		ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
 ILAPI ILboolean		ILAPIENTRY ilDisable(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilEnable(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilFormatFunc(ILenum Mode);
-ILAPI ILvoid		ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images);
+ILAPI void		ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images);
 ILAPI ILubyte*		ILAPIENTRY ilGetAlpha(ILenum Type);
-ILAPI ILvoid            ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
-ILAPI ILvoid            ILAPIENTRY ilSetAlpha( ILdouble AlphaValue );
+ILAPI void            ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
+ILAPI void            ILAPIENTRY ilSetAlpha( ILdouble AlphaValue );
 ILAPI ILboolean		ILAPIENTRY ilGetBoolean(ILenum Mode);
-ILAPI ILvoid		ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
-ILAPI ILubyte*		ILAPIENTRY ilGetData(ILvoid);
-ILAPI ILuint		ILAPIENTRY ilGetDXTCData(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
-ILAPI ILenum		ILAPIENTRY ilGetError(ILvoid);
+ILAPI void		ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
+ILAPI ILubyte*		ILAPIENTRY ilGetData(void);
+ILAPI ILuint		ILAPIENTRY ilGetDXTCData(void *Buffer, ILuint BufferSize, ILenum DXTCFormat);
+ILAPI ILenum		ILAPIENTRY ilGetError(void);
 ILAPI ILint             ILAPIENTRY ilGetInteger(ILenum Mode);
-ILAPI ILvoid		ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param);
-ILAPI ILuint		ILAPIENTRY ilGetLumpPos(ILvoid);
-ILAPI ILubyte*		ILAPIENTRY ilGetPalette(ILvoid);
+ILAPI void		ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param);
+ILAPI ILuint		ILAPIENTRY ilGetLumpPos(void);
+ILAPI ILubyte*		ILAPIENTRY ilGetPalette(void);
 ILAPI const ILstring    ILAPIENTRY ilGetString(ILenum StringName);
-ILAPI ILvoid		ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
-ILAPI ILvoid		ILAPIENTRY ilInit(ILvoid);
+ILAPI void		ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
+ILAPI void		ILAPIENTRY ilInit(void);
 ILAPI ILboolean		ILAPIENTRY ilIsDisabled(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilIsEnabled(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilIsImage(ILuint Image);
 ILAPI ILboolean		ILAPIENTRY ilIsValid(ILenum Type, const ILstring FileName);
 ILAPI ILboolean		ILAPIENTRY ilIsValidF(ILenum Type, ILHANDLE File);
-ILAPI ILboolean		ILAPIENTRY ilIsValidL(ILenum Type, ILvoid *Lump, ILuint Size);
-ILAPI ILvoid		ILAPIENTRY ilKeyColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
+ILAPI ILboolean		ILAPIENTRY ilIsValidL(ILenum Type, void *Lump, ILuint Size);
+ILAPI void		ILAPIENTRY ilKeyColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
 ILAPI ILboolean		ILAPIENTRY ilLoad(ILenum Type, const ILstring FileName);
 ILAPI ILboolean		ILAPIENTRY ilLoadF(ILenum Type, ILHANDLE File);
 ILAPI ILboolean		ILAPIENTRY ilLoadImage(const ILstring FileName);
-ILAPI ILboolean		ILAPIENTRY ilLoadL(ILenum Type, ILvoid *Lump, ILuint Size);
+ILAPI ILboolean		ILAPIENTRY ilLoadL(ILenum Type, void *Lump, ILuint Size);
 ILAPI ILboolean		ILAPIENTRY ilLoadPal(const ILstring FileName);
 ILAPI ILboolean		ILAPIENTRY ilOriginFunc(ILenum Mode);
 ILAPI ILboolean		ILAPIENTRY ilOverlayImage(ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord);
-ILAPI ILvoid		ILAPIENTRY ilPopAttrib(ILvoid);
-ILAPI ILvoid		ILAPIENTRY ilPushAttrib(ILuint Bits);
-ILAPI ILvoid		ILAPIENTRY ilRegisterFormat(ILenum Format);
+ILAPI void		ILAPIENTRY ilPopAttrib(void);
+ILAPI void		ILAPIENTRY ilPushAttrib(ILuint Bits);
+ILAPI void		ILAPIENTRY ilRegisterFormat(ILenum Format);
 ILAPI ILboolean		ILAPIENTRY ilRegisterLoad(const ILstring Ext, IL_LOADPROC Load);
 ILAPI ILboolean		ILAPIENTRY ilRegisterMipNum(ILuint Num);
 ILAPI ILboolean		ILAPIENTRY ilRegisterNumImages(ILuint Num);
-ILAPI ILvoid		ILAPIENTRY ilRegisterOrigin(ILenum Origin);
-ILAPI ILvoid		ILAPIENTRY ilRegisterPal(ILvoid *Pal, ILuint Size, ILenum Type);
+ILAPI void		ILAPIENTRY ilRegisterOrigin(ILenum Origin);
+ILAPI void		ILAPIENTRY ilRegisterPal(void *Pal, ILuint Size, ILenum Type);
 ILAPI ILboolean		ILAPIENTRY ilRegisterSave(const ILstring Ext, IL_SAVEPROC Save);
-ILAPI ILvoid		ILAPIENTRY ilRegisterType(ILenum Type);
+ILAPI void		ILAPIENTRY ilRegisterType(ILenum Type);
 ILAPI ILboolean		ILAPIENTRY ilRemoveLoad(const ILstring Ext);
 ILAPI ILboolean		ILAPIENTRY ilRemoveSave(const ILstring Ext);
-ILAPI ILvoid		ILAPIENTRY ilResetMemory(ILvoid);
-ILAPI ILvoid		ILAPIENTRY ilResetRead(ILvoid);
-ILAPI ILvoid		ILAPIENTRY ilResetWrite(ILvoid);
+ILAPI void		ILAPIENTRY ilResetMemory(void);
+ILAPI void		ILAPIENTRY ilResetRead(void);
+ILAPI void		ILAPIENTRY ilResetWrite(void);
 ILAPI ILboolean		ILAPIENTRY ilSave(ILenum Type, const ILstring FileName);
 ILAPI ILuint		ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File);
 ILAPI ILboolean		ILAPIENTRY ilSaveImage(const ILstring FileName);
-ILAPI ILuint		ILAPIENTRY ilSaveL(ILenum Type, ILvoid *Lump, ILuint Size);
+ILAPI ILuint		ILAPIENTRY ilSaveL(ILenum Type, void *Lump, ILuint Size);
 ILAPI ILboolean		ILAPIENTRY ilSavePal(const ILstring FileName);
-ILAPI ILboolean		ILAPIENTRY ilSetData(ILvoid *Data);
+ILAPI ILboolean		ILAPIENTRY ilSetData(void *Data);
 ILAPI ILboolean		ILAPIENTRY ilSetDuration(ILuint Duration);
-ILAPI ILvoid		ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param);
-ILAPI ILvoid		ILAPIENTRY ilSetMemory(mAlloc, mFree);
-ILAPI ILvoid		ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
-ILAPI ILvoid		ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc);
-ILAPI ILvoid		ILAPIENTRY ilSetString(ILenum Mode, const char *String);
-ILAPI ILvoid		ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc);
-ILAPI ILvoid		ILAPIENTRY ilShutDown(ILvoid);
-ILAPI ILboolean		ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data);
+ILAPI void		ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param);
+ILAPI void		ILAPIENTRY ilSetMemory(mAlloc, mFree);
+ILAPI void		ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
+ILAPI void		ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc);
+ILAPI void		ILAPIENTRY ilSetString(ILenum Mode, const char *String);
+ILAPI void		ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc);
+ILAPI void		ILAPIENTRY ilShutDown(void);
+ILAPI ILboolean		ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data);
 ILAPI ILboolean		ILAPIENTRY ilTypeFunc(ILenum Mode);
 
 ILAPI ILboolean		ILAPIENTRY ilLoadData(const ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 ILAPI ILboolean		ILAPIENTRY ilLoadDataF(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
-ILAPI ILboolean		ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
+ILAPI ILboolean		ILAPIENTRY ilLoadDataL(void *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 ILAPI ILboolean		ILAPIENTRY ilSaveData(const ILstring FileName);
 
-ILAPI ILboolean		ILAPIENTRY ilLoadFromJpegStruct(ILvoid* JpegDecompressorPtr);
-ILAPI ILboolean		ILAPIENTRY ilSaveFromJpegStruct(ILvoid* JpegCompressorPtr);
+ILAPI ILboolean		ILAPIENTRY ilLoadFromJpegStruct(void* JpegDecompressorPtr);
+ILAPI ILboolean		ILAPIENTRY ilSaveFromJpegStruct(void* JpegCompressorPtr);
 
 // For all those weirdos that spell "colour" without the 'u'.
 #define ilClearColor	ilClearColour




--- include/IL/ilu.h.orig	2007-09-17 17:42:11.000000000 +0200
+++ include/IL/ilu.h	2007-09-17 17:43:47.000000000 +0200
@@ -132,40 +132,40 @@
 
 
 // ImageLib Utility Functions
-ILAPI ILboolean			ILAPIENTRY iluAlienify(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluAlienify(void);
 ILAPI ILboolean			ILAPIENTRY iluBlurAvg(ILuint Iter);
 ILAPI ILboolean			ILAPIENTRY iluBlurGaussian(ILuint Iter);
-ILAPI ILboolean			ILAPIENTRY iluBuildMipmaps(ILvoid);
-ILAPI ILuint			ILAPIENTRY iluColoursUsed(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluBuildMipmaps(void);
+ILAPI ILuint			ILAPIENTRY iluColoursUsed(void);
 ILAPI ILboolean			ILAPIENTRY iluCompareImage(ILuint Comp);
 ILAPI ILboolean			ILAPIENTRY iluContrast(ILfloat Contrast);
 ILAPI ILboolean			ILAPIENTRY iluCrop(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth);
-ILAPI ILvoid			ILAPIENTRY iluDeleteImage(ILuint Id);
-ILAPI ILboolean			ILAPIENTRY iluEdgeDetectE(ILvoid);
-ILAPI ILboolean			ILAPIENTRY iluEdgeDetectP(ILvoid);
-ILAPI ILboolean			ILAPIENTRY iluEdgeDetectS(ILvoid);
-ILAPI ILboolean			ILAPIENTRY iluEmboss(ILvoid);
+ILAPI void			ILAPIENTRY iluDeleteImage(ILuint Id);
+ILAPI ILboolean			ILAPIENTRY iluEdgeDetectE(void);
+ILAPI ILboolean			ILAPIENTRY iluEdgeDetectP(void);
+ILAPI ILboolean			ILAPIENTRY iluEdgeDetectS(void);
+ILAPI ILboolean			ILAPIENTRY iluEmboss(void);
 ILAPI ILboolean			ILAPIENTRY iluEnlargeCanvas(ILuint Width, ILuint Height, ILuint Depth);
 ILAPI ILboolean			ILAPIENTRY iluEnlargeImage(ILfloat XDim, ILfloat YDim, ILfloat ZDim);
-ILAPI ILboolean			ILAPIENTRY iluEqualize(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluEqualize(void);
 ILAPI const ILstring	ILAPIENTRY iluErrorString(ILenum Error);
-ILAPI ILboolean			ILAPIENTRY iluFlipImage(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluFlipImage(void);
 ILAPI ILboolean			ILAPIENTRY iluGammaCorrect(ILfloat Gamma);
-ILAPI ILuint			ILAPIENTRY iluGenImage(ILvoid);
-ILAPI ILvoid			ILAPIENTRY iluGetImageInfo(ILinfo *Info);
+ILAPI ILuint			ILAPIENTRY iluGenImage(void);
+ILAPI void			ILAPIENTRY iluGetImageInfo(ILinfo *Info);
 ILAPI ILint				ILAPIENTRY iluGetInteger(ILenum Mode);
-ILAPI ILvoid			ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
+ILAPI void			ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
 ILAPI const ILstring	ILAPIENTRY iluGetString(ILenum StringName);
-ILAPI ILvoid			ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
-ILAPI ILvoid			ILAPIENTRY iluInit(ILvoid);
-ILAPI ILboolean			ILAPIENTRY iluInvertAlpha(ILvoid);
+ILAPI void			ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
+ILAPI void			ILAPIENTRY iluInit(void);
+ILAPI ILboolean			ILAPIENTRY iluInvertAlpha(void);
 ILAPI ILuint			ILAPIENTRY iluLoadImage(const ILstring FileName);
-ILAPI ILboolean			ILAPIENTRY iluMirror(ILvoid);
-ILAPI ILboolean			ILAPIENTRY iluNegative(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluMirror(void);
+ILAPI ILboolean			ILAPIENTRY iluNegative(void);
 ILAPI ILboolean			ILAPIENTRY iluNoisify(ILclampf Tolerance);
 ILAPI ILboolean			ILAPIENTRY iluPixelize(ILuint PixSize);
-ILAPI ILvoid			ILAPIENTRY iluRegionfv(ILpointf *Points, ILuint n);
-ILAPI ILvoid			ILAPIENTRY iluRegioniv(ILpointi *Points, ILuint n);
+ILAPI void			ILAPIENTRY iluRegionfv(ILpointf *Points, ILuint n);
+ILAPI void			ILAPIENTRY iluRegioniv(ILpointi *Points, ILuint n);
 ILAPI ILboolean			ILAPIENTRY iluReplaceColour(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance);
 ILAPI ILboolean			ILAPIENTRY iluRotate(ILfloat Angle);
 ILAPI ILboolean			ILAPIENTRY iluRotate3D(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle);
@@ -174,7 +174,7 @@
 ILAPI ILboolean			ILAPIENTRY iluScale(ILuint Width, ILuint Height, ILuint Depth);
 ILAPI ILboolean			ILAPIENTRY iluScaleColours(ILfloat r, ILfloat g, ILfloat b);
 ILAPI ILboolean			ILAPIENTRY iluSharpen(ILfloat Factor, ILuint Iter);
-ILAPI ILboolean			ILAPIENTRY iluSwapColours(ILvoid);
+ILAPI ILboolean			ILAPIENTRY iluSwapColours(void);
 ILAPI ILboolean			ILAPIENTRY iluWave(ILfloat Angle);
 
 #define iluColorsUsed	iluColoursUsed

Lines 1-11 Link Here

(-)graphics/devil/files/patch-src-IL-src-Makefile.in (-11 lines)
1	--- src-IL/src/Makefile.in.orig Tue Jan 10 16:09:29 2006
2	+++ src-IL/src/Makefile.in Tue Jan 10 16:09:45 2006
3	@@ -312,7 +312,7 @@
4
5	AM_CFLAGS = @LIBIL_CFLAGS@
6	libIL_la_LDFLAGS = -no-undefined @VERSIONINFO@
7	-libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBGIF@ @LIBMNG@ @LIBLCMS@
8	+libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@
9	INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src-IL/include
10	all: all-am
11




--- 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




include/IL/devil_cpp_wrapper.hpp
include/IL/il.h
include/IL/ilu.h
include/IL/ilu_region.h
%%X11%%include/IL/ilut.h
lib/libIL.a
lib/libIL.la
lib/libIL.so

lib/libILU.la
lib/libILU.so
lib/libILU.so.1
%%X11%%lib/libILUT.a
%%X11%%lib/libILUT.la
%%X11%%lib/libILUT.so
%%X11%%lib/libILUT.so.1
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/Libraries.txt
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/IL

Return to bug 130435

Lines 6-47 Link Here

(-)graphics/devil/Makefile (-19 / +85 lines)
6	#	6	#
7		7
8	PORTNAME= devil	8	PORTNAME= devil
9	PORTVERSION= 1.6.7	9	PORTVERSION= 1.7.5
10	PORTREVISION= 6
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= graphics	11	CATEGORIES= graphics
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= SF/openil
14	MASTER_SITE_SUBDIR= openil
15	DISTNAME= DevIL-${PORTVERSION}	13	DISTNAME= DevIL-${PORTVERSION}
16		14
17	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
18	COMMENT= A full featured cross-platform image library	16	COMMENT= A full featured cross-platform image library
19		17
20	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	18	OPTIONS= JPEG "Enable JPEG support" on \
21	jpeg.9:${PORTSDIR}/graphics/jpeg \	19	JASPER "Enable JPEG2000 support" on \
22	tiff.4:${PORTSDIR}/graphics/tiff \	20	LCMS "Enable LCMS support" on \
23	mng.1:${PORTSDIR}/graphics/libmng \	21	MNG "Enable MNG support" on \
24	lcms.1:${PORTSDIR}/graphics/lcms	22	PNG "Enable PNG support" on \
25		23	TIFF "Enable TIFF support" on \
26	USE_AUTOTOOLS= libtool:15	24	X11 "Enable X11 support" on \
27	USE_GL= yes	25	SDL "Enable SDL support" off
		26
		27	WRKSRC= ${WRKDIR}/${DISTNAME:L}
		28
		29	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
		30	ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
		31	AUTOMAKE_ARGS= --add-missing --copy --force-missing
		32	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		33	CONFIGURE_ARGS= --enable-ILU \
		34	--disable-allegro --disable-directx8 --disable-directx9 \
		35	--disable-altivec --disable-sse --disable-sse2 --disable-sse3
28	USE_LDCONFIG= yes	36	USE_LDCONFIG= yes
29	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --disable-allegro
31	CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
32		37
33	OPTIONS= SDL "Enable SDL support" off	38	CFLAGS+= -DIL_NO_VTF
		39	CPPFLAGS= -I${LOCALBASE}/include
		40	LDFLAGS= -L${LOCALBASE}/lib
34		41
35	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
36		43
		44	.if defined(WITHOUT_JPEG)
		45	CONFIGURE_ARGS+=--disable-jpeg
		46	.else
		47	LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
		48	CONFIGURE_ARGS+=--enable-jpeg
		49	.endif
		50
		51	.if defined(WITHOUT_JASPER)
		52	CONFIGURE_ARGS+=--disable-jp2
		53	.else
		54	LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper
		55	CONFIGURE_ARGS+=--enable-jp2
		56	.endif
		57
		58	.if defined(WITHOUT_LCMS)
		59	CONFIGURE_ARGS+=--disable-lcms
		60	.else
		61	LIB_DEPENDS+= lcms.1:${PORTSDIR}/graphics/lcms
		62	CONFIGURE_ARGS+=--enable-lcms
		63	.endif
		64
		65	.if defined(WITHOUT_MNG)
		66	CONFIGURE_ARGS+=--disable-mng
		67	.else
		68	LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng
		69	CONFIGURE_ARGS+=--enable-mng
		70	.endif
		71
		72	.if defined(WITHOUT_PNG)
		73	CONFIGURE_ENV+= libpng_app=no
		74	CONFIGURE_ARGS+=--disable-png
		75	.else
		76	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
		77	.endif
		78
		79	.if defined(WITHOUT_TIFF)
		80	CONFIGURE_ARGS+=--disable-tiff
		81	.else
		82	LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
		83	CONFIGURE_ARGS+=--enable-tiff
		84	.endif
		85
		86	.if defined(WITHOUT_X11)
		87	CONFIGURE_ARGS+=--disable-opengl --disable-x11 --disable-xpm --disable-shm
		88	PLIST_SUB+= X11="@comment "
		89	.else
		90	USE_GL= glut
		91	CONFIGURE_ARGS+=--enable-ILUT
		92	PLIST_SUB+= X11=""
		93	.endif
		94
37	.if defined(WITH_SDL)	95	.if defined(WITH_SDL)
38	USE_SDL= yes	96	USE_SDL= sdl
39	.else	97	.else
40	CONFIGURE_ARGS+=--disable-sdl	98	CONFIGURE_ARGS+=--disable-sdl
41	.endif	99	.endif
42		100
43	post-patch:	101	post-patch:
44	${FIND} ${WRKSRC} \( -name '.c' -o -name '.cpp' -o -name '*.h' \) -print0 \|\	102	@${REINPLACE_CMD} -e 's\|-O3\|\|g' ${WRKSRC}/configure.ac
45	${XARGS} -0 ${REINPLACE_CMD} 's\|ILvoid\|void\|g'	103	@${REINPLACE_CMD} -e '/^SUBDIRS/s\|docs\|\|g' ${WRKSRC}/Makefile.am
		104
		105	post-install:
		106	.if !defined(NOPORTDOCS)
		107	@${MKDIR} ${DOCSDIR}
		108	.for file in AUTHORS CREDITS ChangeLog Libraries.txt README TODO
		109	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		110	.endfor
		111	.endif
46		112
47	.include <bsd.port.post.mk>	113	.include <bsd.port.post.mk>

Lines 1-175 Link Here

(-)graphics/devil/files/patch-include-IL_il.h (-175 lines)
1	--- include/IL/il.h.orig Mon Jul 12 18:55:08 2004
2	+++ include/IL/il.h Mon Sep 17 19:36:05 2007
3	@@ -125,7 +125,6 @@
4	typedef float ILclampf;
5	typedef double ILdouble;
6	typedef double ILclampd;
7	-typedef void ILvoid;
8
9	#ifdef _UNICODE
10	#ifndef _WIN32_WCE
11	@@ -460,7 +459,7 @@
12
13	// Callback functions for file reading
14	typedef void* ILHANDLE;
15	-typedef ILvoid (ILAPIENTRY *fCloseRProc)(ILHANDLE);
16	+typedef void (ILAPIENTRY *fCloseRProc)(ILHANDLE);
17	typedef ILboolean (ILAPIENTRY *fEofProc) (ILHANDLE);
18	typedef ILint (ILAPIENTRY *fGetcProc) (ILHANDLE);
19	typedef ILHANDLE (ILAPIENTRY *fOpenRProc) (const ILstring);
20	@@ -469,7 +468,7 @@
21	typedef ILint (ILAPIENTRY *fTellRProc) (ILHANDLE);
22
23	// Callback functions for file writing
24	-typedef ILvoid (ILAPIENTRY *fCloseWProc)(ILHANDLE);
25	+typedef void (ILAPIENTRY *fCloseWProc)(ILHANDLE);
26	typedef ILHANDLE (ILAPIENTRY *fOpenWProc) (const ILstring);
27	typedef ILint (ILAPIENTRY *fPutcProc) (ILubyte, ILHANDLE);
28	typedef ILint (ILAPIENTRY *fSeekWProc) (ILHANDLE, ILint, ILint);
29	@@ -477,8 +476,8 @@
30	typedef ILint (ILAPIENTRY fWriteProc) (const void, ILuint, ILuint, ILHANDLE);
31
32	// Callback functions for allocation and deallocation
33	-typedef ILvoid* (ILAPIENTRY *mAlloc)(ILuint);
34	-typedef ILvoid (ILAPIENTRY mFree) (ILvoid);
35	+typedef void* (ILAPIENTRY *mAlloc)(ILuint);
36	+typedef void (ILAPIENTRY mFree) (void);
37
38	// Registered format procedures
39	typedef ILenum (ILAPIENTRY *IL_LOADPROC)(const ILstring);
40	@@ -491,91 +490,91 @@
41	ILAPI ILboolean ILAPIENTRY ilActiveMipmap(ILuint Number);
42	ILAPI ILboolean ILAPIENTRY ilApplyPal(const ILstring FileName);
43	ILAPI ILboolean ILAPIENTRY ilApplyProfile(const ILstring InProfile, const ILstring OutProfile);
44	-ILAPI ILvoid ILAPIENTRY ilBindImage(ILuint Image);
45	+ILAPI void ILAPIENTRY ilBindImage(ILuint Image);
46	ILAPI ILboolean ILAPIENTRY ilBlit(ILuint Source, ILint DestX, ILint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Width, ILuint Height, ILuint Depth);
47	-ILAPI ILvoid ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
48	-ILAPI ILboolean ILAPIENTRY ilClearImage(ILvoid);
49	-ILAPI ILuint ILAPIENTRY ilCloneCurImage(ILvoid);
50	+ILAPI void ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
51	+ILAPI ILboolean ILAPIENTRY ilClearImage(void);
52	+ILAPI ILuint ILAPIENTRY ilCloneCurImage(void);
53	ILAPI ILboolean ILAPIENTRY ilCompressFunc(ILenum Mode);
54	ILAPI ILboolean ILAPIENTRY ilConvertImage(ILenum DestFormat, ILenum DestType);
55	ILAPI ILboolean ILAPIENTRY ilConvertPal(ILenum DestFormat);
56	ILAPI ILboolean ILAPIENTRY ilCopyImage(ILuint Src);
57	-ILAPI ILuint ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
58	+ILAPI ILuint ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
59	ILAPI ILuint ILAPIENTRY ilCreateSubImage(ILenum Type, ILuint Num);
60	-ILAPI ILboolean ILAPIENTRY ilDefaultImage(ILvoid);
61	-ILAPI ILvoid ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
62	+ILAPI ILboolean ILAPIENTRY ilDefaultImage(void);
63	+ILAPI void ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
64	ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode);
65	ILAPI ILboolean ILAPIENTRY ilEnable(ILenum Mode);
66	ILAPI ILboolean ILAPIENTRY ilFormatFunc(ILenum Mode);
67	-ILAPI ILvoid ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images);
68	+ILAPI void ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images);
69	ILAPI ILubyte* ILAPIENTRY ilGetAlpha(ILenum Type);
70	-ILAPI ILvoid ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
71	-ILAPI ILvoid ILAPIENTRY ilSetAlpha( ILdouble AlphaValue );
72	+ILAPI void ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
73	+ILAPI void ILAPIENTRY ilSetAlpha( ILdouble AlphaValue );
74	ILAPI ILboolean ILAPIENTRY ilGetBoolean(ILenum Mode);
75	-ILAPI ILvoid ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
76	-ILAPI ILubyte* ILAPIENTRY ilGetData(ILvoid);
77	-ILAPI ILuint ILAPIENTRY ilGetDXTCData(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
78	-ILAPI ILenum ILAPIENTRY ilGetError(ILvoid);
79	+ILAPI void ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
80	+ILAPI ILubyte* ILAPIENTRY ilGetData(void);
81	+ILAPI ILuint ILAPIENTRY ilGetDXTCData(void *Buffer, ILuint BufferSize, ILenum DXTCFormat);
82	+ILAPI ILenum ILAPIENTRY ilGetError(void);
83	ILAPI ILint ILAPIENTRY ilGetInteger(ILenum Mode);
84	-ILAPI ILvoid ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param);
85	-ILAPI ILuint ILAPIENTRY ilGetLumpPos(ILvoid);
86	-ILAPI ILubyte* ILAPIENTRY ilGetPalette(ILvoid);
87	+ILAPI void ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param);
88	+ILAPI ILuint ILAPIENTRY ilGetLumpPos(void);
89	+ILAPI ILubyte* ILAPIENTRY ilGetPalette(void);
90	ILAPI const ILstring ILAPIENTRY ilGetString(ILenum StringName);
91	-ILAPI ILvoid ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
92	-ILAPI ILvoid ILAPIENTRY ilInit(ILvoid);
93	+ILAPI void ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
94	+ILAPI void ILAPIENTRY ilInit(void);
95	ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode);
96	ILAPI ILboolean ILAPIENTRY ilIsEnabled(ILenum Mode);
97	ILAPI ILboolean ILAPIENTRY ilIsImage(ILuint Image);
98	ILAPI ILboolean ILAPIENTRY ilIsValid(ILenum Type, const ILstring FileName);
99	ILAPI ILboolean ILAPIENTRY ilIsValidF(ILenum Type, ILHANDLE File);
100	-ILAPI ILboolean ILAPIENTRY ilIsValidL(ILenum Type, ILvoid *Lump, ILuint Size);
101	-ILAPI ILvoid ILAPIENTRY ilKeyColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
102	+ILAPI ILboolean ILAPIENTRY ilIsValidL(ILenum Type, void *Lump, ILuint Size);
103	+ILAPI void ILAPIENTRY ilKeyColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
104	ILAPI ILboolean ILAPIENTRY ilLoad(ILenum Type, const ILstring FileName);
105	ILAPI ILboolean ILAPIENTRY ilLoadF(ILenum Type, ILHANDLE File);
106	ILAPI ILboolean ILAPIENTRY ilLoadImage(const ILstring FileName);
107	-ILAPI ILboolean ILAPIENTRY ilLoadL(ILenum Type, ILvoid *Lump, ILuint Size);
108	+ILAPI ILboolean ILAPIENTRY ilLoadL(ILenum Type, void *Lump, ILuint Size);
109	ILAPI ILboolean ILAPIENTRY ilLoadPal(const ILstring FileName);
110	ILAPI ILboolean ILAPIENTRY ilOriginFunc(ILenum Mode);
111	ILAPI ILboolean ILAPIENTRY ilOverlayImage(ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord);
112	-ILAPI ILvoid ILAPIENTRY ilPopAttrib(ILvoid);
113	-ILAPI ILvoid ILAPIENTRY ilPushAttrib(ILuint Bits);
114	-ILAPI ILvoid ILAPIENTRY ilRegisterFormat(ILenum Format);
115	+ILAPI void ILAPIENTRY ilPopAttrib(void);
116	+ILAPI void ILAPIENTRY ilPushAttrib(ILuint Bits);
117	+ILAPI void ILAPIENTRY ilRegisterFormat(ILenum Format);
118	ILAPI ILboolean ILAPIENTRY ilRegisterLoad(const ILstring Ext, IL_LOADPROC Load);
119	ILAPI ILboolean ILAPIENTRY ilRegisterMipNum(ILuint Num);
120	ILAPI ILboolean ILAPIENTRY ilRegisterNumImages(ILuint Num);
121	-ILAPI ILvoid ILAPIENTRY ilRegisterOrigin(ILenum Origin);
122	-ILAPI ILvoid ILAPIENTRY ilRegisterPal(ILvoid *Pal, ILuint Size, ILenum Type);
123	+ILAPI void ILAPIENTRY ilRegisterOrigin(ILenum Origin);
124	+ILAPI void ILAPIENTRY ilRegisterPal(void *Pal, ILuint Size, ILenum Type);
125	ILAPI ILboolean ILAPIENTRY ilRegisterSave(const ILstring Ext, IL_SAVEPROC Save);
126	-ILAPI ILvoid ILAPIENTRY ilRegisterType(ILenum Type);
127	+ILAPI void ILAPIENTRY ilRegisterType(ILenum Type);
128	ILAPI ILboolean ILAPIENTRY ilRemoveLoad(const ILstring Ext);
129	ILAPI ILboolean ILAPIENTRY ilRemoveSave(const ILstring Ext);
130	-ILAPI ILvoid ILAPIENTRY ilResetMemory(ILvoid);
131	-ILAPI ILvoid ILAPIENTRY ilResetRead(ILvoid);
132	-ILAPI ILvoid ILAPIENTRY ilResetWrite(ILvoid);
133	+ILAPI void ILAPIENTRY ilResetMemory(void);
134	+ILAPI void ILAPIENTRY ilResetRead(void);
135	+ILAPI void ILAPIENTRY ilResetWrite(void);
136	ILAPI ILboolean ILAPIENTRY ilSave(ILenum Type, const ILstring FileName);
137	ILAPI ILuint ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File);
138	ILAPI ILboolean ILAPIENTRY ilSaveImage(const ILstring FileName);
139	-ILAPI ILuint ILAPIENTRY ilSaveL(ILenum Type, ILvoid *Lump, ILuint Size);
140	+ILAPI ILuint ILAPIENTRY ilSaveL(ILenum Type, void *Lump, ILuint Size);
141	ILAPI ILboolean ILAPIENTRY ilSavePal(const ILstring FileName);
142	-ILAPI ILboolean ILAPIENTRY ilSetData(ILvoid *Data);
143	+ILAPI ILboolean ILAPIENTRY ilSetData(void *Data);
144	ILAPI ILboolean ILAPIENTRY ilSetDuration(ILuint Duration);
145	-ILAPI ILvoid ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param);
146	-ILAPI ILvoid ILAPIENTRY ilSetMemory(mAlloc, mFree);
147	-ILAPI ILvoid ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
148	-ILAPI ILvoid ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc);
149	-ILAPI ILvoid ILAPIENTRY ilSetString(ILenum Mode, const char *String);
150	-ILAPI ILvoid ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc);
151	-ILAPI ILvoid ILAPIENTRY ilShutDown(ILvoid);
152	-ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data);
153	+ILAPI void ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param);
154	+ILAPI void ILAPIENTRY ilSetMemory(mAlloc, mFree);
155	+ILAPI void ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
156	+ILAPI void ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc);
157	+ILAPI void ILAPIENTRY ilSetString(ILenum Mode, const char *String);
158	+ILAPI void ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc);
159	+ILAPI void ILAPIENTRY ilShutDown(void);
160	+ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data);
161	ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode);
162
163	ILAPI ILboolean ILAPIENTRY ilLoadData(const ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
164	ILAPI ILboolean ILAPIENTRY ilLoadDataF(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
165	-ILAPI ILboolean ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
166	+ILAPI ILboolean ILAPIENTRY ilLoadDataL(void *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
167	ILAPI ILboolean ILAPIENTRY ilSaveData(const ILstring FileName);
168
169	-ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* JpegDecompressorPtr);
170	-ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* JpegCompressorPtr);
171	+ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(void* JpegDecompressorPtr);
172	+ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(void* JpegCompressorPtr);
173
174	// For all those weirdos that spell "colour" without the 'u'.
175	#define ilClearColor ilClearColour

Lines 1-72 Link Here

(-)graphics/devil/files/patch-include-IL_ilu.h (-72 lines)
1	--- include/IL/ilu.h.orig 2007-09-17 17:42:11.000000000 +0200
2	+++ include/IL/ilu.h 2007-09-17 17:43:47.000000000 +0200
3	@@ -132,40 +132,40 @@
4
5
6	// ImageLib Utility Functions
7	-ILAPI ILboolean ILAPIENTRY iluAlienify(ILvoid);
8	+ILAPI ILboolean ILAPIENTRY iluAlienify(void);
9	ILAPI ILboolean ILAPIENTRY iluBlurAvg(ILuint Iter);
10	ILAPI ILboolean ILAPIENTRY iluBlurGaussian(ILuint Iter);
11	-ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(ILvoid);
12	-ILAPI ILuint ILAPIENTRY iluColoursUsed(ILvoid);
13	+ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(void);
14	+ILAPI ILuint ILAPIENTRY iluColoursUsed(void);
15	ILAPI ILboolean ILAPIENTRY iluCompareImage(ILuint Comp);
16	ILAPI ILboolean ILAPIENTRY iluContrast(ILfloat Contrast);
17	ILAPI ILboolean ILAPIENTRY iluCrop(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth);
18	-ILAPI ILvoid ILAPIENTRY iluDeleteImage(ILuint Id);
19	-ILAPI ILboolean ILAPIENTRY iluEdgeDetectE(ILvoid);
20	-ILAPI ILboolean ILAPIENTRY iluEdgeDetectP(ILvoid);
21	-ILAPI ILboolean ILAPIENTRY iluEdgeDetectS(ILvoid);
22	-ILAPI ILboolean ILAPIENTRY iluEmboss(ILvoid);
23	+ILAPI void ILAPIENTRY iluDeleteImage(ILuint Id);
24	+ILAPI ILboolean ILAPIENTRY iluEdgeDetectE(void);
25	+ILAPI ILboolean ILAPIENTRY iluEdgeDetectP(void);
26	+ILAPI ILboolean ILAPIENTRY iluEdgeDetectS(void);
27	+ILAPI ILboolean ILAPIENTRY iluEmboss(void);
28	ILAPI ILboolean ILAPIENTRY iluEnlargeCanvas(ILuint Width, ILuint Height, ILuint Depth);
29	ILAPI ILboolean ILAPIENTRY iluEnlargeImage(ILfloat XDim, ILfloat YDim, ILfloat ZDim);
30	-ILAPI ILboolean ILAPIENTRY iluEqualize(ILvoid);
31	+ILAPI ILboolean ILAPIENTRY iluEqualize(void);
32	ILAPI const ILstring ILAPIENTRY iluErrorString(ILenum Error);
33	-ILAPI ILboolean ILAPIENTRY iluFlipImage(ILvoid);
34	+ILAPI ILboolean ILAPIENTRY iluFlipImage(void);
35	ILAPI ILboolean ILAPIENTRY iluGammaCorrect(ILfloat Gamma);
36	-ILAPI ILuint ILAPIENTRY iluGenImage(ILvoid);
37	-ILAPI ILvoid ILAPIENTRY iluGetImageInfo(ILinfo *Info);
38	+ILAPI ILuint ILAPIENTRY iluGenImage(void);
39	+ILAPI void ILAPIENTRY iluGetImageInfo(ILinfo *Info);
40	ILAPI ILint ILAPIENTRY iluGetInteger(ILenum Mode);
41	-ILAPI ILvoid ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
42	+ILAPI void ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
43	ILAPI const ILstring ILAPIENTRY iluGetString(ILenum StringName);
44	-ILAPI ILvoid ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
45	-ILAPI ILvoid ILAPIENTRY iluInit(ILvoid);
46	-ILAPI ILboolean ILAPIENTRY iluInvertAlpha(ILvoid);
47	+ILAPI void ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
48	+ILAPI void ILAPIENTRY iluInit(void);
49	+ILAPI ILboolean ILAPIENTRY iluInvertAlpha(void);
50	ILAPI ILuint ILAPIENTRY iluLoadImage(const ILstring FileName);
51	-ILAPI ILboolean ILAPIENTRY iluMirror(ILvoid);
52	-ILAPI ILboolean ILAPIENTRY iluNegative(ILvoid);
53	+ILAPI ILboolean ILAPIENTRY iluMirror(void);
54	+ILAPI ILboolean ILAPIENTRY iluNegative(void);
55	ILAPI ILboolean ILAPIENTRY iluNoisify(ILclampf Tolerance);
56	ILAPI ILboolean ILAPIENTRY iluPixelize(ILuint PixSize);
57	-ILAPI ILvoid ILAPIENTRY iluRegionfv(ILpointf *Points, ILuint n);
58	-ILAPI ILvoid ILAPIENTRY iluRegioniv(ILpointi *Points, ILuint n);
59	+ILAPI void ILAPIENTRY iluRegionfv(ILpointf *Points, ILuint n);
60	+ILAPI void ILAPIENTRY iluRegioniv(ILpointi *Points, ILuint n);
61	ILAPI ILboolean ILAPIENTRY iluReplaceColour(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance);
62	ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle);
63	ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle);
64	@@ -174,7 +174,7 @@
65	ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, ILuint Height, ILuint Depth);
66	ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r, ILfloat g, ILfloat b);
67	ILAPI ILboolean ILAPIENTRY iluSharpen(ILfloat Factor, ILuint Iter);
68	-ILAPI ILboolean ILAPIENTRY iluSwapColours(ILvoid);
69	+ILAPI ILboolean ILAPIENTRY iluSwapColours(void);
70	ILAPI ILboolean ILAPIENTRY iluWave(ILfloat Angle);
71
72	#define iluColorsUsed iluColoursUsed

Lines 1-18 Link Here

(-)graphics/devil/files/patch-src-IL-src-il_png.c (-18 lines)
1	--- src-IL/src/il_png.c.orig Thu Jun 24 11:38:54 2004
2	+++ src-IL/src/il_png.c Wed Oct 5 22:44:17 2005
3	@@ -282,11 +282,11 @@
4
5	ILboolean readpng_get_image(ILdouble display_exponent)
6	{
7	- ILuint i;
8	png_bytepp row_pointers = NULL;
9	- ILuint width, height, channels;
10	- ILdouble screen_gamma = 1.0, image_gamma;
11	- ILuint bit_depth;
12	+ png_uint_32 width, height;
13	+ ILuint i, channels, bit_depth;
14	+ ILdouble screen_gamma = 1.0, image_gamma;
15	+
16
17
18	/* setjmp() must be called in every function that calls a PNG-reading

Lines 1-3 Link Here

(-)graphics/devil/pkg-plist (-11 / +16 lines)
		1	include/IL/devil_cpp_wrapper.hpp
		2	include/IL/il.h
		3	include/IL/ilu.h
		4	include/IL/ilu_region.h
		5	%%X11%%include/IL/ilut.h
1	lib/libIL.a	6	lib/libIL.a
2	lib/libIL.la	7	lib/libIL.la
3	lib/libIL.so	8	lib/libIL.so
Lines 6-20 Link Here
6	lib/libILU.la	11	lib/libILU.la
7	lib/libILU.so	12	lib/libILU.so
8	lib/libILU.so.1	13	lib/libILU.so.1
9	lib/libILUT.a	14	%%X11%%lib/libILUT.a
10	lib/libILUT.la	15	%%X11%%lib/libILUT.la
11	lib/libILUT.so	16	%%X11%%lib/libILUT.so
12	lib/libILUT.so.1	17	%%X11%%lib/libILUT.so.1
13	include/IL/il.h	18	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
14	include/IL/ilu.h	19	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
15	include/IL/ilut.h	20	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
16	include/IL/il_wrap.h	21	%%PORTDOCS%%%%DOCSDIR%%/Libraries.txt
17	include/IL/config.h	22	%%PORTDOCS%%%%DOCSDIR%%/README
18	include/IL/devil_internal_exports.h	23	%%PORTDOCS%%%%DOCSDIR%%/TODO
19	include/IL/ilu_region.h	24	%%PORTDOCS%%@dirrm %%DOCSDIR%%
20	@dirrm include/IL	25	@dirrm include/IL