[arch-commits] Commit in devil/trunk (5 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Mar 20 08:29:17 UTC 2021
Date: Saturday, March 20, 2021 @ 08:29:17
Author: lcarlier
Revision: 895995
upgpkg: devil 1.8.0-5: fix FS#70085
Added:
devil/trunk/FS70085.patch
Modified:
devil/trunk/PKGBUILD
Deleted:
devil/trunk/gcc-5.0.patch
devil/trunk/jasper.patch
devil/trunk/libpng14.patch
----------------+
FS70085.patch | 19 +++++++++++++++++++
PKGBUILD | 12 ++++++++----
gcc-5.0.patch | 45 ---------------------------------------------
jasper.patch | 11 -----------
libpng14.patch | 33 ---------------------------------
5 files changed, 27 insertions(+), 93 deletions(-)
Added: FS70085.patch
===================================================================
--- FS70085.patch (rev 0)
+++ FS70085.patch 2021-03-20 08:29:17 UTC (rev 895995)
@@ -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);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-20 08:19:15 UTC (rev 895994)
+++ PKGBUILD 2021-03-20 08:29:17 UTC (rev 895995)
@@ -4,18 +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)
+ soversion.patch
+ FS70085.patch)
sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
- 'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377')
+ 'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
+ '8cc6dedc65d46b2afd6364c55bdb29e259ad6df32529f2cb515998051fd8f35a')
prepare() {
cd "${srcdir}/DevIL"
@@ -23,6 +25,8 @@
# Add solib version number to CMakeLists.txt
# https://github.com/DentonW/DevIL/pull/50
patch -Np1 -i "${srcdir}/soversion.patch"
+
+ patch -Np1 -i "${srcdir}/FS70085.patch"
}
build() {
Deleted: gcc-5.0.patch
===================================================================
--- gcc-5.0.patch 2021-03-20 08:19:15 UTC (rev 895994)
+++ gcc-5.0.patch 2021-03-20 08:29:17 UTC (rev 895995)
@@ -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"
Deleted: jasper.patch
===================================================================
--- jasper.patch 2021-03-20 08:19:15 UTC (rev 895994)
+++ jasper.patch 2021-03-20 08:29:17 UTC (rev 895995)
@@ -1,11 +0,0 @@
---- 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: libpng14.patch
===================================================================
--- libpng14.patch 2021-03-20 08:19:15 UTC (rev 895994)
+++ libpng14.patch 2021-03-20 08:29:17 UTC (rev 895995)
@@ -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
More information about the arch-commits
mailing list