[trunk] -> [community-staging] 'devil-1.8.0-6' add

master
Nathan Owens 5 months ago
parent f7870d465d
commit cb27e343fa
  1. 19
      trunk/FS70085.patch
  2. 12
      trunk/PKGBUILD
  3. 37
      trunk/jasper.patch
  4. 47
      x86_64/community-staging/PKGBUILD
  5. 37
      x86_64/community-staging/jasper.patch
  6. 47
      x86_64/community-staging/soversion.patch

@ -1,19 +0,0 @@
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);

@ -1,10 +1,10 @@
# Maintainer: Laurent Carlier <lordheavym@gmail.org>
# Maintainer: Laurent Carlier <lordheavym@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: TheHoff <forums>
pkgname=devil
pkgver=1.8.0
pkgrel=5
pkgrel=6
pkgdesc="Library for reading several different image formats"
arch=('x86_64')
url="https://sourceforge.net/projects/openil/"
@ -14,10 +14,10 @@ options=('!docs' '!emptydirs')
license=('GPL')
source=(https://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz
soversion.patch
FS70085.patch)
jasper.patch)
sha256sums=('0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709'
'f6ef4b428fd68f0fb837af548d20ffa5ca96f3e8e4f57faca8f5a90dc48b0377'
'8cc6dedc65d46b2afd6364c55bdb29e259ad6df32529f2cb515998051fd8f35a')
'a3e1009e70be5a159250e3ea30d39f5aef1fa23eacece79e72deda51d7200159')
prepare() {
cd "${srcdir}/DevIL"
@ -25,8 +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 "${srcdir}/FS70085.patch"
# https://github.com/DentonW/DevIL/commit/42a62648e727e9a0217280474546de3ac69cbff1
patch -Np1 -i "${srcdir}/jasper.patch"
}
build() {

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

@ -0,0 +1,47 @@
# Maintainer: Laurent Carlier <lordheavym@archlinux.org>
# Contributor: damir <damir@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
}

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

@ -0,0 +1,47 @@
From 1763633e5f7a8b86c293bd9a2f030961e77b0067 Mon Sep 17 00:00:00 2001
From: Juergen Buchmueller <pullmoll@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
Loading…
Cancel
Save