rpms/DevIL/devel DevIL-1.6.8-rc2-gcc43headerfix.patch, NONE, 1.1 DevIL.spec, 1.7, 1.8
Ian Chapman (oddsocks)
fedora-extras-commits at redhat.com
Sun Jan 13 19:21:22 UTC 2008
Author: oddsocks
Update of /cvs/extras/rpms/DevIL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14993
Modified Files:
DevIL.spec
Added Files:
DevIL-1.6.8-rc2-gcc43headerfix.patch
Log Message:
DevIL-1.6.8-rc2-gcc43headerfix.patch:
--- NEW FILE DevIL-1.6.8-rc2-gcc43headerfix.patch ---
--- DevIL-1.6.8/include/IL/ilu.h.orig 2006-08-16 10:18:21.000000000 +0100
+++ DevIL-1.6.8/include/IL/ilu.h 2008-01-13 15:17:37.000000000 +0000
@@ -122,37 +122,37 @@
// 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 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 ILstring ILAPIENTRY iluErrorString(ILenum Error);
ILAPI ILboolean ILAPIENTRY iluConvolution(ILint *matrix, ILint scale, ILint bias);
-ILAPI ILboolean ILAPIENTRY iluFlipImage(ILvoid);
+ILAPI ILboolean ILAPIENTRY iluFlipImage(void);
ILAPI ILboolean ILAPIENTRY iluGammaCorrect(ILfloat Gamma);
-ILAPI ILuint ILAPIENTRY iluGenImage(ILvoid);
+ILAPI ILuint ILAPIENTRY iluGenImage(void);
ILAPI ILvoid ILAPIENTRY iluGetImageInfo(ILinfo *Info);
ILAPI ILint ILAPIENTRY iluGetInteger(ILenum Mode);
ILAPI ILvoid ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
ILAPI ILstring ILAPIENTRY iluGetString(ILenum StringName);
ILAPI ILvoid ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
-ILAPI ILvoid ILAPIENTRY iluInit(ILvoid);
-ILAPI ILboolean ILAPIENTRY iluInvertAlpha(ILvoid);
+ILAPI ILvoid 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);
@@ -166,7 +166,7 @@
ILAPI ILboolean ILAPIENTRY iluScaleAlpha(ILfloat scale);
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
--- DevIL-1.6.8/include/IL/il.h.orig 2006-08-10 14:20:10.000000000 +0100
+++ DevIL-1.6.8/include/IL/il.h 2008-01-13 15:17:37.000000000 +0000
@@ -445,15 +445,15 @@
ILAPI ILvoid 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 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 ILboolean ILAPIENTRY ilDefaultImage(void);
ILAPI ILvoid ILAPIENTRY ilDeleteImage(const ILuint Num);
ILAPI ILvoid ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode);
@@ -464,16 +464,16 @@
ILAPI ILubyte* ILAPIENTRY ilGetAlpha(ILenum Type);
ILAPI ILboolean ILAPIENTRY ilGetBoolean(ILenum Mode);
ILAPI ILvoid ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
-ILAPI ILubyte* ILAPIENTRY ilGetData(ILvoid);
+ILAPI ILubyte* ILAPIENTRY ilGetData(void);
ILAPI ILuint ILAPIENTRY ilGetDXTCData(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
-ILAPI ILenum ILAPIENTRY ilGetError(ILvoid);
+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 ILuint ILAPIENTRY ilGetLumpPos(void);
+ILAPI ILubyte* ILAPIENTRY ilGetPalette(void);
ILAPI ILstring ILAPIENTRY ilGetString(ILenum StringName);
ILAPI ILvoid ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
-ILAPI ILvoid ILAPIENTRY ilInit(ILvoid);
+ILAPI ILvoid ILAPIENTRY ilInit(void);
ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode);
ILAPI ILboolean ILAPIENTRY ilIsEnabled(ILenum Mode);
ILAPI ILboolean ILAPIENTRY ilIsImage(ILuint Image);
@@ -489,7 +489,7 @@
ILAPI ILvoid ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
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 ilPopAttrib(void);
ILAPI ILvoid ILAPIENTRY ilPushAttrib(ILuint Bits);
ILAPI ILvoid ILAPIENTRY ilRegisterFormat(ILenum Format);
ILAPI ILboolean ILAPIENTRY ilRegisterLoad(const ILstring Ext, IL_LOADPROC Load);
@@ -501,9 +501,9 @@
ILAPI ILvoid 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 ILvoid ILAPIENTRY ilResetMemory(void);
+ILAPI ILvoid ILAPIENTRY ilResetRead(void);
+ILAPI ILvoid ILAPIENTRY ilResetWrite(void);
ILAPI ILboolean ILAPIENTRY ilSave(ILenum Type, ILstring FileName);
ILAPI ILuint ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File);
ILAPI ILboolean ILAPIENTRY ilSaveImage(const ILstring FileName);
@@ -518,7 +518,7 @@
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 ILvoid ILAPIENTRY ilShutDown(void);
ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte numChannels, ILenum Format, ILenum Type, ILvoid *Data);
ILAPI ILenum ILAPIENTRY ilTypeFromExt(const ILstring FileName);
ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode);
Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DevIL.spec 22 Aug 2007 23:06:40 -0000 1.7
+++ DevIL.spec 13 Jan 2008 19:20:38 -0000 1.8
@@ -1,17 +1,18 @@
Name: DevIL
Version: 1.6.8
-Release: 0.13.rc2%{?dist}
+Release: 0.14.rc2%{?dist}
Summary: A cross-platform image library
Group: System Environment/Libraries
License: LGPLv2
URL: http://openil.sourceforge.net/
-Source0: http://dl.sf.net/openil/%{name}-%{version}-rc2.tar.bz2
-Patch0: DevIL-1.6.8-rc2-allegropicfix.patch
-Patch1: DevIL-1.6.8-rc2-ilut_h.patch
-Patch2: DevIL-1.6.8-rc2-il_wrap_h.patch
-Patch3: DevIL-1.6.8-rc2-ilu_region.patch
-Patch4: DevIL-1.6.8-rc2-il_endian_h.patch
-Patch5: DevIL-1.6.8-rc2-il_io_c.patch
+Source0: http://downloads.sourceforge.net/openil/%{name}-%{version}-rc2.tar.bz2
+Patch0: %{name}-1.6.8-rc2-allegropicfix.patch
+Patch1: %{name}-1.6.8-rc2-ilut_h.patch
+Patch2: %{name}-1.6.8-rc2-il_wrap_h.patch
+Patch3: %{name}-1.6.8-rc2-ilu_region.patch
+Patch4: %{name}-1.6.8-rc2-il_endian_h.patch
+Patch5: %{name}-1.6.8-rc2-il_io_c.patch
+Patch6: %{name}-1.6.8-rc2-gcc43headerfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel
BuildRequires: lcms-devel
@@ -71,6 +72,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# Convert to UTF8
iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv \
@@ -145,38 +147,41 @@
%changelog
-* Wed Aug 22 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.13.rc2
+* Sun Jan 13 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.14.rc2
+- Patch to fix headers for gcc 4.3, see BZ #428527. (Thanks to Hans de Goede)
+
+* Wed Aug 22 2007 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.13.rc2
- Release bump for F8 mass rebuild
- Added patch to fix BZ #253639
-* Tue Aug 07 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.12.rc2
+* Tue Aug 07 2007 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.12.rc2
- Split libILUT into separate package. See BZ #250734
- Removed some old provides:
- Convert the CREDITS to UTF8
- Updated license field due to new guidelines
-* Tue Jan 02 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.11.rc2
+* Tue Jan 02 2007 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.11.rc2
- Added patch to fix endian issues with some SGI files. Courtesy of Scott A.
Friedman (BZ #220417)
-* Thu Sep 07 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.10.rc2
+* Thu Sep 07 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.10.rc2
- Upgrade to 1.6.8-rc2
- Added libICE-devel buildrequire
- Dropped DevIL-1.6.8-rc1-64bit.patch, fixed upstream
- Updated allegropicfix.patch for new version
- Updated and split header fixes into separate files for easier maintenance
-* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.9.rc1
+* Mon Aug 28 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.9.rc1
- Release bump for FC6 mass rebuild
-* Fri Jun 09 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.8.rc1
+* Fri Jun 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.8.rc1
- Added patch courtesy of Hans de Goede to fix crashes on 64bit systems
-* Wed May 31 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.7.rc1
+* Wed May 31 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.7.rc1
- Added libGLU-devel to buildrequires
- Dropped libGL-devel from requires for devel package
-* Sun May 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.6.rc1.iss
+* Sun May 28 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.6.rc1.iss
- Dropped xorg-x11-devel as a buildrequire
- Dropped zlib-devel as a buildrequire
- Dropped xorg-x11-devel as a require for the devel package
@@ -190,23 +195,23 @@
- Fix ilu_region.h to use IL\il.h and not ilu_internal.h and roll into
a single patch incorporating previous header fixes.
-* Sat May 27 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.5.rc1.iss
+* Sat May 27 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.5.rc1.iss
- Added patch to stop linking against alleg_unsharable, otherwise non PIC code
is included in the library
- Use %%{?dist} for most recent changelog entry - avoids incoherent changelog
versions if %%{?dist} macro is missing or different.
-* Fri May 26 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.4.rc1.iss
+* Fri May 26 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.4.rc1.iss
- Made zlib-devel and xorg-x11-devel explicit buildrequires
- Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X}
- Added -q to %%setup
- Added %%{version}-%%{release} to provides field
-* Sun May 21 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.3.iss
+* Sun May 21 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.RC1.3.iss
- Use Fedora's libtool, seems to fix rpaths problem on x86_64.
-* Sun May 14 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.2.iss
+* Sun May 14 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.RC1.2.iss
- Now compiled against allegro
-* Sat May 13 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.1.iss
+* Sat May 13 2006 Ian Chapman <packages[AT]amiga-hardware.com> 1.6.8-0.RC1.1.iss
- Initial Release
More information about the fedora-extras-commits
mailing list