From fb4419cb572b1ea9fa91e435defa745ac84a222d Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Mon, 2 Jan 2017 15:57:15 +0100 Subject: [PATCH] devil: update to 1.8.0 --- srcpkgs/devil-examples | 1 - .../devil/patches/fix-solib-versions.patch | 30 ++++++++++++ srcpkgs/devil/patches/jasper-1.900.27.patch | 11 ----- srcpkgs/devil/template | 48 +++++-------------- 4 files changed, 41 insertions(+), 49 deletions(-) delete mode 120000 srcpkgs/devil-examples create mode 100644 srcpkgs/devil/patches/fix-solib-versions.patch delete mode 100644 srcpkgs/devil/patches/jasper-1.900.27.patch diff --git a/srcpkgs/devil-examples b/srcpkgs/devil-examples deleted file mode 120000 index 5c8a37d3482..00000000000 --- a/srcpkgs/devil-examples +++ /dev/null @@ -1 +0,0 @@ -devil \ No newline at end of file diff --git a/srcpkgs/devil/patches/fix-solib-versions.patch b/srcpkgs/devil/patches/fix-solib-versions.patch new file mode 100644 index 00000000000..7fba1d218e7 --- /dev/null +++ b/srcpkgs/devil/patches/fix-solib-versions.patch @@ -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 diff --git a/srcpkgs/devil/patches/jasper-1.900.27.patch b/srcpkgs/devil/patches/jasper-1.900.27.patch deleted file mode 100644 index 09c34dacc91..00000000000 --- a/srcpkgs/devil/patches/jasper-1.900.27.patch +++ /dev/null @@ -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 { diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template index 537248d00a1..ed816f51d67 100644 --- a/srcpkgs/devil/template +++ b/srcpkgs/devil/template @@ -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 " 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 - } -}