[arch-commits] Commit in devil/repos (14 files)

Levente Polyak anthraxx at archlinux.org
Tue Nov 22 17:26:30 UTC 2016


    Date: Tuesday, November 22, 2016 @ 17:26:29
  Author: anthraxx
Revision: 196543

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  devil/repos/staging-i686/PKGBUILD
    (from rev 196542, devil/trunk/PKGBUILD)
  devil/repos/staging-i686/gcc-5.0.patch
    (from rev 196542, devil/trunk/gcc-5.0.patch)
  devil/repos/staging-i686/jasper.patch
    (from rev 196542, devil/trunk/jasper.patch)
  devil/repos/staging-i686/libpng14.patch
    (from rev 196542, devil/trunk/libpng14.patch)
  devil/repos/staging-x86_64/PKGBUILD
    (from rev 196542, devil/trunk/PKGBUILD)
  devil/repos/staging-x86_64/gcc-5.0.patch
    (from rev 196542, devil/trunk/gcc-5.0.patch)
  devil/repos/staging-x86_64/jasper.patch
    (from rev 196542, devil/trunk/jasper.patch)
  devil/repos/staging-x86_64/libpng14.patch
    (from rev 196542, 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                     |   96 ++++++++++++++++++++++++++++++++++++++++
 /gcc-5.0.patch                |   90 +++++++++++++++++++++++++++++++++++++
 /libpng14.patch               |   66 +++++++++++++++++++++++++++
 staging-i686/PKGBUILD         |   45 ------------------
 staging-i686/gcc-5.0.patch    |   45 ------------------
 staging-i686/jasper.patch     |   11 ++++
 staging-i686/libpng14.patch   |   33 -------------
 staging-x86_64/PKGBUILD       |   45 ------------------
 staging-x86_64/gcc-5.0.patch  |   45 ------------------
 staging-x86_64/jasper.patch   |   11 ++++
 staging-x86_64/libpng14.patch |   33 -------------
 11 files changed, 274 insertions(+), 246 deletions(-)

Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD	2016-11-22 17:26:03 UTC (rev 196542)
+++ staging-i686/PKGBUILD	2016-11-22 17:26:29 UTC (rev 196543)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.org>
-# Contributor: damir <damir at 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 196542, devil/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-11-22 17:26:29 UTC (rev 196543)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.7.8
+pkgrel=24
+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
+        jasper.patch)
+md5sums=('7918f215524589435e5ec2e8736d5e1d'
+         '0f839ccefd43b0ee8b4b3f99806147fc'
+         '8d1b5d973c93927f60f775aecb448e77'
+         '85d5eaf3104967dea10101aa7e5de298')
+
+prepare() {
+  cd ${srcdir}/devil-$pkgver
+
+  patch -Np1 -i ${srcdir}/libpng14.patch
+  patch -Np1 -i ${srcdir}/gcc-5.0.patch
+  patch -Np1 -i ${srcdir}/jasper.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-22 17:26:03 UTC (rev 196542)
+++ staging-i686/gcc-5.0.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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 196542, devil/trunk/gcc-5.0.patch)
===================================================================
--- staging-i686/gcc-5.0.patch	                        (rev 0)
+++ staging-i686/gcc-5.0.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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"

Copied: devil/repos/staging-i686/jasper.patch (from rev 196542, devil/trunk/jasper.patch)
===================================================================
--- staging-i686/jasper.patch	                        (rev 0)
+++ staging-i686/jasper.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -0,0 +1,11 @@
+--- devil-1.7.8/src-IL/src/il_jp2.c	2016-11-22 18:17:06.620646464 +0100
++++ devil-1.7.8/src-IL/src/il_jp2.c	2016-11-22 18:17:26.543961083 +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(jas_uchar *, buf);
+ 			stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+ 		}
+ 	} else {

Deleted: staging-i686/libpng14.patch
===================================================================
--- staging-i686/libpng14.patch	2016-11-22 17:26:03 UTC (rev 196542)
+++ staging-i686/libpng14.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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 196542, devil/trunk/libpng14.patch)
===================================================================
--- staging-i686/libpng14.patch	                        (rev 0)
+++ staging-i686/libpng14.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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-22 17:26:03 UTC (rev 196542)
+++ staging-x86_64/PKGBUILD	2016-11-22 17:26:29 UTC (rev 196543)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.org>
-# Contributor: damir <damir at 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 196542, devil/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-11-22 17:26:29 UTC (rev 196543)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.7.8
+pkgrel=24
+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
+        jasper.patch)
+md5sums=('7918f215524589435e5ec2e8736d5e1d'
+         '0f839ccefd43b0ee8b4b3f99806147fc'
+         '8d1b5d973c93927f60f775aecb448e77'
+         '85d5eaf3104967dea10101aa7e5de298')
+
+prepare() {
+  cd ${srcdir}/devil-$pkgver
+
+  patch -Np1 -i ${srcdir}/libpng14.patch
+  patch -Np1 -i ${srcdir}/gcc-5.0.patch
+  patch -Np1 -i ${srcdir}/jasper.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-22 17:26:03 UTC (rev 196542)
+++ staging-x86_64/gcc-5.0.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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 196542, devil/trunk/gcc-5.0.patch)
===================================================================
--- staging-x86_64/gcc-5.0.patch	                        (rev 0)
+++ staging-x86_64/gcc-5.0.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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"

Copied: devil/repos/staging-x86_64/jasper.patch (from rev 196542, devil/trunk/jasper.patch)
===================================================================
--- staging-x86_64/jasper.patch	                        (rev 0)
+++ staging-x86_64/jasper.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -0,0 +1,11 @@
+--- devil-1.7.8/src-IL/src/il_jp2.c	2016-11-22 18:17:06.620646464 +0100
++++ devil-1.7.8/src-IL/src/il_jp2.c	2016-11-22 18:17:26.543961083 +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(jas_uchar *, buf);
+ 			stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+ 		}
+ 	} else {

Deleted: staging-x86_64/libpng14.patch
===================================================================
--- staging-x86_64/libpng14.patch	2016-11-22 17:26:03 UTC (rev 196542)
+++ staging-x86_64/libpng14.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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 196542, devil/trunk/libpng14.patch)
===================================================================
--- staging-x86_64/libpng14.patch	                        (rev 0)
+++ staging-x86_64/libpng14.patch	2016-11-22 17:26:29 UTC (rev 196543)
@@ -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



More information about the arch-commits mailing list