[trunk] -> [community] 'devil-1.8.0-5' add

master
Nathan Owens 2 years ago
parent e836b98afb
commit f7870d465d
  1. 19
      trunk/FS70085.patch
  2. 11
      trunk/PKGBUILD
  3. 45
      trunk/gcc-5.0.patch
  4. 50
      trunk/jasper.patch
  5. 33
      trunk/libpng14.patch
  6. 19
      x86_64/community/FS70085.patch
  7. 11
      x86_64/community/PKGBUILD
  8. 45
      x86_64/community/gcc-5.0.patch
  9. 50
      x86_64/community/jasper.patch
  10. 33
      x86_64/community/libpng14.patch

@ -0,0 +1,19 @@
diff -ru DevIL/DevIL/src-IL/src/il_jp2.cpp DevILb/DevIL/src-IL/src/il_jp2.cpp
--- DevIL/DevIL/src-IL/src/il_jp2.cpp 2017-01-02 01:03:56.000000000 +0100
+++ DevILb/DevIL/src-IL/src/il_jp2.cpp 2021-03-20 09:25:11.500686387 +0100
@@ -314,13 +314,13 @@
-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
obj;
return iread(buf, 1, cnt);
}
-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
{
obj;
return iwrite(buf, 1, cnt);

@ -4,20 +4,20 @@
pkgname=devil
pkgver=1.8.0
pkgrel=4
pkgrel=5
pkgdesc="Library for reading several different image formats"
arch=('x86_64')
url="http://openil.sourceforge.net/"
url="https://sourceforge.net/projects/openil/"
depends=('libpng' 'jasper' 'lcms2' 'libjpeg-turbo')
makedepends=('cmake')
options=('!docs' '!emptydirs')
license=('GPL')
source=(https://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz
soversion.patch
jasper.patch)
FS70085.patch)
sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
'3bb14abc86116ab176b59074bc643dca06eecb7caced3f9c53cee81908422744')
'8cc6dedc65d46b2afd6364c55bdb29e259ad6df32529f2cb515998051fd8f35a')
prepare() {
cd "${srcdir}/DevIL"
@ -25,7 +25,8 @@ prepare() {
# Add solib version number to CMakeLists.txt
# https://github.com/DentonW/DevIL/pull/50
patch -Np1 -i "${srcdir}/soversion.patch"
patch -Np1 -i ../jasper.patch
patch -Np1 -i "${srcdir}/FS70085.patch"
}
build() {

@ -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"

@ -1,50 +0,0 @@
From 42a62648e727e9a0217280474546de3ac69cbff1 Mon Sep 17 00:00:00 2001
From: Mitchell Blank Jr <mitch@bodyfour.com>
Date: Thu, 10 Dec 2020 01:26:00 +0000
Subject: [PATCH] Compile against newer versions of Jasper
jasper changed the callback API (twice!) This is the workaround that
gdal used to deal with the problem (reference in the code comment)
fixes #90
---
DevIL/src-IL/src/il_jp2.cpp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/DevIL/src-IL/src/il_jp2.cpp b/DevIL/src-IL/src/il_jp2.cpp
index 730afee8..89075a52 100644
--- a/DevIL/src-IL/src/il_jp2.cpp
+++ b/DevIL/src-IL/src/il_jp2.cpp
@@ -314,13 +314,32 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILimage *Image)
+// Hack to compile against different versions of Jasper which expect
+// slightly different function types for their callbacks. The defined()
+// checks are just looking for sybols that happen to have arrived around
+// the same time as the API change, so no reason they won't break in the
+// future :-( Hopefully by the time it does nobody will care about pre-2.0.20
+// versions of jasper
+//
+// see: https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334
+// https://github.com/DentonW/DevIL/issues/90
+#if defined(PRIjas_seqent)
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+#endif
{
obj;
return iread(buf, 1, cnt);
}
+#if defined(JAS_INCLUDE_JP2_CODEC)
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
+#elif defined(PRIjas_seqent)
+static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
+#endif
{
obj;
return iwrite(buf, 1, cnt);

@ -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

@ -0,0 +1,19 @@
diff -ru DevIL/DevIL/src-IL/src/il_jp2.cpp DevILb/DevIL/src-IL/src/il_jp2.cpp
--- DevIL/DevIL/src-IL/src/il_jp2.cpp 2017-01-02 01:03:56.000000000 +0100
+++ DevILb/DevIL/src-IL/src/il_jp2.cpp 2021-03-20 09:25:11.500686387 +0100
@@ -314,13 +314,13 @@
-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
obj;
return iread(buf, 1, cnt);
}
-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
{
obj;
return iwrite(buf, 1, cnt);

@ -4,20 +4,20 @@
pkgname=devil
pkgver=1.8.0
pkgrel=4
pkgrel=5
pkgdesc="Library for reading several different image formats"
arch=('x86_64')
url="http://openil.sourceforge.net/"
url="https://sourceforge.net/projects/openil/"
depends=('libpng' 'jasper' 'lcms2' 'libjpeg-turbo')
makedepends=('cmake')
options=('!docs' '!emptydirs')
license=('GPL')
source=(https://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz
soversion.patch
jasper.patch)
FS70085.patch)
sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
'3bb14abc86116ab176b59074bc643dca06eecb7caced3f9c53cee81908422744')
'8cc6dedc65d46b2afd6364c55bdb29e259ad6df32529f2cb515998051fd8f35a')
prepare() {
cd "${srcdir}/DevIL"
@ -25,7 +25,8 @@ prepare() {
# Add solib version number to CMakeLists.txt
# https://github.com/DentonW/DevIL/pull/50
patch -Np1 -i "${srcdir}/soversion.patch"
patch -Np1 -i ../jasper.patch
patch -Np1 -i "${srcdir}/FS70085.patch"
}
build() {

@ -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"

@ -1,50 +0,0 @@
From 42a62648e727e9a0217280474546de3ac69cbff1 Mon Sep 17 00:00:00 2001
From: Mitchell Blank Jr <mitch@bodyfour.com>
Date: Thu, 10 Dec 2020 01:26:00 +0000
Subject: [PATCH] Compile against newer versions of Jasper
jasper changed the callback API (twice!) This is the workaround that
gdal used to deal with the problem (reference in the code comment)
fixes #90
---
DevIL/src-IL/src/il_jp2.cpp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/DevIL/src-IL/src/il_jp2.cpp b/DevIL/src-IL/src/il_jp2.cpp
index 730afee8..89075a52 100644
--- a/DevIL/src-IL/src/il_jp2.cpp
+++ b/DevIL/src-IL/src/il_jp2.cpp
@@ -314,13 +314,32 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILimage *Image)
+// Hack to compile against different versions of Jasper which expect
+// slightly different function types for their callbacks. The defined()
+// checks are just looking for sybols that happen to have arrived around
+// the same time as the API change, so no reason they won't break in the
+// future :-( Hopefully by the time it does nobody will care about pre-2.0.20
+// versions of jasper
+//
+// see: https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334
+// https://github.com/DentonW/DevIL/issues/90
+#if defined(PRIjas_seqent)
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+#endif
{
obj;
return iread(buf, 1, cnt);
}
+#if defined(JAS_INCLUDE_JP2_CODEC)
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
+#elif defined(PRIjas_seqent)
+static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
+#endif
{
obj;
return iwrite(buf, 1, cnt);

@ -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
Loading…
Cancel
Save