From ae5039943e18107d7f4b6685a44c689969730065 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Mon, 9 Apr 2018 21:04:46 +0900 Subject: [PATCH] OpenImageIO-1.8.10 (WIP) --- OpenImageIO/OpenImageIO-1.6.3-1bl1.cygport | 72 ----- OpenImageIO/OpenImageIO-1.6.3-1bl1.src.patch | 284 ------------------ OpenImageIO/OpenImageIO-1.8.10-1bl1.cygport | 54 ++++ OpenImageIO/OpenImageIO-1.8.10-1bl1.src.patch | 212 +++++++++++++ OpenImageIO/README | 165 +++++----- 5 files changed, 346 insertions(+), 441 deletions(-) delete mode 100644 OpenImageIO/OpenImageIO-1.6.3-1bl1.cygport delete mode 100644 OpenImageIO/OpenImageIO-1.6.3-1bl1.src.patch create mode 100644 OpenImageIO/OpenImageIO-1.8.10-1bl1.cygport create mode 100644 OpenImageIO/OpenImageIO-1.8.10-1bl1.src.patch diff --git a/OpenImageIO/OpenImageIO-1.6.3-1bl1.cygport b/OpenImageIO/OpenImageIO-1.6.3-1bl1.cygport deleted file mode 100644 index 8c0c1695d..000000000 --- a/OpenImageIO/OpenImageIO-1.6.3-1bl1.cygport +++ /dev/null @@ -1,72 +0,0 @@ -HOMEPAGE="https://sites.google.com/site/openimageio/home" -SRC_URI="https://github.com/${PN}/oiio/archive/Release-${PV}dev.tar.gz" -SRC_DIR="oiio-Release-${PV}dev" - -CATEGORY="Graphics" -SUMMARY="Library for reading and writing images" -DESCRIPTION="OpenImageIO is a library for reading and writing images, and a bunch of -related classes, utilities, and applications. Main features include: -- Extremely simple but powerful ImageInput and ImageOutput APIs for reading - and writing 2D images that is format agnostic. -- Format plugins for TIFF, JPEG/JFIF, OpenEXR, PNG, HDR/RGBE, Targa, - JPEG-2000, DPX, Cineon, FITS, BMP, ICO, RMan Zfile, Softimage PIC, DDS, SGI, - PNM/PPM/PGM/PBM, Field3d. -- An ImageCache class that transparently manages a cache so that it can access - truly vast amounts of image data." - -inherit cmake - -CYGCMAKE_ARGS=" - -DUSE_TBB:BOOL=OFF - -DUSE_EXTERNAL_PUGIXML:BOOL=ON - -DINSTALL_DOCS:BOOL=OFF - -DSTOP_ON_WARNING:BOOL=OFF - -DVERBOSE:BOOL=ON -" - -src_test() -{ - cd ${B} - OIIO_LIBRARY_PATH= - for imageio in src/*.imageio - do - OIIO_LIBRARY_PATH=${OIIO_LIBRARY_PATH}:${B}/${imageio} - done - export OIIO_LIBRARY_PATH - PATH=${B}/src/lib${PN}:${PATH} cygtest -} - -DOCS=" - README* -" - -DIFF_EXCLUDES=" - externalpackages.cmake -" - -PKG_NAMES=" - ${PN} - lib${PN}${PV[1]}.${PV[2]} - lib${PN}-devel - python-${PN} -" -OpenImageIO_CONTENTS=" - etc - usr/bin/*.exe - usr/share -" -libOpenImageIO1_6_CONTENTS=" - usr/bin/*.dll -" -libOpenImageIO_devel_CONTENTS=" - usr/include - usr/lib/lib${PN}* - usr/lib/pkgconfig -" -python_OpenImageIO_CONTENTS=" - usr/lib/python -" -OpenImageIO_SUMMARY="${SUMMARY} (utilities)" -libOpenImageIO1_6_SUMMARY="${SUMMARY} (runtime)" -libOpenImageIO_devel_SUMMARY="${SUMMARY} (development)" -python_OpenImageIO_SUMMARY="${SUMMARY} (python bindings)" diff --git a/OpenImageIO/OpenImageIO-1.6.3-1bl1.src.patch b/OpenImageIO/OpenImageIO-1.6.3-1bl1.src.patch deleted file mode 100644 index 802342738..000000000 --- a/OpenImageIO/OpenImageIO-1.6.3-1bl1.src.patch +++ /dev/null @@ -1,284 +0,0 @@ ---- origsrc/oiio-Release-1.6.3dev/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/CMakeLists.txt 2015-05-21 20:26:43.537013300 +0900 -@@ -559,3 +559,10 @@ include (CPack) - # * BOOST_DYNAMIC - - # Do TIFF, JPEG, PNG actually look in external? -+ -+SET(prefix ${CMAKE_INSTALL_PREFIX}) -+SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) -+SET(libdir ${CMAKE_INSTALL_PREFIX}/lib) -+SET(includedir ${CMAKE_INSTALL_PREFIX}/include) -+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/openimageio.pc.in ${CMAKE_BINARY_DIR}/openimageio.pc @ONLY) -+INSTALL(FILES ${CMAKE_BINARY_DIR}/openimageio.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ---- origsrc/oiio-Release-1.6.3dev/openimageio.pc.in 1970-01-01 09:00:00.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/openimageio.pc.in 2015-05-21 20:26:43.537013300 +0900 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: OpenImageIO -+Description: Library for reading and writing images -+Version: 1.6.1 -+Libs: -L${libdir} -lOpenImageIO -lOpenImageIO_Util -+Cflags: -I${includedir} ---- origsrc/oiio-Release-1.6.3dev/src/cineon.imageio/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/cineon.imageio/CMakeLists.txt 2015-05-21 20:26:43.537013300 +0900 -@@ -1,4 +1 @@ --add_oiio_plugin (cineoninput.cpp cineonoutput.cpp -- libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp libcineon/Reader.cpp -- libcineon/Writer.cpp libcineon/CineonHeader.cpp libcineon/ElementReadStream.cpp -- libcineon/InStream.cpp) -+add_oiio_plugin (cineoninput.cpp cineonoutput.cpp) ---- origsrc/oiio-Release-1.6.3dev/src/cineon.imageio/cineoninput.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/cineon.imageio/cineoninput.cpp 2015-05-21 20:26:43.552638300 +0900 -@@ -28,7 +28,7 @@ - (This is the Modified BSD License) - */ - --#include "libcineon/Cineon.h" -+#include - - #include "OpenImageIO/dassert.h" - #include "OpenImageIO/typedesc.h" -@@ -36,8 +36,6 @@ - #include "OpenImageIO/fmath.h" - #include "OpenImageIO/strutil.h" - --using namespace cineon; -- - OIIO_PLUGIN_NAMESPACE_BEGIN - - ---- origsrc/oiio-Release-1.6.3dev/src/cineon.imageio/cineonoutput.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/cineon.imageio/cineonoutput.cpp 2015-05-21 20:26:43.568263300 +0900 -@@ -28,14 +28,12 @@ - (This is the Modified BSD License) - */ - --#include "libcineon/Cineon.h" -+#include - - #include "OpenImageIO/typedesc.h" - #include "OpenImageIO/imageio.h" - #include "OpenImageIO/fmath.h" - --using namespace cineon; -- - OIIO_PLUGIN_NAMESPACE_BEGIN - - ---- origsrc/oiio-Release-1.6.3dev/src/dds.imageio/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/dds.imageio/CMakeLists.txt 2015-05-21 20:26:43.583888300 +0900 -@@ -1,4 +1 @@ --add_oiio_plugin (ddsinput.cpp ddsoutput.cpp squish/alpha.cpp squish/clusterfit.cpp -- squish/colourblock.cpp squish/colourfit.cpp squish/colourset.cpp -- squish/maths.cpp squish/rangefit.cpp squish/singlecolourfit.cpp -- squish/squish.cpp) -+add_oiio_plugin (ddsinput.cpp ddsoutput.cpp) ---- origsrc/oiio-Release-1.6.3dev/src/dpx.imageio/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/dpx.imageio/CMakeLists.txt 2015-05-21 20:26:43.583888300 +0900 -@@ -1,6 +1,3 @@ --add_oiio_plugin (dpxinput.cpp dpxoutput.cpp -- libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp -- libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp -- libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp) -+add_oiio_plugin (dpxinput.cpp dpxoutput.cpp) - link_openexr (dpx.imageio) - link_ilmbase (dpx.imageio) ---- origsrc/oiio-Release-1.6.3dev/src/dpx.imageio/dpxinput.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/dpx.imageio/dpxinput.cpp 2015-05-21 20:26:43.615138300 +0900 -@@ -28,8 +28,8 @@ - (This is the Modified BSD License) - */ - --#include "libdpx/DPX.h" --#include "libdpx/DPXColorConverter.h" -+#include -+#include "DPXColorConverter.h" - #include //For TimeCode support - - #include "OpenImageIO/typedesc.h" ---- origsrc/oiio-Release-1.6.3dev/src/dpx.imageio/dpxoutput.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/dpx.imageio/dpxoutput.cpp 2015-05-21 20:26:43.677638300 +0900 -@@ -33,8 +33,8 @@ - #include - #include - --#include "libdpx/DPX.h" --#include "libdpx/DPXColorConverter.h" -+#include -+#include "DPXColorConverter.h" - - #include "OpenImageIO/typedesc.h" - #include "OpenImageIO/imageio.h" ---- origsrc/oiio-Release-1.6.3dev/src/ffmpeg.imageio/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/ffmpeg.imageio/CMakeLists.txt 2015-05-21 20:26:43.693263300 +0900 -@@ -1,5 +1,6 @@ - if (USE_FFMPEG) - if (FFMPEG_FOUND) -+ add_definitions("-D__STDC_CONSTANT_MACROS") - include_directories (${FFMPEG_INCLUDE_DIR}) - add_oiio_plugin (ffmpeginput.cpp ffmpegoutput.cpp - LINK_LIBRARIES ${FFMPEG_LIBRARY} ---- origsrc/oiio-Release-1.6.3dev/src/ffmpeg.imageio/ffmpeginput.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/ffmpeg.imageio/ffmpeginput.cpp 2015-05-21 20:26:43.708888300 +0900 -@@ -28,6 +28,11 @@ - (This is the Modified BSD License) - */ - -+#ifdef __cplusplus -+ #define __STDC_CONSTANT_MACROS -+ #include -+#endif -+ - extern "C" { // ffmpeg is a C api - #include - #include -@@ -35,6 +40,11 @@ extern "C" { // ffmpeg is a C api - #include - } - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1) -+#define av_frame_alloc avcodec_alloc_frame -+#define av_frame_free avcodec_free_frame -+#endif -+ - #include - #include - ---- origsrc/oiio-Release-1.6.3dev/src/libOpenImageIO/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/libOpenImageIO/CMakeLists.txt 2015-05-21 20:26:43.724513300 +0900 -@@ -57,22 +57,9 @@ if (EMBEDPLUGINS) - ../bmp.imageio/bmpinput.cpp ../bmp.imageio/bmpoutput.cpp - ../bmp.imageio/bmp_pvt.cpp - ../cineon.imageio/cineoninput.cpp ../cineon.imageio/cineonoutput.cpp -- ../cineon.imageio/libcineon/Cineon.cpp -- ../cineon.imageio/libcineon/Codec.cpp ../cineon.imageio/libcineon/Reader.cpp -- ../cineon.imageio/libcineon/Writer.cpp ../cineon.imageio/libcineon/CineonHeader.cpp -- ../cineon.imageio/libcineon/ElementReadStream.cpp ../cineon.imageio/libcineon/InStream.cpp - ../dds.imageio/ddsinput.cpp ../dds.imageio/ddsoutput.cpp -- ../dds.imageio/squish/alpha.cpp ../dds.imageio/squish/clusterfit.cpp -- ../dds.imageio/squish/colourblock.cpp ../dds.imageio/squish/colourfit.cpp -- ../dds.imageio/squish/colourset.cpp ../dds.imageio/squish/maths.cpp -- ../dds.imageio/squish/rangefit.cpp ../dds.imageio/squish/singlecolourfit.cpp -- ../dds.imageio/squish/squish.cpp - ../dpx.imageio/dpxinput.cpp ../dpx.imageio/dpxoutput.cpp -- ../dpx.imageio/libdpx/DPX.cpp ../dpx.imageio/libdpx/OutStream.cpp -- ../dpx.imageio/libdpx/RunLengthEncoding.cpp ../dpx.imageio/libdpx/Codec.cpp -- ../dpx.imageio/libdpx/Reader.cpp ../dpx.imageio/libdpx/Writer.cpp -- ../dpx.imageio/libdpx/DPXHeader.cpp ../dpx.imageio/libdpx/ElementReadStream.cpp -- ../dpx.imageio/libdpx/InStream.cpp ../dpx.imageio/libdpx/DPXColorConverter.cpp -+ ../dpx.imageio/libdpx/DPXColorConverter.cpp - ../fits.imageio/fitsinput.cpp ../fits.imageio/fitsoutput.cpp - ../fits.imageio/fits_pvt.cpp - ../hdr.imageio/hdrinput.cpp ../hdr.imageio/hdroutput.cpp -@@ -87,13 +74,6 @@ if (EMBEDPLUGINS) - ../psd.imageio/psdinput.cpp ../psd.imageio/psdoutput.cpp - ../psd.imageio/jpeg_memory_src.cpp - ../ptex.imageio/ptexinput.cpp ../ptex.imageio/ptexoutput.cpp -- ../ptex.imageio/ptex/PtexCache.cpp ../ptex.imageio/ptex/PtexFilters.cpp -- ../ptex.imageio/ptex/PtexHalf.cpp ../ptex.imageio/ptex/PtexReader.cpp -- ../ptex.imageio/ptex/PtexSeparableFilter.cpp -- ../ptex.imageio/ptex/PtexSeparableKernel.cpp -- ../ptex.imageio/ptex/PtexTriangleFilter.cpp -- ../ptex.imageio/ptex/PtexTriangleKernel.cpp -- ../ptex.imageio/ptex/PtexUtils.cpp ../ptex.imageio/ptex/PtexWriter.cpp - ../openexr.imageio/exrinput.cpp ../openexr.imageio/exroutput.cpp - ../rla.imageio/rlainput.cpp ../rla.imageio/rlaoutput.cpp - ../sgi.imageio/sgiinput.cpp ../sgi.imageio/sgioutput.cpp -@@ -104,6 +84,7 @@ if (EMBEDPLUGINS) - ../tiff.imageio/tiffinput.cpp ../tiff.imageio/tiffoutput.cpp - ../zfile.imageio/zfile.cpp - ) -+ include_directories (../dpx.imageio/libdpx/) - if (NOT Boost_VERSION LESS "103500") - # Boost < 1.35 is too old to support asio that socket needs - set (libOpenImageIO_srcs ${libOpenImageIO_srcs} -@@ -263,6 +244,8 @@ if (EMBEDPLUGINS) - ${HDF5_LIBRARY} - ${OPENJPEG_LIBRARIES} - ${WEBP_LIBRARY} -+ ${CINEON_LIBRARY} ${SQUISH_LIBRARY} -+ ${DPX_LIBRARY} ${PTEX_LIBRARY} - ) - link_openexr (OpenImageIO) - if (USE_GIF AND GIF_FOUND) ---- origsrc/oiio-Release-1.6.3dev/src/libutil/sysutil.cpp 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/libutil/sysutil.cpp 2015-05-21 20:26:43.724513300 +0900 -@@ -34,7 +34,7 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) || defined(__CYGWIN__) - # include - # include - # include -@@ -83,7 +83,7 @@ using namespace Sysutil; - size_t - Sysutil::memory_used (bool resident) - { --#if defined(__linux__) -+#if defined(__linux__) || defined(__CYGWIN__) - #if 0 - // doesn't seem to work? - struct rusage ru; -@@ -141,7 +141,7 @@ Sysutil::memory_used (bool resident) - size_t - Sysutil::physical_memory () - { --#if defined(__linux__) -+#if defined(__linux__) || defined(__CYGWIN__) - size_t size = 0; - FILE *file = fopen ("/proc/meminfo", "r"); - if (file) { -@@ -221,7 +221,7 @@ Sysutil::this_program_path () - char filename[10240]; - filename[0] = 0; - --#if defined(__linux__) -+#if defined(__linux__) || defined(__CYGWIN__) - unsigned int size = sizeof(filename); - int r = readlink ("/proc/self/exe", filename, size); - ASSERT(r < int(size)); // user won't get the right answer if the filename is too long to store -@@ -276,7 +276,7 @@ Sysutil::terminal_columns () - { - int columns = 80; // a decent guess, if we have nothing more to go on - --#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__CYGWIN__) - struct winsize w; - ioctl (0, TIOCGWINSZ, &w); - columns = w.ws_col; -@@ -312,7 +312,7 @@ Sysutil::put_in_background (int, char* [ - // But it suffers from the same problem on OS X, and seems to just be - // a wrapper for fork. - --#if defined(__linux__) || defined(__GLIBC__) -+#if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__) - // Simplest case: - // daemon returns 0 if successful, thus return true if successful - return daemon (1, 1) == 0; ---- origsrc/oiio-Release-1.6.3dev/src/ptex.imageio/CMakeLists.txt 2015-05-21 06:04:25.000000000 +0900 -+++ src/oiio-Release-1.6.3dev/src/ptex.imageio/CMakeLists.txt 2015-05-21 20:26:43.724513300 +0900 -@@ -6,16 +6,6 @@ if (ZLIB_FOUND) - endif() - include_directories (${ZLIB_INCLUDE_DIR}) - add_oiio_plugin (ptexinput.cpp ptexoutput.cpp -- ptex/PtexCache.cpp -- ptex/PtexFilters.cpp -- ptex/PtexHalf.cpp -- ptex/PtexReader.cpp -- ptex/PtexSeparableFilter.cpp -- ptex/PtexSeparableKernel.cpp -- ptex/PtexTriangleFilter.cpp -- ptex/PtexTriangleKernel.cpp -- ptex/PtexUtils.cpp -- ptex/PtexWriter.cpp -- LINK_LIBRARIES ${ZLIB_LIBRARIES} ) -+ LINK_LIBRARIES ${ZLIB_LIBRARIES} ${PTEX_LIBRARIES}) - endif () - diff --git a/OpenImageIO/OpenImageIO-1.8.10-1bl1.cygport b/OpenImageIO/OpenImageIO-1.8.10-1bl1.cygport new file mode 100644 index 000000000..b68534432 --- /dev/null +++ b/OpenImageIO/OpenImageIO-1.8.10-1bl1.cygport @@ -0,0 +1,54 @@ +HOMEPAGE="https://sites.google.com/site/openimageio/home" +SRC_URI="https://github.com/${PN}/oiio/archive/Release-${PV}.tar.gz" +SRC_DIR="oiio-Release-${PV}" + +CATEGORY="Graphics" +SUMMARY="Library for reading and writing images" +DESCRIPTION="OpenImageIO is a library for reading and writing images, and a bunch of +related classes, utilities, and applications." + +inherit cmake + +CYGCMAKE_ARGS=" + -DUSE_TBB:BOOL=OFF + -DUSE_EXTERNAL_PUGIXML:BOOL=ON + -DINSTALL_DOCS:BOOL=OFF + -DSTOP_ON_WARNING:BOOL=OFF + -DVERBOSE:BOOL=ON +" + +DOCS=" + *.md +" + +src_test() +{ + cd ${B} + ninja_test +} + +PKG_NAMES=" + ${PN} + lib${PN}${PV[1]}.${PV[2]} + lib${PN}-devel + python2-${PN} +" +OpenImageIO_CONTENTS=" + usr/bin/*.exe + usr/share +" +libOpenImageIO1_8_CONTENTS=" + usr/bin/*.dll +" +libOpenImageIO_devel_CONTENTS=" + usr/include + usr/lib/lib${PN}* + usr/lib/pkgconfig +" +python2_OpenImageIO_CONTENTS=" + usr/lib/python2* +" +OpenImageIO_SUMMARY="${SUMMARY} (utilities)" +libOpenImageIO1_8_SUMMARY="${SUMMARY} (runtime)" +libOpenImageIO_devel_SUMMARY="${SUMMARY} (development)" +python2_OpenImageIO_SUMMARY="${SUMMARY} (python2 bindings)" diff --git a/OpenImageIO/OpenImageIO-1.8.10-1bl1.src.patch b/OpenImageIO/OpenImageIO-1.8.10-1bl1.src.patch new file mode 100644 index 000000000..b2a1210dd --- /dev/null +++ b/OpenImageIO/OpenImageIO-1.8.10-1bl1.src.patch @@ -0,0 +1,212 @@ +--- origsrc/oiio-Release-1.8.10/CMakeLists.txt 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/CMakeLists.txt 2018-04-09 20:31:07.935000000 +0900 +@@ -401,3 +401,10 @@ set (CPACK_COMPONENT_DEVELOPER_DESCRIPTI + set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "OpenImageIO documentation") + set (CPACK_COMPONENT_DEVELOPER_DEPENDS user) + include (CPack) ++ ++SET(prefix ${CMAKE_INSTALL_PREFIX}) ++SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) ++SET(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++SET(includedir ${CMAKE_INSTALL_PREFIX}/include) ++CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/OpenImageIO.pc.in ${CMAKE_BINARY_DIR}/OpenImageIO.pc @ONLY) ++INSTALL(FILES ${CMAKE_BINARY_DIR}/OpenImageIO.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +--- origsrc/oiio-Release-1.8.10/OpenImageIO.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/oiio-Release-1.8.10/OpenImageIO.pc.in 2018-04-09 20:31:02.357000200 +0900 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: OpenImageIO ++Description: Library for reading and writing images ++Version: @PROJECT_VERSION@ ++Libs: -L${libdir} -lOpenImageIO -lOpenImageIO_Util ++Cflags: -I${includedir} +--- origsrc/oiio-Release-1.8.10/src/cineon.imageio/CMakeLists.txt 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/cineon.imageio/CMakeLists.txt 2018-04-09 18:24:05.740000000 +0900 +@@ -1,4 +1 @@ +-add_oiio_plugin (cineoninput.cpp +- libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp libcineon/Reader.cpp +- libcineon/Writer.cpp libcineon/CineonHeader.cpp libcineon/ElementReadStream.cpp +- libcineon/InStream.cpp) ++add_oiio_plugin (cineoninput.cpp) +--- origsrc/oiio-Release-1.8.10/src/cineon.imageio/cineoninput.cpp 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/cineon.imageio/cineoninput.cpp 2018-04-09 18:24:38.622000000 +0900 +@@ -28,7 +28,7 @@ + (This is the Modified BSD License) + */ + +-#include "libcineon/Cineon.h" ++#include + + #include + #include +@@ -36,8 +36,6 @@ + #include + #include + +-using namespace cineon; +- + OIIO_PLUGIN_NAMESPACE_BEGIN + + +--- origsrc/oiio-Release-1.8.10/src/cmake/compiler.cmake 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/cmake/compiler.cmake 2018-04-09 19:25:58.766000000 +0900 +@@ -177,7 +177,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM + message (STATUS "Building for C++11") + set (CSTD_FLAGS "-std=c++11") + endif () +- add_definitions (${CSTD_FLAGS}) ++ if (NOT CYGWIN) ++ add_definitions (${CSTD_FLAGS}) ++ endif() + if (CMAKE_COMPILER_IS_CLANG) + # C++ >= 11 doesn't like 'register' keyword, which is in Qt headers + add_definitions ("-Wno-deprecated-register") +--- origsrc/oiio-Release-1.8.10/src/cmake/externalpackages.cmake 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/cmake/externalpackages.cmake 2018-04-09 18:39:18.550602300 +0900 +@@ -495,3 +495,7 @@ endif() + # end DCMTK setup + ########################################################################### + ++include(FindPkgConfig) ++pkg_check_modules(DPX REQUIRED dpx) ++pkg_check_modules(LIBCINEON REQUIRED libcineon) ++pkg_check_modules(LIBSQUISH REQUIRED libsquish) +--- origsrc/oiio-Release-1.8.10/src/dds.imageio/CMakeLists.txt 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/dds.imageio/CMakeLists.txt 2018-04-09 18:26:45.926000200 +0900 +@@ -1,4 +1 @@ +-add_oiio_plugin (ddsinput.cpp squish/alpha.cpp squish/clusterfit.cpp +- squish/colourblock.cpp squish/colourfit.cpp squish/colourset.cpp +- squish/maths.cpp squish/rangefit.cpp squish/singlecolourfit.cpp +- squish/squish.cpp) ++add_oiio_plugin (ddsinput.cpp) +--- origsrc/oiio-Release-1.8.10/src/dpx.imageio/CMakeLists.txt 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/dpx.imageio/CMakeLists.txt 2018-04-09 18:32:08.739000000 +0900 +@@ -1,5 +1,3 @@ + add_oiio_plugin (dpxinput.cpp dpxoutput.cpp +- libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp +- libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp +- libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp +- LINK_LIBRARIES ${OPENEXR_LIBRARIES}) ++ libdpx/DPXColorConverter.cpp ++ LINK_LIBRARIES ${OPENEXR_LIBRARIES}) +--- origsrc/oiio-Release-1.8.10/src/dpx.imageio/dpxinput.cpp 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/dpx.imageio/dpxinput.cpp 2018-04-09 18:27:47.254000000 +0900 +@@ -28,8 +28,8 @@ + (This is the Modified BSD License) + */ + +-#include "libdpx/DPX.h" +-#include "libdpx/DPXColorConverter.h" ++#include ++#include "DPXColorConverter.h" + #include //For TimeCode support + + #include +--- origsrc/oiio-Release-1.8.10/src/dpx.imageio/dpxoutput.cpp 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/dpx.imageio/dpxoutput.cpp 2018-04-09 18:28:05.126000000 +0900 +@@ -33,8 +33,8 @@ + #include + #include + +-#include "libdpx/DPX.h" +-#include "libdpx/DPXColorConverter.h" ++#include ++#include "DPXColorConverter.h" + + #include + #include +--- origsrc/oiio-Release-1.8.10/src/include/OpenImageIO/strutil.h 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/include/OpenImageIO/strutil.h 2018-04-09 19:03:42.280000000 +0900 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include +--- origsrc/oiio-Release-1.8.10/src/libOpenImageIO/CMakeLists.txt 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/libOpenImageIO/CMakeLists.txt 2018-04-09 19:46:24.320000000 +0900 +@@ -175,6 +175,12 @@ target_link_libraries (OpenImageIO ${ILM + target_link_libraries (OpenImageIO ${OPENEXR_LIBRARIES}) + target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}) + ++include_directories (../dpx.imageio/libdpx/) ++ ++target_link_libraries (OpenImageIO ${DPX_LIBRARIES}) ++target_link_libraries (OpenImageIO ${LIBCINEON_LIBRARIES}) ++target_link_libraries (OpenImageIO ${LIBSQUISH_LIBRARIES}) ++ + if (VERBOSE) + message(STATUS "Setting SOVERSION to: ${SOVERSION}") + endif () +--- origsrc/oiio-Release-1.8.10/src/libutil/argparse.cpp 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/libutil/argparse.cpp 2018-04-09 19:05:10.757999800 +0900 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #include + #include +--- origsrc/oiio-Release-1.8.10/src/libutil/sysutil.cpp 2018-04-01 06:56:14.000000000 +0900 ++++ src/oiio-Release-1.8.10/src/libutil/sysutil.cpp 2018-04-09 19:42:48.970000000 +0900 +@@ -35,7 +35,7 @@ + #include + #include + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__CYGWIN__) + # include + # include + # include +@@ -93,7 +93,7 @@ using namespace Sysutil; + size_t + Sysutil::memory_used (bool resident) + { +-#if defined(__linux__) ++#if defined(__linux__) || defined(__CYGWIN__) + #if 0 + // doesn't seem to work? + struct rusage ru; +@@ -151,7 +151,7 @@ Sysutil::memory_used (bool resident) + size_t + Sysutil::physical_memory () + { +-#if defined(__linux__) ++#if defined(__linux__) || defined(__CYGWIN__) + size_t size = 0; + FILE *file = fopen ("/proc/meminfo", "r"); + if (file) { +@@ -231,7 +231,7 @@ Sysutil::this_program_path () + char filename[10240]; + filename[0] = 0; + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__CYGWIN__) + unsigned int size = sizeof(filename); + int r = readlink ("/proc/self/exe", filename, size); + ASSERT(r < int(size)); // user won't get the right answer if the filename is too long to store +@@ -294,7 +294,7 @@ Sysutil::terminal_columns () + { + int columns = 80; // a decent guess, if we have nothing more to go on + +-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__CYGWIN__) + struct winsize w; + ioctl (0, TIOCGWINSZ, &w); + columns = w.ws_col; +@@ -317,7 +317,7 @@ Sysutil::terminal_rows () + { + int rows = 24; // a decent guess, if we have nothing more to go on + +-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__CYGWIN__) + struct winsize w; + ioctl (0, TIOCGWINSZ, &w); + rows = w.ws_row; diff --git a/OpenImageIO/README b/OpenImageIO/README index e0cf528e5..b9b1af0a0 100644 --- a/OpenImageIO/README +++ b/OpenImageIO/README @@ -1,97 +1,82 @@ OpenImageIO ------------------------------------------ -OpenImageIO is a library for reading and writing images, and a bunch of -related classes, utilities, and applications. Main features include: -- Extremely simple but powerful ImageInput and ImageOutput APIs for reading - and writing 2D images that is format agnostic. -- Format plugins for TIFF, JPEG/JFIF, OpenEXR, PNG, HDR/RGBE, Targa, - JPEG-2000, DPX, Cineon, FITS, BMP, ICO, RMan Zfile, Softimage PIC, DDS, SGI, - PNM/PPM/PGM/PBM, Field3d. -- An ImageCache class that transparently manages a cache so that it can access - truly vast amounts of image data. +OpenImageIO is a library for reading and writing images, and a bunch of related +classes, utilities, and applications. Runtime requirements: - coreutils-8.23-4 - cygwin-2.0.2-1 - fontconfig-2.11.1-2 - libavcodec56-2.6.3-1 - libavformat56-2.6.3-1 - libavutil54-2.6.3-1 - libboost_filesystem1.57-1.57.0-1 - libboost_python1.57-1.57.0-1 - libboost_regex1.57-1.57.0-1 - libboost_system1.57-1.57.0-1 - libboost_thread1.57-1.57.0-1 - libcineon0-0.1+svn13-1bl1 - libdpx0-0.5.0+svn4-1bl2 - libField3D1.6-1.6.1-1bl1 - libfreetype6-2.5.5-1 - libgcc1-4.9.2-3 - libgif4-4.1.6-12 - libGL1-10.5.4-2 - libGLEW1.11-1.11.0-1 - libhdf5_9-1.8.14-1 - libilmbase7-1.0.3-1 - libIlmImf7-1.7.1-1 - libjpeg8-1.3.1-3 - libOpenColorIO1-1.0.9+git20140912-1bl1 - libopencv2.4-2.4.10-3 - libOpenImageIO-devel-1.6.3-1bl1 - libOpenImageIO1.6-1.6.3-1bl1 - libopenjpeg1-1.5.2-2 - libpng16-1.6.17-1 - libPtex0-2.0.62-1bl1 - libQtCore4-4.8.6-8 - libQtGui4-4.8.6-8 - libQtOpenGL4-4.8.6-8 - libraw10-0.16.1-1 - libsquish0.0-1.11+svn60-1bl1 - libstdc++6-4.9.2-3 - libswscale3-2.6.3-1 - libtiff6-4.0.3-2 - libwebp5-0.4.3-1 - mkfontdir-1.0.7-1 - mkfontscale-1.1.1-1 - python-2.7.9-1 - zlib0-1.2.8-3 + cygwin-2.10.0-1 + libboost_filesystem1.64-1.64.0-1 + libboost_python1.64-1.64.0-1 + libboost_system1.64-1.64.0-1 + libboost_thread1.64-1.64.0-1 + libcineon0-0.1+git20150315-1bl1 + libdcmtk4-3.6.1_20140617-2 + libdpx0-0.5.0+git20110527-1bl1 + libField3D1.7-1.7.2-1bl2 + libfreetype6-2.6.5-1 + libgcc1-6.4.0-5 + libgif7-5.1.4-1 + libGL1-17.3.8-1 + libhdf5_10-1.8.20-1 + libilmbase12-2.2.0-1 + libIlmImf22-2.2.0-1 + libjpeg8-1.5.3-1 + libOpenColorIO1-1.0.9-1 + libopencv3.2-3.2.0-2 + libOpenImageIO-devel-1.8.10-1bl1 + libOpenImageIO1.8-1.8.10-1bl1 + libopenjp2_7-2.2.0-1 + libpng16-1.6.34-1 + libPtex0-2.1.33-1bl1 + libpugixml1-1.8-1 + libQt5Core5-5.9.4-1 + libQt5Gui5-5.9.4-1 + libraw16-0.18.5-1 + libsquish0.0-1.15-1bl1 + libstdc++6-6.4.0-5 + libtiff6-4.0.9-1 + libwebp7-0.6.1-2 + pkg-config-0.29.1-1 + python2-2.7.14-1 + zlib0-1.2.11-1 Build requirements: (besides corresponding -devel packages) - binutils-2.25-2 - cmake-3.1.2-1 - cygport-0.18.1-1 - gcc-core-4.9.2-3 - gcc-g++-4.9.2-3 - make-4.1-1 + binutils-2.29-1 + cmake-3.6.2-1 + cygport-0.31.0-1 + gcc-core-6.4.0-5 + gcc-g++-6.4.0-5 + make-4.2.1-2 + python-2.7.14-1 Canonical website: https://sites.google.com/site/openimageio/home Canonical download: - https://github.com/OpenImageIO/oiio/archive/Release-1.6.3dev.tar.gz + https://github.com/OpenImageIO/oiio/archive/Release-1.8.10.tar.gz ------------------------------------------- Build instructions: - 1. unpack OpenImageIO-1.6.3-X-src.tar.xz + 1. unpack OpenImageIO-1.8.10-X-src.tar.xz 2. if you use setup to install this src package, it will be unpacked under /usr/src automatically % cd /usr/src - % cygport ./OpenImageIO-1.6.3-X.cygport all + % cygport ./OpenImageIO-1.8.10-X.cygport all This will create: - /usr/src/OpenImageIO-1.6.3-X-src.tar.xz - /usr/src/OpenImageIO-1.6.3-X.tar.xz - /usr/src/libOpenImageIO1.6-1.6.3-X.tar.xz - /usr/src/libOpenImageIO-devel-1.6.3-X.tar.xz - /usr/src/python-OpenImageIO-1.6.3-X.tar.xz + /usr/src/OpenImageIO-1.8.10-X-src.tar.xz + /usr/src/OpenImageIO-1.8.10-X.tar.xz + /usr/src/libOpenImageIO1.8-1.8.10-X.tar.xz + /usr/src/libOpenImageIO-devel-1.8.10-X.tar.xz + /usr/src/python2-OpenImageIO-1.8.10-X.tar.xz ------------------------------------------- Files included in the binary package: (OpenImageIO) - /etc/postinstall/OpenImageIO.sh /usr/bin/iconvert.exe /usr/bin/idiff.exe /usr/bin/igrep.exe @@ -100,33 +85,40 @@ Files included in the binary package: /usr/bin/maketx.exe /usr/bin/oiiotool.exe /usr/share/doc/Cygwin/OpenImageIO.README - /usr/share/doc/OpenImageIO/CHANGES - /usr/share/doc/OpenImageIO/CREDITS + /usr/share/doc/OpenImageIO/CHANGES.md + /usr/share/doc/OpenImageIO/CONTRIBUTING.md + /usr/share/doc/OpenImageIO/CREDITS.md + /usr/share/doc/OpenImageIO/INSTALL.md /usr/share/doc/OpenImageIO/LICENSE - /usr/share/doc/OpenImageIO/README.rst - /usr/share/fonts/oiio/DroidSans-Bold.ttf - /usr/share/fonts/oiio/DroidSans.ttf - /usr/share/fonts/oiio/DroidSansMono.ttf - /usr/share/fonts/oiio/DroidSerif-Bold.ttf - /usr/share/fonts/oiio/DroidSerif-BoldItalic.ttf - /usr/share/fonts/oiio/DroidSerif-Italic.ttf - /usr/share/fonts/oiio/DroidSerif.ttf - -(libOpenImageIO1.6) - /usr/bin/cygOpenImageIO-1.6.dll - /usr/bin/cygOpenImageIO_Util-1.6.dll + /usr/share/doc/OpenImageIO/README.md + /usr/share/fonts/OpenImageIO/DroidSans-Bold.ttf + /usr/share/fonts/OpenImageIO/DroidSans.ttf + /usr/share/fonts/OpenImageIO/DroidSansMono.ttf + /usr/share/fonts/OpenImageIO/DroidSerif-Bold.ttf + /usr/share/fonts/OpenImageIO/DroidSerif-BoldItalic.ttf + /usr/share/fonts/OpenImageIO/DroidSerif-Italic.ttf + /usr/share/fonts/OpenImageIO/DroidSerif.ttf + +(libOpenImageIO1.8) + /usr/bin/cygOpenImageIO-1.8.dll + /usr/bin/cygOpenImageIO_Util-1.8.dll (libOpenImageIO-devel) /usr/include/OpenImageIO/SHA1.h /usr/include/OpenImageIO/argparse.h /usr/include/OpenImageIO/array_view.h + /usr/include/OpenImageIO/atomic.h + /usr/include/OpenImageIO/benchmark.h /usr/include/OpenImageIO/color.h /usr/include/OpenImageIO/dassert.h + /usr/include/OpenImageIO/deepdata.h /usr/include/OpenImageIO/errorhandler.h /usr/include/OpenImageIO/export.h /usr/include/OpenImageIO/filesystem.h /usr/include/OpenImageIO/filter.h /usr/include/OpenImageIO/fmath.h + /usr/include/OpenImageIO/fstream_mingw.h + /usr/include/OpenImageIO/function_view.h /usr/include/OpenImageIO/hash.h /usr/include/OpenImageIO/image_view.h /usr/include/OpenImageIO/imagebuf.h @@ -138,6 +130,7 @@ Files included in the binary package: /usr/include/OpenImageIO/oiioversion.h /usr/include/OpenImageIO/optparser.h /usr/include/OpenImageIO/osdep.h + /usr/include/OpenImageIO/parallel.h /usr/include/OpenImageIO/paramlist.h /usr/include/OpenImageIO/platform.h /usr/include/OpenImageIO/plugin.h @@ -159,15 +152,18 @@ Files included in the binary package: /usr/include/OpenImageIO/version.h /usr/lib/libOpenImageIO.dll.a /usr/lib/libOpenImageIO_Util.dll.a - /usr/lib/pkgconfig/openimageio.pc + /usr/lib/pkgconfig/OpenImageIO.pc -(python-OpenImageIO) - /usr/lib/python/site-packages/OpenImageIO.dll +(python2-OpenImageIO) + /usr/lib/python2.7/site-packages/OpenImageIO.dll ------------------ Port Notes: +----- version 1.8.10-1bl1 ----- +Version bump. + ----- version 1.6.3-1bl1 ----- Version bump. @@ -203,4 +199,3 @@ Version bump. ----- version 1.0.3-1bl1 ----- Initial release for Cygwin-1.7 by fd0 -