[arch-commits] Commit in devil/repos/community-x86_64 (8 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Mar 20 08:29:22 UTC 2021
Date: Saturday, March 20, 2021 @ 08:29:22
Author: lcarlier
Revision: 895996
archrelease: copy trunk to community-x86_64
Added:
devil/repos/community-x86_64/FS70085.patch
(from rev 895995, devil/trunk/FS70085.patch)
devil/repos/community-x86_64/PKGBUILD
(from rev 895995, devil/trunk/PKGBUILD)
devil/repos/community-x86_64/soversion.patch
(from rev 895995, devil/trunk/soversion.patch)
Deleted:
devil/repos/community-x86_64/PKGBUILD
devil/repos/community-x86_64/gcc-5.0.patch
devil/repos/community-x86_64/jasper.patch
devil/repos/community-x86_64/libpng14.patch
devil/repos/community-x86_64/soversion.patch
-----------------+
FS70085.patch | 19 ++++++++++
PKGBUILD | 90 +++++++++++++++++++++++++++------------------------
gcc-5.0.patch | 45 -------------------------
jasper.patch | 11 ------
libpng14.patch | 33 ------------------
soversion.patch | 94 +++++++++++++++++++++++++++---------------------------
6 files changed, 113 insertions(+), 179 deletions(-)
Copied: devil/repos/community-x86_64/FS70085.patch (from rev 895995, devil/trunk/FS70085.patch)
===================================================================
--- FS70085.patch (rev 0)
+++ FS70085.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -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);
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-20 08:29:17 UTC (rev 895995)
+++ PKGBUILD 2021-03-20 08:29:22 UTC (rev 895996)
@@ -1,43 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.8.0
-pkgrel=4
-pkgdesc="Library for reading several different image formats"
-arch=('x86_64')
-url="http://openil.sourceforge.net/"
-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)
-sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
- 'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377')
-
-prepare() {
- cd "${srcdir}/DevIL"
-
- # Add solib version number to CMakeLists.txt
- # https://github.com/DentonW/DevIL/pull/50
- patch -Np1 -i "${srcdir}/soversion.patch"
-}
-
-build() {
- cd "${srcdir}/DevIL/DevIL"
-
- rm -rf build && mkdir build
- cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib
- make
-}
-
-package() {
- cd "${srcdir}/DevIL/DevIL/build"
-
- make DESTDIR="$pkgdir" install
-}
Copied: devil/repos/community-x86_64/PKGBUILD (from rev 895995, devil/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-20 08:29:22 UTC (rev 895996)
@@ -0,0 +1,47 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.8.0
+pkgrel=5
+pkgdesc="Library for reading several different image formats"
+arch=('x86_64')
+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
+ FS70085.patch)
+sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
+ 'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
+ '8cc6dedc65d46b2afd6364c55bdb29e259ad6df32529f2cb515998051fd8f35a')
+
+prepare() {
+ cd "${srcdir}/DevIL"
+
+ # 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() {
+ cd "${srcdir}/DevIL/DevIL"
+
+ rm -rf build && mkdir build
+ cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd "${srcdir}/DevIL/DevIL/build"
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: gcc-5.0.patch
===================================================================
--- gcc-5.0.patch 2021-03-20 08:29:17 UTC (rev 895995)
+++ gcc-5.0.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -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:29:17 UTC (rev 895995)
+++ jasper.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -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:29:17 UTC (rev 895995)
+++ libpng14.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -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
Deleted: soversion.patch
===================================================================
--- soversion.patch 2021-03-20 08:29:17 UTC (rev 895995)
+++ soversion.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -1,47 +0,0 @@
-From 1763633e5f7a8b86c293bd9a2f030961e77b0067 Mon Sep 17 00:00:00 2001
-From: Juergen Buchmueller <pullmoll at t-online.de>
-Date: Mon, 2 Jan 2017 16:48:55 +0100
-Subject: [PATCH] Add solib version number to CMakeLists.txt
-
----
- DevIL/src-IL/CMakeLists.txt | 1 +
- DevIL/src-ILU/CMakeLists.txt | 1 +
- DevIL/src-ILUT/CMakeLists.txt | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
-index 02e4f033..095f43e7 100644
---- a/DevIL/src-IL/CMakeLists.txt
-+++ b/DevIL/src-IL/CMakeLists.txt
-@@ -58,6 +58,7 @@ source_group("Text Files" FILES ${DevIL_TXT} )
-
- if(BUILD_SHARED_LIBS)
- add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
-+ set_target_properties(IL PROPERTIES SOVERSION 1)
- else(BUILD_SHARED_LIBS)
- add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
- endif(BUILD_SHARED_LIBS)
-diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
-index 17a3afe7..44b9531b 100644
---- a/DevIL/src-ILU/CMakeLists.txt
-+++ b/DevIL/src-ILU/CMakeLists.txt
-@@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${ILU_RSRC} )
-
- # Remove SHARED to create a static library
- add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
-+set_target_properties(ILU PROPERTIES SOVERSION 1)
-
-
- ## ILU requires IL
-diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
-index 21470cbc..296f9955 100644
---- a/DevIL/src-ILUT/CMakeLists.txt
-+++ b/DevIL/src-ILUT/CMakeLists.txt
-@@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${ILUT_RSRC} )
-
- # Remove SHARED to create a static library
- add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
-+set_target_properties(ILUT PROPERTIES SOVERSION 1)
-
- ## add link sub library info
- target_link_libraries(ILUT
Copied: devil/repos/community-x86_64/soversion.patch (from rev 895995, devil/trunk/soversion.patch)
===================================================================
--- soversion.patch (rev 0)
+++ soversion.patch 2021-03-20 08:29:22 UTC (rev 895996)
@@ -0,0 +1,47 @@
+From 1763633e5f7a8b86c293bd9a2f030961e77b0067 Mon Sep 17 00:00:00 2001
+From: Juergen Buchmueller <pullmoll at t-online.de>
+Date: Mon, 2 Jan 2017 16:48:55 +0100
+Subject: [PATCH] Add solib version number to CMakeLists.txt
+
+---
+ DevIL/src-IL/CMakeLists.txt | 1 +
+ DevIL/src-ILU/CMakeLists.txt | 1 +
+ DevIL/src-ILUT/CMakeLists.txt | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
+index 02e4f033..095f43e7 100644
+--- a/DevIL/src-IL/CMakeLists.txt
++++ b/DevIL/src-IL/CMakeLists.txt
+@@ -58,6 +58,7 @@ source_group("Text Files" FILES ${DevIL_TXT} )
+
+ if(BUILD_SHARED_LIBS)
+ add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
++ set_target_properties(IL PROPERTIES SOVERSION 1)
+ else(BUILD_SHARED_LIBS)
+ add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
+ endif(BUILD_SHARED_LIBS)
+diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
+index 17a3afe7..44b9531b 100644
+--- a/DevIL/src-ILU/CMakeLists.txt
++++ b/DevIL/src-ILU/CMakeLists.txt
+@@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${ILU_RSRC} )
+
+ # Remove SHARED to create a static library
+ add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
++set_target_properties(ILU PROPERTIES SOVERSION 1)
+
+
+ ## ILU requires IL
+diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
+index 21470cbc..296f9955 100644
+--- a/DevIL/src-ILUT/CMakeLists.txt
++++ b/DevIL/src-ILUT/CMakeLists.txt
+@@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${ILUT_RSRC} )
+
+ # Remove SHARED to create a static library
+ add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
++set_target_properties(ILUT PROPERTIES SOVERSION 1)
+
+ ## add link sub library info
+ target_link_libraries(ILUT
More information about the arch-commits
mailing list