[arch-commits] Commit in devil/repos (4 files)
Laurent Carlier
lcarlier at gemini.archlinux.org
Fri May 13 07:37:05 UTC 2022
Date: Friday, May 13, 2022 @ 07:37:05
Author: lcarlier
Revision: 1200701
archrelease: copy trunk to community-staging-x86_64
Added:
devil/repos/community-staging-x86_64/
devil/repos/community-staging-x86_64/PKGBUILD
(from rev 1200699, devil/trunk/PKGBUILD)
devil/repos/community-staging-x86_64/jasper.patch
(from rev 1200699, devil/trunk/jasper.patch)
devil/repos/community-staging-x86_64/soversion.patch
(from rev 1200700, devil/trunk/soversion.patch)
-----------------+
PKGBUILD | 47 +++++++++++++++++++++++++++++++++++++++++++++++
jasper.patch | 37 +++++++++++++++++++++++++++++++++++++
soversion.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 131 insertions(+)
Copied: devil/repos/community-staging-x86_64/PKGBUILD (from rev 1200699, devil/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2022-05-13 07:37:05 UTC (rev 1200701)
@@ -0,0 +1,47 @@
+# Maintainer: Laurent Carlier <lordheavym at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.8.0
+pkgrel=6
+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
+ jasper.patch)
+sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
+ 'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
+ 'a3e1009e70be5a159250e3ea30d39f5aef1fa23eacece79e72deda51d7200159')
+
+prepare() {
+ cd "${srcdir}/DevIL"
+
+ # Add solib version number to CMakeLists.txt
+ # https://github.com/DentonW/DevIL/pull/50
+ patch -Np1 -i "${srcdir}/soversion.patch"
+ # https://github.com/DentonW/DevIL/commit/42a62648e727e9a0217280474546de3ac69cbff1
+ patch -Np1 -i "${srcdir}/jasper.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-staging-x86_64/jasper.patch (from rev 1200699, devil/trunk/jasper.patch)
===================================================================
--- community-staging-x86_64/jasper.patch (rev 0)
+++ community-staging-x86_64/jasper.patch 2022-05-13 07:37:05 UTC (rev 1200701)
@@ -0,0 +1,37 @@
+diff -Nru 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 2022-05-13 09:10:05.934188618 +0200
+@@ -313,14 +313,32 @@
+ }
+
+
+-
++// 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 ssize_t iJp2_file_read(jas_stream_obj_t *obj, char *buf, size_t 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 ssize_t iJp2_file_write(jas_stream_obj_t *obj, const char *buf, size_t 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);
Copied: devil/repos/community-staging-x86_64/soversion.patch (from rev 1200700, devil/trunk/soversion.patch)
===================================================================
--- community-staging-x86_64/soversion.patch (rev 0)
+++ community-staging-x86_64/soversion.patch 2022-05-13 07:37:05 UTC (rev 1200701)
@@ -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