devil: update to 1.8.0

This commit is contained in:
Juergen Buchmueller 2017-01-02 15:57:15 +01:00
parent a9f4cb2636
commit fb4419cb57
4 changed files with 41 additions and 49 deletions

View file

@ -1 +0,0 @@
devil

View file

@ -0,0 +1,30 @@
--- DevIL/src-IL/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100
+++ DevIL/src-IL/CMakeLists.txt 2017-01-02 15:48:51.400299099 +0100
@@ -58,6 +58,7 @@
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)
--- DevIL/src-ILU/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100
+++ DevIL/src-ILU/CMakeLists.txt 2017-01-02 15:53:22.944560222 +0100
@@ -44,6 +44,7 @@
# 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
--- DevIL/src-ILUT/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100
+++ DevIL/src-ILUT/CMakeLists.txt 2017-01-02 15:54:12.176607698 +0100
@@ -44,6 +44,7 @@
# 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

View file

@ -1,11 +0,0 @@
--- src-IL/src/il_jp2.c.orig 2016-11-13 09:08:41.000000000 +0000
+++ src-IL/src/il_jp2.c 2016-11-13 09:09:13.198423105 +0000
@@ -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 {

View file

@ -1,57 +1,31 @@
# Template file for 'devil'
pkgname=devil
version=1.7.8
revision=4
build_style=gnu-configure
version=1.8.0
revision=1
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
configure_args="--enable-ILU --enable-ILUT --with-examples"
hostmakedepends="automake libtool pkg-config"
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
glew-devel libfreeglut-devel SDL_image-devel"
glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="LGPL-2.1"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" libopenexr-devel"
fi
pre_configure() {
autoreconf -if
# Replace obsolete libpng function names
sed -e "s;png_set_gray_1_2_4_to_8;png_set_expand_gray_1_2_4_to_8;" \
-i ${wrksrc}/src-IL/src/il_png.c
sed -e "s;png_set_gray_1_2_4_to_8;png_set_expand_gray_1_2_4_to_8;" \
-i ${wrksrc}/src-IL/src/il_icon.c
}
post_configure() {
# Disable RESTRICT_KEYWORD for gcc5 and newer
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 4 ]; then
sed -i include/IL/config.h \
-e's;#define RESTRICT_KEYWORD.*;#undef RESTRICT_KEYWORD;'
fi
}
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
# The examples subpkg is gone
replaces="devil-examples<1.8.0"
devil-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmkdir usr/share/doc/devil
cp -aR docs/html docs/images ${PKGDESTDIR}/usr/share/doc/devil
cp -aR ${wrksrc}/DevIL-docs/*pdf ${PKGDESTDIR}/usr/share/doc/devil
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
devil-examples_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - examples"
pkg_install() {
vmove usr/share/devil/examples
cp -aR ${wrksrc}/examples/* ${PKGDESTDIR}/usr/share/devil/examples
}
}