Merge pull request #2560 from lemmi/oiio

openimageio: update to 1.5.19.
This commit is contained in:
Enno Boland 2015-09-19 23:05:04 +02:00
commit e4a22d6dbf
2 changed files with 8 additions and 33 deletions

View file

@ -1,30 +0,0 @@
From f80e48f22dd58f92a0a9eb9d03cee5c1970af141 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Fri, 21 Aug 2015 22:06:29 +1000
Subject: [PATCH] Only reference LIBRAW_DECODER_FLATFIELD within an #ifdef that
ensures that it is defined
---
src/raw.imageio/rawinput.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git src/raw.imageio/rawinput.cpp src/raw.imageio/rawinput.cpp
index 6295958..1de1081 100644
--- src/raw.imageio/rawinput.cpp
+++ src/raw.imageio/rawinput.cpp
@@ -201,6 +201,7 @@ RawInput::open (const std::string &name, ImageSpec &newspec,
if (demosaic == demosaic_algs[d])
m_processor.imgdata.params.user_qual = d;
else if (demosaic == "none") {
+#ifdef LIBRAW_DECODER_FLATFIELD
// See if we can access the Bayer patterned data for this raw file
libraw_decoder_info_t decoder_info;
m_processor.get_decoder_info(&decoder_info);
@@ -209,6 +210,7 @@ RawInput::open (const std::string &name, ImageSpec &newspec,
return false;
}
+#endif
// User has selected no demosaicing, so no processing needs to be done
m_process = false;

View file

@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=1.5.18
revision=2
version=1.5.19
revision=1
wrksrc=oiio-Release-${version}
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0"
@ -17,12 +17,17 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD"
homepage="https://sites.google.com/site/openimageio/home"
distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
checksum=5e22fb0fbc46f72dd8904282cf43ae5501415f11b0043c61660dd99ac267c756
checksum=3de62cef5996d713890d3930648a18f36f687d2b6fadd0c348c9d94540fec28e
nocross=yes # -> ilmbase
pre_build() {
find ${wrksrc} -type f -exec sed -i "{}" -e "s;<sys/poll\.h>;<poll.h>;g" \;
}
post_install() {
vlicense LICENSE
}
openimageio-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"