<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/032d3d83049edf338efb727633939e9693dd1999">https://github.com/macports/macports-ports/commit/032d3d83049edf338efb727633939e9693dd1999</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 032d3d83049 libdevil: Update to 1.8.0
</span>032d3d83049 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 032d3d83049edf338efb727633939e9693dd1999
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 16 12:09:30 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libdevil: Update to 1.8.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60774
</span>---
devel/libdevil/Portfile | 150 ++++++++++-----------
devel/libdevil/files/case.patch | 13 ++
devel/libdevil/files/endian.patch | 14 ++
devel/libdevil/files/igetfitshead.patch | 13 ++
...rnal_exports.h.diff => ivec_align_buffer.patch} | 2 +
devel/libdevil/files/jpeg-boolean.patch | 75 +++++++++++
devel/libdevil/files/miplengths.patch | 13 ++
devel/libdevil/files/patch-CXXFLAGS.diff | 11 --
devel/libdevil/files/patch-data-ILUT.pc.in.diff | 11 --
devel/libdevil/files/patch-ilur.c | 10 --
devel/libdevil/files/patch-include_IL_il.h | 13 --
.../files/patch-src-IL-include-il_endian.h.diff | 26 ----
devel/libdevil/files/patch-src-il_jp2.c.diff | 11 --
.../libdevil/files/patch-src_IL-src-il_icon.c.diff | 11 --
.../libdevil/files/patch-src_IL-src-il_png.c.diff | 11 --
15 files changed, 202 insertions(+), 182 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/Portfile b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74f8e77ca66..4e039300824 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name libdevil
conflicts ResIL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 411efa9982a1dfd9075536a80c1eb3d8c2ed15e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3084833
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel multimedia
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,87 +34,76 @@ long_description Developer's Image Library (DevIL) is a programmer's \
</span> homepage http://openil.sourceforge.net/
master_sites sourceforge:project/openil/DevIL/${version}
distname DevIL-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7918f215524589435e5ec2e8736d5e1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 bc27e3e830ba666a3af03548789700d10561fcb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a3cdb14fcca5e75ada240a53cbdc3e749a759da5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir devil-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir DevIL/DevIL
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lcms \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span> port:libmng \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:squish \
</span> port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libGLU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ilur.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-data-ILUT.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-devil_internal_exports.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-IL-include-il_endian.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_IL-src-il_png.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_IL-src-il_icon.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-il_jp2.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CXXFLAGS.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-include_IL_il.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-ILU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ILUT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-render \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-allegro \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-exr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-sdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xpm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(i386) --enable-x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(x86_64) --enable-x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc) --enable-ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc64) --enable-ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://sourceforge.net/p/resil/tickets/6/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -std=gnu89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles case.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endian.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpeg-boolean.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ igetfitshead.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ivec_align_buffer.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ miplengths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env OPENEXR_DIR=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# I don't know what the deal is with plural vs. singular cmake flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARIES=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJPEG_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJPEG_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJPEG_LIBRARIES=${prefix}/lib/libjpeg.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJPEG_LIBRARY=${prefix}/lib/libjpeg.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLCMS2_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLCMS2_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLCMS2_LIBRARIES=${prefix}/lib/liblcms2.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLCMS2_LIBRARY=${prefix}/lib/liblcms2.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBSQUISH_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBSQUISH_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBSQUISH_LIBRARIES=${prefix}/lib/libsquish.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBSQUISH_LIBRARY=${prefix}/lib/libsquish.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMNG_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMNG_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMNG_LIBRARIES=${prefix}/lib/libmng.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMNG_LIBRARY=${prefix}/lib/libmng.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_Half_LIBRARY=${prefix}/lib/libHalf.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_Half_LIBRARIES=${prefix}/lib/libHalf.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_INCLUDE_DIR=${prefix}/include/OpenEXR \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_INCLUDE_DIRS=${prefix}/include/OpenEXR \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_Iex_LIBRARY=${prefix}/lib/libIex.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_Iex_LIBRARIES=${prefix}/lib/libIex.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_IlmImf_LIBRARY=${prefix}/lib/libIlmImf.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_IlmImf_LIBRARIES=${prefix}/lib/libIlmImf.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_IlmThread_LIBRARIES=${prefix}/lib/libIlmThread.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENEXR_IlmThread_LIBRARY=${prefix}/lib/libIlmThread.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPNG_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPNG_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPNG_LIBRARIES=${prefix}/lib/libpng.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTIFF_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTIFF_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTIFF_LIBRARIES=${prefix}/lib/libtiff.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTIFF_LIBRARY=${prefix}/lib/libtiff.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_LIBRARIES=${prefix}/lib/libz.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_LIBRARY=${prefix}/lib/libz.dylib
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NEWS README TODO ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/docs/html ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sdl description {Enable libSDL renderer} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libsdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-sdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant exr description {Compile exr support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:openexr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-exr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-exr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant xpm description {Compile xmp support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEWS README.md TODO ${destroot}${prefix}/share/doc/${name}
</span> }
livecheck.regex /DevIL-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/case.patch b/devel/libdevil/files/case.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1d91827cd8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/case.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix case of Libraries.txt.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/CMakeLists.txt.orig 2017-01-01 18:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/CMakeLists.txt 2020-07-05 09:20:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(UNICODE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(UNICODE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README.md ../README.cmake ../TODO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../Libraries.txt ../README.md ../README.cmake ../TODO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/endian.patch b/devel/libdevil/files/endian.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..da9f3897395
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/endian.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix detection of big-endian systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/resil/tickets/8/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-il/include/il_endian.h.orig 2017-01-01 18:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-il/include/il_endian.h 2020-07-05 09:02:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define Short(s) iSwapShort(s)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/igetfitshead.patch b/devel/libdevil/files/igetfitshead.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e9bcd760c56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/igetfitshead.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Clear the entire header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/src/il_fits.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/src/il_fits.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@ ILboolean iGetFitsHead(FITSHEAD *Header)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ILenum CardKey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //@TODO: Use something other than memset?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset(Header, 0, sizeof(Header)); // Clear the header to all 0s first.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(Header, 0, sizeof(*Header)); // Clear the header to all 0s first.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CardKey = GetCardImage(Header);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-devil_internal_exports.h.diff b/devel/libdevil/files/ivec_align_buffer.patch
</span>similarity index 88%
rename from devel/libdevil/files/patch-devil_internal_exports.h.diff
rename to devel/libdevil/files/ivec_align_buffer.patch
<span style='display:block; white-space:pre;color:#808080;'>index 6e294af5ea0..6c01c3fa478 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-devil_internal_exports.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/ivec_align_buffer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix conflicting types error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/87
</span> --- include/IL/devil_internal_exports.h.orig 2009-11-17 11:32:00.000000000 +0100
+++ include/IL/devil_internal_exports.h 2009-11-17 11:32:27.000000000 +0100
@@ -98,7 +98,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/jpeg-boolean.patch b/devel/libdevil/files/jpeg-boolean.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..739f252588f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/jpeg-boolean.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only use jpeg's TRUE and FALSE values when using its boolean type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/src/il_jpeg.cpp.orig 2017-01-01 18:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/src/il_jpeg.cpp 2020-07-05 10:34:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,7 +245,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src->buffer[0] = (JOCTET) 0xFF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src->buffer[1] = (JOCTET) JPEG_EOI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nbytes = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return IL_FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nbytes < INPUT_BUF_SIZE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ilGetError(); // Gets rid of the IL_FILE_READ_ERROR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,9 +253,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src->pub.next_input_byte = src->buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src->pub.bytes_in_buffer = nbytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src->start_of_file = IL_FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src->start_of_file = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return IL_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,13 +334,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((result = setjmp(JpegJumpBuffer) == 0) != IL_FALSE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpeg_create_decompress(&JpegInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JpegInfo.do_block_smoothing = IL_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JpegInfo.do_fancy_upsampling = IL_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JpegInfo.do_block_smoothing = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JpegInfo.do_fancy_upsampling = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //jpeg_stdio_src(&JpegInfo, iGetFile());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devil_jpeg_read_init(&JpegInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jpeg_read_header(&JpegInfo, IL_TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ jpeg_read_header(&JpegInfo, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ilLoadFromJpegStruct(&JpegInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iwrite(dest->buffer, 1, OUTPUT_BUF_SIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dest->pub.next_output_byte = dest->buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return IL_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ METHODDEF(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,12 +554,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#endif//IL_USE_JPEGLIB_UNMODIFIED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set the quality output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jpeg_set_quality(&JpegInfo, iGetInt(IL_JPG_QUALITY), IL_TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ jpeg_set_quality(&JpegInfo, iGetInt(IL_JPG_QUALITY), TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Sets progressive saving here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ilGetBoolean(IL_JPG_PROGRESSIVE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpeg_simple_progression(&JpegInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jpeg_start_compress(&JpegInfo, IL_TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ jpeg_start_compress(&JpegInfo, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //row_stride = image_width * 3; // JSAMPLEs per row in image_buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -970,7 +970,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JpegInfo->image_height = TempImage->Height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JpegInfo->input_components = TempImage->Bpp; // # of color components per pixel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- jpeg_start_compress(JpegInfo, IL_TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ jpeg_start_compress(JpegInfo, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //row_stride = image_width * 3; // JSAMPLEs per row in image_buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/miplengths.patch b/devel/libdevil/files/miplengths.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a8156f1d80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/miplengths.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix comparison of MipLengths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/src/il_blp.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/src/il_blp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +257,7 @@ ILboolean iLoadBlpInternal(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Image->Width == 1 && Image->Height == 1) // Already at the smallest mipmap (1x1), so we are done.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Header.MipOffsets[Mip] == 0 || Header.MipLengths == 0) // No more mipmaps in the file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Header.MipOffsets[Mip] == 0 || Header.MipLengths[Mip] == 0) // No more mipmaps in the file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-CXXFLAGS.diff b/devel/libdevil/files/patch-CXXFLAGS.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2d9017697fe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-CXXFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.in.orig 2009-03-09 07:46:18.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile.in 2012-06-13 23:25:16.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,7 +352,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CFLAGS = $(GENERAL_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libIL_la_CXXFLAGS = `echo $(AM_CFLAGS) | sed 's|-std=gnu99||'` @IL_CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-data-ILUT.pc.in.diff b/devel/libdevil/files/patch-data-ILUT.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f800a739b57..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-data-ILUT.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/DentonW/DevIL/issues/39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/ILUT.pc.in.orig 2009-03-08 01:10:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/ILUT.pc.in 2018-01-26 06:25:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Developer's Image Library - ILUT part (connection to higher level libraries)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: http://openil.sourceforge.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L@libdir@ -lILUT -ILU -lIL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L@libdir@ -lILUT -lILU -lIL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs.private: @ILUT_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I@includedir@ @IL_CFLAGS@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-ilur.c b/devel/libdevil/files/patch-ilur.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92fc848bc70..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-ilur.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-ILU/ilur/ilur.c.orig 2009-03-08 18:10:12.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-ILU/ilur/ilur.c 2009-11-14 04:59:19.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IL/il.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IL/ilu.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-include_IL_il.h b/devel/libdevil/files/patch-include_IL_il.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e265db2fe43..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-include_IL_il.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/IL/il.h.orig 2012-07-06 12:31:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/IL/il.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef RESTRICT_KEYWORD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RESTRICT restrict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CONST_RESTRICT const restrict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff b/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff3a64a57b7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,9 +19,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __BIG_ENDIAN__ 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifndef __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __LITTLE_ENDIAN__ 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Short(s) iSwapShort(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +43,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BigDouble(d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Short(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UShort(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Int(i)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-src-il_jp2.c.diff b/devel/libdevil/files/patch-src-il_jp2.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30f78b7aff2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-src-il_jp2.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-IL/src/il_jp2.c.orig 2009-03-08 00:10:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-IL/src/il_jp2.c 2017-09-16 05:34:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -459,7 +459,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The buffer must be large enough to accommodate maximum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- putback. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(bufsize > JAS_STREAM_MAXPUTBACK);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stream->bufbase_ = JAS_CAST(uchar *, buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stream->bufbase_ = JAS_CAST(jas_uchar *, buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-src_IL-src-il_icon.c.diff b/devel/libdevil/files/patch-src_IL-src-il_icon.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dba2f85fb93..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-src_IL-src-il_icon.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-IL/src/il_icon.c.orig 2011-07-07 10:36:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-IL/src/il_icon.c 2011-07-07 10:37:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -525,7 +525,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Expand low-bit-depth grayscale images to 8 bits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_gray_1_2_4_to_8(ico_png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Expand RGB images with transparency to full alpha channels
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/patch-src_IL-src-il_png.c.diff b/devel/libdevil/files/patch-src_IL-src-il_png.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90a96396a97..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/patch-src_IL-src-il_png.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-IL/src/il_png.c.orig 2011-07-06 23:44:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-IL/src//il_png.c 2011-07-06 23:46:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,7 +278,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Expand low-bit-depth grayscale images to 8 bits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_gray_1_2_4_to_8(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Expand RGB images with transparency to full alpha channels
</span></pre><pre style='margin:0'>
</pre>