--- /dev/null
+--- DevIL/DevIL/include/IL/ilut.h.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/include/IL/ilut.h 2017-05-13 20:58:19.558675483 +0200
+@@ -98,6 +98,12 @@
+ #endif
+
+ #include <IL/ilut_config.h>
++#else
++# define ILUT_USE_OPENGL 1
++# define ILUT_USE_ALLEGRO 1
++# define ILUT_USE_SDL 1
++# define ILUT_USE_X11 1
++# define ILUT_USE_XSHM 1
+ #endif
+
+
+@@ -145,7 +151,7 @@
+
+ // ImageLib Utility Toolkit's Allegro Functions
+ #ifdef ILUT_USE_ALLEGRO
+-// #include <allegro.h>
++ #include <allegro.h>
+ #endif//ILUT_USE_ALLEGRO
+
+ #ifdef ILUT_USE_SDL
+@@ -230,14 +236,6 @@
+
+ // ImageLib Utility Toolkit's Allegro Functions
+ #ifdef ILUT_USE_ALLEGRO
+- #ifdef __cplusplus
+- extern "C" {
+- #endif
+- #include <allegro.h>
+- #ifdef __cplusplus
+- }
+- #endif
+-
+ ILAPI BITMAP* ILAPIENTRY ilutAllegLoadImage(ILstring FileName);
+ ILAPI BITMAP* ILAPIENTRY ilutConvertToAlleg(PALETTE Pal);
+ #endif//ILUT_USE_ALLEGRO
+--- DevIL/DevIL/src-ILUT/CMakeLists.txt.orig 2017-05-13 21:05:04.292004199 +0200
++++ DevIL/DevIL/src-ILUT/CMakeLists.txt 2017-05-13 21:28:11.045321699 +0200
+@@ -36,6 +36,9 @@
+ else(BUILD_SHARED_LIBS)
+ add_definitions(-DIL_STATIC_LIB)
+ endif(BUILD_SHARED_LIBS)
++else(WIN32)
++ find_package(SDL)
++ include_directories(${SDL_INCLUDE_DIR})
+ endif(WIN32)
+
+ source_group("Source Files" FILES src/*.cpp)
+@@ -50,6 +53,10 @@
+ target_link_libraries(ILUT
+ IL
+ ILU
++ alleg
++ ${SDL_LIBRARY}
++ GLU GL
++ Xext
+ )
+
+ # generate pkg-config file
+--- DevIL/DevIL/src-ILUT/src/ilut_sdlsurface.cpp.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/src-ILUT/src/ilut_sdlsurface.cpp 2017-05-13 21:43:37.848644450 +0200
+@@ -117,7 +117,7 @@
+ memcpy(Bitmap->pixels, Data, Image->SizeOfData);
+ }
+ else { // Must pad the lines on some images.
+- Dest = Bitmap->pixels;
++ Dest = static_cast<ILubyte*>(Bitmap->pixels);
+ for (i = 0; i < Image->Height; i++) {
+ memcpy(Dest, Data + i * Image->Bps, Image->Bps);
+ imemclear(Dest + Image->Bps, Pad);
+--- DevIL/DevIL/src-ILUT/src/ilut_x11.cpp.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/src-ILUT/src/ilut_x11.cpp 2017-05-13 21:48:53.621974179 +0200
+@@ -188,7 +188,7 @@
+ return NULL;
+ }
+
+- buffer = malloc( width * height * 4 );
++ buffer = static_cast<char*>(malloc( width * height * 4 ));
+ if (!buffer) {
+ return NULL;
+ }
+@@ -299,7 +299,7 @@
+ size = img->bytes_per_line * img->height;
+
+ info->shmid = shmget( IPC_PRIVATE, size, IPC_CREAT | 0666 );
+- info->shmaddr = img->data = shmat( info->shmid, 0, 0 );
++ info->shmaddr = img->data = static_cast<char*>(shmat( info->shmid, 0, 0 ));
+ info->readOnly = False;
+
+ // Attach to server
+++ /dev/null
---- DevIL-1.7.8/devil-1.7.8/lib/Makefile.am.orig 2009-03-08 21:45:36.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/lib/Makefile.am 2010-10-16 11:39:10.511734339 +0200
-@@ -46,7 +46,8 @@
- libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_vtf.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.c $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.c $(il_src)/il_squish.cpp $(il_src)/il_iff.c $(il_src)/il_ilbm.c $(il_src)/il_size.c $(il_src)/il_tpl.c $(il_src)/il_fits.c $(il_src)/il_iwi.c $(il_src)/il_blp.c $(il_src)/il_ftx.c $(il_src)/il_dicom.c $(il_src)/il_rot.c $(il_src)/il_texture.c $(il_src)/il_dpx.c $(il_src)/il_utx.cpp $(il_src)/il_mp3.c
-
- libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_dpx.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_utx.h $(il_include)/il_vtf.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
--libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
-+libIL_la_LDFLAGS = $(AM_LDFLAGS)
-+libIL_la_LIBADD = @IL_LIBS@
-
- libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
- libILU_la_CFLAGS = $(AM_CFLAGS) @ILU_CFLAGS@
-@@ -54,15 +55,15 @@
-
- libILU_la_SOURCES += $(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h $(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h $(all_include)/IL/devil_internal_exports.h $(all_include)/IL/ilu_region.h $(ilu_include)/ilu_error/ilu_err-arabic.h $(ilu_include)/ilu_error/ilu_err-dutch.h $(ilu_include)/ilu_error/ilu_err-english.h $(ilu_include)/ilu_error/ilu_err-french.h $(ilu_include)/ilu_error/ilu_err-german.h $(ilu_include)/ilu_error/ilu_err-japanese.h $(ilu_include)/ilu_error/ilu_err-spanish.h
-
--libILU_la_LDFLAGS = @ILU_LIBS@ $(AM_LDFLAGS)
--libILU_la_LIBADD = libIL.la
-+libILU_la_LDFLAGS = $(AM_LDFLAGS)
-+libILU_la_LIBADD = libIL.la @ILU_LIBS@
-
- libILUT_la_CPPFLAGS = -I $(ilut_include) -I $(all_include)
- libILUT_la_CFLAGS = $(AM_CFLAGS) @ILUT_CFLAGS@
- libILUT_la_SOURCES = $(ilut_src)/ilut_main.c $(ilut_src)/ilut_states.c $(ilut_src)/ilut_internal.c
- libILUT_la_SOURCES += $(ilut_include)/ilut_internal.h $(ilut_include)/ilut_states.h $(all_include)/IL/devil_internal_exports.h
--libILUT_la_LDFLAGS = @ILUT_LIBS@ $(AM_LDFLAGS)
--libILUT_la_LIBADD = libILU.la
-+libILUT_la_LDFLAGS = $(AM_LDFLAGS)
-+libILUT_la_LIBADD = libILU.la @ILUT_LIBS@
-
- if USE_ALLEGRO
- libILUT_la_SOURCES += $(ilut_src)/ilut_allegro.c $(ilut_include)/ilut_allegro.h
--- /dev/null
+--- DevIL/DevIL/src-IL/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/src-IL/CMakeLists.txt 2017-05-13 07:17:07.992571414 +0200
+@@ -57,7 +57,8 @@
+ source_group("Text Files" FILES ${DevIL_TXT} )
+
+ if(BUILD_SHARED_LIBS)
+ add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
++ set_target_properties(IL PROPERTIES SOVERSION 1 VERSION 1.8.0)
+ else(BUILD_SHARED_LIBS)
+ add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
+ endif(BUILD_SHARED_LIBS)
+@@ -248,14 +248,14 @@
+
+ # Installation
+ install (TARGETS IL
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ RUNTIME DESTINATION bin
+ )
+ install (FILES ../include/IL/il.h DESTINATION include/IL)
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/IL.pc
+- DESTINATION lib/pkgconfig
++ DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+
+--- DevIL/DevIL/src-ILU/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/src-ILU/CMakeLists.txt 2017-05-13 07:17:53.745904312 +0200
+@@ -43,7 +43,8 @@
+ source_group("Resource Files" FILES ${ILU_RSRC} )
+
+ # Remove SHARED to create a static library
+ add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
++set_target_properties(ILU PROPERTIES SOVERSION 1 VERSION 1.8.0)
+
+
+ ## ILU requires IL
+@@ -74,14 +74,17 @@
+
+ # Installation
+ install (TARGETS ILU
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ RUNTIME DESTINATION bin
+ )
+-install (FILES ../include/IL/ilu.h DESTINATION include/IL)
++install (FILES ../include/IL/ilu.h ../include/IL/ilu_region.h DESTINATION include/IL)
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc
+- DESTINATION lib/pkgconfig
++ DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+
++add_executable(ilur ${CMAKE_CURRENT_SOURCE_DIR}/ilur/ilur.c)
++target_link_libraries(ilur ILU IL)
++install (TARGETS ilur DESTINATION bin)
+--- DevIL/DevIL/src-ILUT/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/src-ILUT/CMakeLists.txt 2017-05-13 07:18:31.642570459 +0200
+@@ -43,7 +43,8 @@
+ source_group("Resource Files" FILES ${ILUT_RSRC} )
+
+ # Remove SHARED to create a static library
+ add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
++set_target_properties(ILUT PROPERTIES SOVERSION 1 VERSION 1.8.0)
+
+ ## add link sub library info
+ target_link_libraries(ILUT
+@@ -72,14 +72,14 @@
+
+ # Installation
+ install (TARGETS ILUT
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ RUNTIME DESTINATION bin
+ )
+-install (FILES ../include/IL/ilut.h DESTINATION include/IL)
++install (FILES ../include/IL/ilut.h ../include/IL/devil_cpp_wrapper.hpp DESTINATION include/IL)
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc
+- DESTINATION lib/pkgconfig
++ DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+
--- /dev/null
+--- DevIL/DevIL/docs/DevIL_manual.texi.orig 2017-01-02 01:03:56.000000000 +0100
++++ DevIL/DevIL/docs/DevIL_manual.texi 2017-05-13 18:12:42.425455619 +0200
+@@ -24,6 +24,11 @@
+ A copy of the license is included in the section entitled ``GNU Free Documentation License''.
+ @end copying
+
++@dircategory Libraries:
++@direntry
++* DevIL: (DevIL_manual). Developer's Image Library
++@end direntry
++
+ @titlepage
+ @title Developer's Image Library manual
+ @sp 1
+++ /dev/null
---- DevIL-1.7.8/devil-1.7.8/configure.ac.orig 2009-03-08 21:43:03.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/configure.ac 2010-10-16 11:14:19.027741043 +0200
-@@ -336,7 +336,9 @@
- [],
- [with_libsquish="yes"])
- AS_IF([test "x$with_libsquish" = "xyes"],
-- [DEVIL_CHECK_LIBSQUISH])
-+ [AC_LANG([C++])
-+ DEVIL_CHECK_LIBSQUISH
-+ AC_LANG([C])])
-
- AC_ARG_WITH([nvtt],
- [AS_HELP_STRING([--with-nvtt[[=yes/no]]],
-#
-# Conditional build:
-%bcond_with sse # use SSE extension
-%bcond_with sse2 # use SSE2 extension
-%bcond_with sse3 # use SSE3 extension
-#
-%ifarch pentium3 pentium4 %{x8664}
-%define with_sse 1
-%endif
-%ifarch pentium4 %{x8664}
-%define with_sse2 1
-%endif
-%define manual_version 1.5.5
Summary: Full featured image library
Summary(pl.UTF-8): Biblioteka obsługi obrazów z mnóstwem funkcji
Name: DevIL
-Version: 1.7.8
-Release: 17
+Version: 1.8.0
+Release: 1
License: LGPL v2.1
Group: Libraries
Source0: http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
-# Source0-md5: 7918f215524589435e5ec2e8736d5e1d
-Source1: http://downloads.sourceforge.net/openil/%{name}-Manual-%{manual_version}.zip
-# Source1-md5: 6bb2ddfcbe09930c48ef84b8f99479fe
-Source2: http://downloads.sourceforge.net/openil/%{name}-docs.tar.gz
-# Source2-md5: eec6ae7a028a3f058bab1a6918428ed5
-Patch0: libpng14.patch
-Patch1: %{name}-squish.patch
-Patch2: %{name}-as-needed.patch
-Patch3: gcc5.patch
-Patch4: jasper2.patch
+# Source0-md5: 4d8c21aa4822ac86d77e44f8d7c9becd
+Patch0: %{name}-cmake.patch
+Patch1: %{name}-info.patch
+Patch2: %{name}-ILUT.patch
URL: http://openil.sourceforge.net/
BuildRequires: OpenEXR-devel
BuildRequires: OpenGL-GLU-devel
BuildRequires: SDL-devel >= 1.2.5
BuildRequires: allegro-devel >= 4.1.16
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+BuildRequires: cmake >= 2.6
BuildRequires: jasper-devel
-BuildRequires: lcms-devel
+BuildRequires: lcms2-devel >= 2
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
-BuildRequires: libtool >= 2:1.5
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.533
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: squish-devel
BuildRequires: sed >= 4.0
BuildRequires: unzip
BuildRequires: xorg-lib-libXext-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1 libGLU.so.1
-
%description
Developer's Image Library (DevIL) is a programmer's library to develop
applications with very powerful image loading capabilities, yet is
Requires: libpng-devel
Requires: libtiff-devel
Requires: squish-devel
+Obsoletes: DevIL-static
%description devel
DevIL development files (for IL and ILU libraries).
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek DevIL (IL i ILU).
-%package static
-Summary: Static DevIL libraries
-Summary(pl.UTF-8): Statyczne biblioteki DevIL
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static DevIL libraries (IL and ILU).
-
-%description static -l pl.UTF-8
-Statyczne biblioteki DevIL (IL i ILU).
-
%package ILUT
Summary: DevIL ILUT library
Summary(pl.UTF-8): Biblioteka DevIL ILUT
Requires: SDL-devel >= 1.2.5
Requires: allegro-devel >= 4.1.16
Requires: xorg-lib-libXext-devel
+Obsoletes: DevIL-ILUT-static
%description ILUT-devel
Development files for DevIL ILUT library.
%description ILUT-devel -l pl.UTF-8
Pliki programistyczne biblioteki DevIL ILUT.
-%package ILUT-static
-Summary: Static DevIL ILUT library
-Summary(pl.UTF-8): Statyczna biblioteka DevIL ILUT
-Group: Development/Libraries
-Requires: %{name}-ILUT-devel = %{version}-%{release}
-
-%description ILUT-static
-Static DevIL ILUT library.
-
-%description ILUT-static -l pl.UTF-8
-Statyczna biblioteka DevIL ILUT.
-
%package doc
Summary: DevIL documentation
Summary(pl.UTF-8): Dokumentacja DevIL
Dokumentacja DevIL.
%prep
-%setup -q -c -a1 -a2
+%setup -q -n DevIL
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
-cd devil-%{version}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --enable-ILU \
- --enable-ILUT \
- %{?debug:--disable-release} \
- %{!?with_sse:--disable-sse} \
- %{!?with_sse2:--disable-sse2} \
- %{!?with_sse3:--disable-sse3}
-%{__make}
+# although there is configure.ac, but it misses some auxiliary files (m4/*)
+# and Makefile.am files are outdated (refer to no longer existing *.c files)
+install -d DevIL/build
+cd DevIL/build
+%cmake ..
+
+# info is not covered by CMakeLists
+cd ../docs
+# missing file
+cat >version.texi <<EOF
+@set UPDATED 8 March 2009
+@set UPDATED-MONTH March 2009
+@set EDITION %{version}
+@set VERSION %{version}
+EOF
+makeinfo DevIL_manual.texi
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C devil-%{version} install \
+%{__make} -C DevIL/build install \
DESTDIR=$RPM_BUILD_ROOT
+install -Dp DevIL/docs/DevIL_manual.info $RPM_BUILD_ROOT%{_infodir}/DevIL_manual.info
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc devil-%{version}/{AUTHORS,CREDITS,ChangeLog,README.unix}
+%doc DevIL/{AUTHORS,CREDITS,ChangeLog,NEWS,README.md,TODO}
%attr(755,root,root) %{_bindir}/ilur
%attr(755,root,root) %{_libdir}/libIL.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libIL.so.1
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libIL.so
%attr(755,root,root) %{_libdir}/libILU.so
-%{_libdir}/libIL.la
-%{_libdir}/libILU.la
%dir %{_includedir}/IL
%{_includedir}/IL/il.h
%{_includedir}/IL/ilu.h
%{_pkgconfigdir}/ILU.pc
%{_infodir}/DevIL_manual.info*
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libIL.a
-%{_libdir}/libILU.a
-
%files ILUT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libILUT.so.*.*.*
%attr(755,root,root) %{_libdir}/libILUT.so
%{_includedir}/IL/devil_cpp_wrapper.hpp
%{_includedir}/IL/ilut.h
-%{_libdir}/libILUT.la
%{_pkgconfigdir}/ILUT.pc
-%files ILUT-static
-%defattr(644,root,root,755)
-%{_libdir}/libILUT.a
-
%files doc
%defattr(644,root,root,755)
-%doc DevIL*.pdf
+%doc DevIL-docs/DevIL*.pdf
+++ /dev/null
---- DevIL-1.7.8/devil-1.7.8/include/IL/il.h~ 2016-05-29 21:20:26.000000000 +0200
-+++ DevIL-1.7.8/devil-1.7.8/include/IL/il.h 2016-05-29 21:20:43.592020762 +0200
-@@ -63,13 +63,8 @@
- #endif
- #endif
-
--#ifdef RESTRICT_KEYWORD
--#define RESTRICT restrict
--#define CONST_RESTRICT const restrict
--#else
- #define RESTRICT
- #define CONST_RESTRICT const
--#endif
-
- #include <stdio.h>
-
+++ /dev/null
---- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_jp2.c~ 2009-03-08 08:10:09.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_jp2.c 2017-02-26 10:17:23.557034810 +0100
-@@ -459,7 +459,7 @@
- /* The buffer must be large enough to accommodate maximum
- putback. */
- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-+ stream->bufbase_ = JAS_CAST(unsigned char *, buf);
- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
- }
- } else {
+++ /dev/null
---- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c~ 2009-03-08 08:10:09.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c 2010-04-21 14:42:41.194560666 +0200
-@@ -105,7 +105,11 @@
- Read = iread(Signature, 1, 8);
- iseek(-Read, IL_SEEK_CUR);
-
-+#if PNG_LIBPNG_VER < 10400
- return png_check_sig(Signature, 8);
-+#else
-+ return png_sig_cmp(Signature, 0, 8) == 0;
-+#endif
- }
-
-
-@@ -278,7 +282,11 @@
-
- // Expand low-bit-depth grayscale images to 8 bits
- if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-+#if PNG_LIBPNG_VER < 10400
- png_set_gray_1_2_4_to_8(png_ptr);
-+#else
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
-+#endif
- }
-
- // Expand RGB images with transparency to full alpha channels
---- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c~ 2009-03-08 08:10:09.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c 2010-04-21 15:07:23.711078866 +0200
-@@ -525,7 +525,11 @@
-
- // Expand low-bit-depth grayscale images to 8 bits
- if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-+#if PNG_LIBPNG_VER < 10400
- png_set_gray_1_2_4_to_8(ico_png_ptr);
-+#else
-+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
-+#endif
- }
-
- // Expand RGB images with transparency to full alpha channels
---- DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4.orig 2009-03-08 08:10:05.000000000 +0100
-+++ DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4 2010-10-15 09:31:19.551741882 +0200
-@@ -244,12 +244,12 @@
-
- AC_DEFUN([SETTLE_PNG],
- [DEVIL_IL_LIB([png.h],
-- [png12])
-- AS_IF([test "x$have_png12" = "xno"],
-+ [png])
-+ AS_IF([test "x$have_png" = "xno"],
- [DEVIL_IL_LIB([png.h],
-- [png])
-- lib_test_result="$have_png"],
-- [lib_test_result="$have_png12"])
-+ [png12])
-+ lib_test_result="$have_png12"],
-+ [lib_test_result="$have_png"])
- AS_IF([test "x$lib_test_result" = "xyes"],
- [MAYBE_OPTIONAL_DEPENDENCY([IL],
- [libpng]) ]) ])
projects / packages / DevIL.git / commitdiff