openimageio: Update to 1.7.17

This commit is contained in:
Alexey Pavlov
2017-09-18 07:54:40 +03:00
parent 17a5f3bac0
commit dff32798e0
4 changed files with 26 additions and 11 deletions

View File

@@ -7,7 +7,7 @@ index 376dcfd..90578d7 100644
if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
- set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
+ set (Boost_ADDITIONAL_VERSIONS "1.63" "1.62" "1.61" "1.60" "1.59" "1.58" "1.57" "1.56"
+ set (Boost_ADDITIONAL_VERSIONS "1.64" "1.63" "1.62" "1.61" "1.60" "1.59" "1.58" "1.57" "1.56"
"1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
"1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
"1.43" "1.43.0" "1.42" "1.42.0")

View File

@@ -0,0 +1,11 @@
--- oiio-Release-1.7.17/src/libutil/strutil.cpp.orig 2017-09-17 22:50:09.099409700 +0300
+++ oiio-Release-1.7.17/src/libutil/strutil.cpp 2017-09-17 22:50:28.792536000 +0300
@@ -916,7 +916,7 @@
const char* end = str.end();
uint32_t state = 0;
for (; begin != end; ++begin) {
- uint32_t codepoint;
+ uint32_t codepoint = 0;
if (!decode(&state, &codepoint, (unsigned char) *begin))
uvec.push_back(codepoint);
}

View File

@@ -3,7 +3,7 @@
_realname=openimageio
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.7.15
pkgver=1.7.17
pkgrel=1
pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)"
arch=('any')
@@ -39,13 +39,15 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi
workaround-ansidecl-h-PTR-define-conflict.patch
0001-MinGW-w64-include-winbase-h-early-for-TCHAR-types.patch
0003-boost-latest.patch
0004-guard-msvc-stuff.patch)
sha256sums=('5db80981a3f87ad4a2a0c684884ad28f8c879570318dc79ba485b69e6fe77e73'
'd17a0638636e838bc739455cfd93ea3f8010d0f5b941f68e5692833c330aee85'
0004-guard-msvc-stuff.patch
0005-fix-initialization.patch)
sha256sums=('669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f'
'138b21e2c21fc43023f5788fa107f904454fda7812d1ab4f762de18b323b8649'
'ab6bde02c0c05495a9cb13441535d42f4d5929bd930859d75f589d12be9a182b'
'b7cc78d0f535ceb1aba68b11970c32ffbf04815d229b12e64e2c2c0b3403b4b2'
'0bdbaca6dee2541b0d4d6acde36ff4309f997325566fb0e07d361d3f393a90d3'
'3a73e95486a5a50685eed753f11c433bcf9f1b1a46947d6ae1350c8f68568536')
'ac7039e5e9ba7e1a4e92d5f674282d270d0dee7afd96d3899f12544a0f6392d1'
'3a73e95486a5a50685eed753f11c433bcf9f1b1a46947d6ae1350c8f68568536'
'bddb6c328e13d7b53e511acba4e21cb6a3b2a09a961c34a566bf38c84622fed4')
prepare() {
cd ${srcdir}/oiio-Release-${pkgver}
@@ -54,6 +56,7 @@ prepare() {
patch -p1 -i ${srcdir}/0001-MinGW-w64-include-winbase-h-early-for-TCHAR-types.patch
patch -p1 -i ${srcdir}/0003-boost-latest.patch
patch -p1 -i ${srcdir}/0004-guard-msvc-stuff.patch
patch -p1 -i ${srcdir}/0005-fix-initialization.patch
}
build() {
@@ -62,6 +65,8 @@ build() {
mkdir -p ${srcdir}/build-${MINGW_CHOST}
cd ${srcdir}/build-${MINGW_CHOST}
CXXFLAGS+=" -faligned-new"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
-G"MSYS Makefiles" \
@@ -72,7 +77,7 @@ build() {
-DUSE_FIELD3D=ON \
-DUSE_OPENSSL=ON \
-DFREETYPE_INCLUDE_PATH=${MINGW_PREFIX}/include/freetype2 \
-DOPENJPEG_INCLUDE_DIR=${MINGW_PREFIX}/include/openjpeg-2.1 \
-DOPENJPEG_INCLUDE_DIR=${MINGW_PREFIX}/include/openjpeg-2.2 \
-DOPENJPEG_OPENJPEG_LIBRARIES=${MINGW_PREFIX}/lib/libopenjp2.dll.a \
-DCMAKE_SHARED_LINKER_FLAGS=" -Wl,--export-all-symbols -Wl,--enable-auto-import " \
-DOIIO_BUILD_TESTS=ON \
@@ -83,8 +88,6 @@ build() {
package() {
cd "${srcdir}"/build-${MINGW_CHOST}
make DESTDIR=${pkgdir} install
install -Dm644 ${srcdir}/oiio-Release-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
}

View File

@@ -127,10 +127,11 @@
#include "typedesc.h"
--- a/src/cmake/modules/FindOpenJpeg.cmake 2013-12-29 23:51:59.071600000 +0400
+++ b/src/cmake/modules/FindOpenJpeg.cmake 2013-12-29 23:52:34.998400000 +0400
@@ -78,6 +78,11 @@
@@ -78,6 +78,12 @@
${OPENJPEG_HOME}/include/openjpeg
${OPENJPEG_HOME}/include
${OpenJpeg_include_paths}
+ ${OPENJPEG_HOME}/include/openjpeg-2.2
+ ${OPENJPEG_HOME}/include/openjpeg-2.1
+ ${OPENJPEG_HOME}/include/openjpeg-2.0
+ ${OPENJPEG_HOME}/include/openjpeg-1.5