Date: Thursday, November 10, 2016 @ 17:09:14 Author: anthraxx Revision: 195307
archrelease: copy trunk to staging-i686, staging-x86_64 Added: devil/repos/staging-i686/PKGBUILD (from rev 195306, devil/trunk/PKGBUILD) devil/repos/staging-i686/gcc-5.0.patch (from rev 195306, devil/trunk/gcc-5.0.patch) devil/repos/staging-i686/libpng14.patch (from rev 195306, devil/trunk/libpng14.patch) devil/repos/staging-x86_64/PKGBUILD (from rev 195306, devil/trunk/PKGBUILD) devil/repos/staging-x86_64/gcc-5.0.patch (from rev 195306, devil/trunk/gcc-5.0.patch) devil/repos/staging-x86_64/libpng14.patch (from rev 195306, devil/trunk/libpng14.patch) Deleted: devil/repos/staging-i686/PKGBUILD devil/repos/staging-i686/gcc-5.0.patch devil/repos/staging-i686/libpng14.patch devil/repos/staging-x86_64/PKGBUILD devil/repos/staging-x86_64/gcc-5.0.patch devil/repos/staging-x86_64/libpng14.patch -------------------------------+ /PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++++++ /gcc-5.0.patch | 90 ++++++++++++++++++++++++++++++++++++++++ /libpng14.patch | 66 +++++++++++++++++++++++++++++ staging-i686/PKGBUILD | 45 -------------------- staging-i686/gcc-5.0.patch | 45 -------------------- staging-i686/libpng14.patch | 33 -------------- staging-x86_64/PKGBUILD | 45 -------------------- staging-x86_64/gcc-5.0.patch | 45 -------------------- staging-x86_64/libpng14.patch | 33 -------------- 9 files changed, 246 insertions(+), 246 deletions(-) Deleted: staging-i686/PKGBUILD =================================================================== --- staging-i686/PKGBUILD 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-i686/PKGBUILD 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Laurent Carlier <lordhea...@gmail.org> -# Contributor: damir <da...@archlinux.org> -# Contributor: TheHoff <forums> - -pkgname=devil -pkgver=1.7.8 -pkgrel=23 -pkgdesc="Library for reading several different image formats" -arch=('i686' 'x86_64') -url="http://openil.sourceforge.net/" -depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') -options=('!docs' '!emptydirs') -license=('GPL') -source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz - libpng14.patch - gcc-5.0.patch) -md5sums=('7918f215524589435e5ec2e8736d5e1d' - '0f839ccefd43b0ee8b4b3f99806147fc' - '8d1b5d973c93927f60f775aecb448e77') - -prepare() { - cd ${srcdir}/devil-$pkgver - - patch -Np1 -i ${srcdir}/libpng14.patch - patch -Np1 -i ${srcdir}/gcc-5.0.patch -} - -build() { - cd ${srcdir}/devil-$pkgver - - if [[ $CARCH == x86_64 ]]; then - ./configure --prefix=/usr --enable-ILU - else - ./configure --prefix=/usr --enable-ILU --disable-sse3 - fi - - make -} - -package() { - cd ${srcdir}/devil-$pkgver - - make prefix=${pkgdir}/usr install -} Copied: devil/repos/staging-i686/PKGBUILD (from rev 195306, devil/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.org> +# Contributor: damir <da...@archlinux.org> +# Contributor: TheHoff <forums> + +pkgname=devil +pkgver=1.7.8 +pkgrel=23 +pkgdesc="Library for reading several different image formats" +arch=('i686' 'x86_64') +url="http://openil.sourceforge.net/" +depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') +options=('!docs' '!emptydirs') +license=('GPL') +source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz + libpng14.patch + gcc-5.0.patch) +md5sums=('7918f215524589435e5ec2e8736d5e1d' + '0f839ccefd43b0ee8b4b3f99806147fc' + '8d1b5d973c93927f60f775aecb448e77') + +prepare() { + cd ${srcdir}/devil-$pkgver + + patch -Np1 -i ${srcdir}/libpng14.patch + patch -Np1 -i ${srcdir}/gcc-5.0.patch +} + +build() { + cd ${srcdir}/devil-$pkgver + + if [[ $CARCH == x86_64 ]]; then + ./configure --prefix=/usr --enable-ILU + else + ./configure --prefix=/usr --enable-ILU --disable-sse3 + fi + + make +} + +package() { + cd ${srcdir}/devil-$pkgver + + make prefix=${pkgdir}/usr install +} Deleted: staging-i686/gcc-5.0.patch =================================================================== --- staging-i686/gcc-5.0.patch 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-i686/gcc-5.0.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,45 +0,0 @@ -diff -ru devil-1.7.8/src-IL/src/il_exr.cpp devil-1.7.8a/src-IL/src/il_exr.cpp ---- devil-1.7.8/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_exr.cpp 2015-05-15 18:50:35.700339353 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - #ifndef IL_NO_EXR - -diff -ru devil-1.7.8/src-IL/src/il_nvidia.cpp devil-1.7.8a/src-IL/src/il_nvidia.cpp ---- devil-1.7.8/src-IL/src/il_nvidia.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_nvidia.cpp 2015-05-15 18:50:46.490308339 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - #include "il_dds.h" - #include "il_manip.h" -diff -ru devil-1.7.8/src-IL/src/il_squish.cpp devil-1.7.8a/src-IL/src/il_squish.cpp ---- devil-1.7.8/src-IL/src/il_squish.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_squish.cpp 2015-05-15 18:56:13.935820622 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - /*#include "il_dds.h" - #include "il_manip.h" -diff -ru devil-1.7.8/src-IL/src/il_utx.cpp devil-1.7.8a/src-IL/src/il_utx.cpp ---- devil-1.7.8/src-IL/src/il_utx.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_utx.cpp 2015-05-15 18:56:33.572405684 +0200 -@@ -12,6 +12,8 @@ - // - //----------------------------------------------------------------------------- - -+ -+#include "il.h" - #include "il_internal.h" - #ifndef IL_NO_UTX - #include "il_utx.h" Copied: devil/repos/staging-i686/gcc-5.0.patch (from rev 195306, devil/trunk/gcc-5.0.patch) =================================================================== --- staging-i686/gcc-5.0.patch (rev 0) +++ staging-i686/gcc-5.0.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,45 @@ +diff -ru devil-1.7.8/src-IL/src/il_exr.cpp devil-1.7.8a/src-IL/src/il_exr.cpp +--- devil-1.7.8/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_exr.cpp 2015-05-15 18:50:35.700339353 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + #ifndef IL_NO_EXR + +diff -ru devil-1.7.8/src-IL/src/il_nvidia.cpp devil-1.7.8a/src-IL/src/il_nvidia.cpp +--- devil-1.7.8/src-IL/src/il_nvidia.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_nvidia.cpp 2015-05-15 18:50:46.490308339 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + #include "il_dds.h" + #include "il_manip.h" +diff -ru devil-1.7.8/src-IL/src/il_squish.cpp devil-1.7.8a/src-IL/src/il_squish.cpp +--- devil-1.7.8/src-IL/src/il_squish.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_squish.cpp 2015-05-15 18:56:13.935820622 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + /*#include "il_dds.h" + #include "il_manip.h" +diff -ru devil-1.7.8/src-IL/src/il_utx.cpp devil-1.7.8a/src-IL/src/il_utx.cpp +--- devil-1.7.8/src-IL/src/il_utx.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_utx.cpp 2015-05-15 18:56:33.572405684 +0200 +@@ -12,6 +12,8 @@ + // + //----------------------------------------------------------------------------- + ++ ++#include "il.h" + #include "il_internal.h" + #ifndef IL_NO_UTX + #include "il_utx.h" Deleted: staging-i686/libpng14.patch =================================================================== --- staging-i686/libpng14.patch 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-i686/libpng14.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,33 +0,0 @@ -diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 -@@ -105,7 +105,7 @@ - Read = iread(Signature, 1, 8); - iseek(-Read, IL_SEEK_CUR); - -- return png_check_sig(Signature, 8); -+ return png_sig_cmp(Signature, 0, 8) == 0; - } - - -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels Copied: devil/repos/staging-i686/libpng14.patch (from rev 195306, devil/trunk/libpng14.patch) =================================================================== --- staging-i686/libpng14.patch (rev 0) +++ staging-i686/libpng14.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,33 @@ +diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c +--- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 +@@ -525,7 +525,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(ico_png_ptr); ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); + } + + // Expand RGB images with transparency to full alpha channels +diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c +--- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 +@@ -105,7 +105,7 @@ + Read = iread(Signature, 1, 8); + iseek(-Read, IL_SEEK_CUR); + +- return png_check_sig(Signature, 8); ++ return png_sig_cmp(Signature, 0, 8) == 0; + } + + +@@ -278,7 +278,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // Expand RGB images with transparency to full alpha channels Deleted: staging-x86_64/PKGBUILD =================================================================== --- staging-x86_64/PKGBUILD 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-x86_64/PKGBUILD 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Laurent Carlier <lordhea...@gmail.org> -# Contributor: damir <da...@archlinux.org> -# Contributor: TheHoff <forums> - -pkgname=devil -pkgver=1.7.8 -pkgrel=23 -pkgdesc="Library for reading several different image formats" -arch=('i686' 'x86_64') -url="http://openil.sourceforge.net/" -depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') -options=('!docs' '!emptydirs') -license=('GPL') -source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz - libpng14.patch - gcc-5.0.patch) -md5sums=('7918f215524589435e5ec2e8736d5e1d' - '0f839ccefd43b0ee8b4b3f99806147fc' - '8d1b5d973c93927f60f775aecb448e77') - -prepare() { - cd ${srcdir}/devil-$pkgver - - patch -Np1 -i ${srcdir}/libpng14.patch - patch -Np1 -i ${srcdir}/gcc-5.0.patch -} - -build() { - cd ${srcdir}/devil-$pkgver - - if [[ $CARCH == x86_64 ]]; then - ./configure --prefix=/usr --enable-ILU - else - ./configure --prefix=/usr --enable-ILU --disable-sse3 - fi - - make -} - -package() { - cd ${srcdir}/devil-$pkgver - - make prefix=${pkgdir}/usr install -} Copied: devil/repos/staging-x86_64/PKGBUILD (from rev 195306, devil/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.org> +# Contributor: damir <da...@archlinux.org> +# Contributor: TheHoff <forums> + +pkgname=devil +pkgver=1.7.8 +pkgrel=23 +pkgdesc="Library for reading several different image formats" +arch=('i686' 'x86_64') +url="http://openil.sourceforge.net/" +depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') +options=('!docs' '!emptydirs') +license=('GPL') +source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz + libpng14.patch + gcc-5.0.patch) +md5sums=('7918f215524589435e5ec2e8736d5e1d' + '0f839ccefd43b0ee8b4b3f99806147fc' + '8d1b5d973c93927f60f775aecb448e77') + +prepare() { + cd ${srcdir}/devil-$pkgver + + patch -Np1 -i ${srcdir}/libpng14.patch + patch -Np1 -i ${srcdir}/gcc-5.0.patch +} + +build() { + cd ${srcdir}/devil-$pkgver + + if [[ $CARCH == x86_64 ]]; then + ./configure --prefix=/usr --enable-ILU + else + ./configure --prefix=/usr --enable-ILU --disable-sse3 + fi + + make +} + +package() { + cd ${srcdir}/devil-$pkgver + + make prefix=${pkgdir}/usr install +} Deleted: staging-x86_64/gcc-5.0.patch =================================================================== --- staging-x86_64/gcc-5.0.patch 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-x86_64/gcc-5.0.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,45 +0,0 @@ -diff -ru devil-1.7.8/src-IL/src/il_exr.cpp devil-1.7.8a/src-IL/src/il_exr.cpp ---- devil-1.7.8/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_exr.cpp 2015-05-15 18:50:35.700339353 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - #ifndef IL_NO_EXR - -diff -ru devil-1.7.8/src-IL/src/il_nvidia.cpp devil-1.7.8a/src-IL/src/il_nvidia.cpp ---- devil-1.7.8/src-IL/src/il_nvidia.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_nvidia.cpp 2015-05-15 18:50:46.490308339 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - #include "il_dds.h" - #include "il_manip.h" -diff -ru devil-1.7.8/src-IL/src/il_squish.cpp devil-1.7.8a/src-IL/src/il_squish.cpp ---- devil-1.7.8/src-IL/src/il_squish.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_squish.cpp 2015-05-15 18:56:13.935820622 +0200 -@@ -11,6 +11,7 @@ - //----------------------------------------------------------------------------- - - -+#include "il.h" - #include "il_internal.h" - /*#include "il_dds.h" - #include "il_manip.h" -diff -ru devil-1.7.8/src-IL/src/il_utx.cpp devil-1.7.8a/src-IL/src/il_utx.cpp ---- devil-1.7.8/src-IL/src/il_utx.cpp 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8a/src-IL/src/il_utx.cpp 2015-05-15 18:56:33.572405684 +0200 -@@ -12,6 +12,8 @@ - // - //----------------------------------------------------------------------------- - -+ -+#include "il.h" - #include "il_internal.h" - #ifndef IL_NO_UTX - #include "il_utx.h" Copied: devil/repos/staging-x86_64/gcc-5.0.patch (from rev 195306, devil/trunk/gcc-5.0.patch) =================================================================== --- staging-x86_64/gcc-5.0.patch (rev 0) +++ staging-x86_64/gcc-5.0.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,45 @@ +diff -ru devil-1.7.8/src-IL/src/il_exr.cpp devil-1.7.8a/src-IL/src/il_exr.cpp +--- devil-1.7.8/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_exr.cpp 2015-05-15 18:50:35.700339353 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + #ifndef IL_NO_EXR + +diff -ru devil-1.7.8/src-IL/src/il_nvidia.cpp devil-1.7.8a/src-IL/src/il_nvidia.cpp +--- devil-1.7.8/src-IL/src/il_nvidia.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_nvidia.cpp 2015-05-15 18:50:46.490308339 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + #include "il_dds.h" + #include "il_manip.h" +diff -ru devil-1.7.8/src-IL/src/il_squish.cpp devil-1.7.8a/src-IL/src/il_squish.cpp +--- devil-1.7.8/src-IL/src/il_squish.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_squish.cpp 2015-05-15 18:56:13.935820622 +0200 +@@ -11,6 +11,7 @@ + //----------------------------------------------------------------------------- + + ++#include "il.h" + #include "il_internal.h" + /*#include "il_dds.h" + #include "il_manip.h" +diff -ru devil-1.7.8/src-IL/src/il_utx.cpp devil-1.7.8a/src-IL/src/il_utx.cpp +--- devil-1.7.8/src-IL/src/il_utx.cpp 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8a/src-IL/src/il_utx.cpp 2015-05-15 18:56:33.572405684 +0200 +@@ -12,6 +12,8 @@ + // + //----------------------------------------------------------------------------- + ++ ++#include "il.h" + #include "il_internal.h" + #ifndef IL_NO_UTX + #include "il_utx.h" Deleted: staging-x86_64/libpng14.patch =================================================================== --- staging-x86_64/libpng14.patch 2016-11-10 17:07:06 UTC (rev 195306) +++ staging-x86_64/libpng14.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -1,33 +0,0 @@ -diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 -@@ -105,7 +105,7 @@ - Read = iread(Signature, 1, 8); - iseek(-Read, IL_SEEK_CUR); - -- return png_check_sig(Signature, 8); -+ return png_sig_cmp(Signature, 0, 8) == 0; - } - - -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels Copied: devil/repos/staging-x86_64/libpng14.patch (from rev 195306, devil/trunk/libpng14.patch) =================================================================== --- staging-x86_64/libpng14.patch (rev 0) +++ staging-x86_64/libpng14.patch 2016-11-10 17:09:14 UTC (rev 195307) @@ -0,0 +1,33 @@ +diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c +--- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 +@@ -525,7 +525,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(ico_png_ptr); ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); + } + + // Expand RGB images with transparency to full alpha channels +diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c +--- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 +@@ -105,7 +105,7 @@ + Read = iread(Signature, 1, 8); + iseek(-Read, IL_SEEK_CUR); + +- return png_check_sig(Signature, 8); ++ return png_sig_cmp(Signature, 0, 8) == 0; + } + + +@@ -278,7 +278,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // Expand RGB images with transparency to full alpha channels