+++ /dev/null
-diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/libutil/CMakeLists.txt oiio-Release-2.0.13/src/libutil/CMakeLists.txt
---- oiio-Release-2.0.13.org/src/libutil/CMakeLists.txt 2019-12-03 23:28:14.000000000 +0100
-+++ oiio-Release-2.0.13/src/libutil/CMakeLists.txt 2021-03-07 10:21:58.680334785 +0100
-@@ -16,6 +16,7 @@ if (WIN32)
- target_link_libraries (OpenImageIO_Util psapi.lib)
- endif ()
- target_link_libraries (OpenImageIO_Util ${ILMBASE_LIBRARIES})
-+target_link_libraries (OpenImageIO_Util ${CMAKE_DL_LIBS})
-
- if (VERBOSE)
- message(STATUS "Setting SOVERSION to: ${SOVERSION}")
+++ oiio-Release-2.0.13/src/cineon.imageio/CMakeLists.txt 2021-03-07 10:21:59.867138452 +0100
@@ -1,4 +1,2 @@
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)
-+ LINK_LIBRARIES cineon)
+- libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp
+- libcineon/Reader.cpp libcineon/Writer.cpp libcineon/CineonHeader.cpp
+- libcineon/ElementReadStream.cpp libcineon/InStream.cpp)
++ LINK_LIBRARIES cineon)
diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/cineon.imageio/cineoninput.cpp oiio-Release-2.0.13/src/cineon.imageio/cineoninput.cpp
--- oiio-Release-2.0.13.org/src/cineon.imageio/cineoninput.cpp 2019-12-03 23:28:14.000000000 +0100
+++ oiio-Release-2.0.13/src/cineon.imageio/cineoninput.cpp 2021-03-07 10:21:59.867138452 +0100
@@ -28,7 +28,7 @@
- (This is the Modified BSD License)
- */
+
+ #include <cmath>
-#include "libcineon/Cineon.h"
+#include <Cineon.h>
#include <OpenImageIO/dassert.h>
- #include <OpenImageIO/fmath.h>
+ #include <OpenImageIO/imageio.h>
+++ /dev/null
-diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/dds.imageio/CMakeLists.txt oiio-Release-2.0.13/src/dds.imageio/CMakeLists.txt
---- oiio-Release-2.0.13.org/src/dds.imageio/CMakeLists.txt 2019-12-03 23:28:14.000000000 +0100
-+++ oiio-Release-2.0.13/src/dds.imageio/CMakeLists.txt 2021-03-07 10:21:59.270402883 +0100
-@@ -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 LINK_LIBRARIES squish)
-diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/dds.imageio/ddsinput.cpp oiio-Release-2.0.13/src/dds.imageio/ddsinput.cpp
---- oiio-Release-2.0.13.org/src/dds.imageio/ddsinput.cpp 2019-12-03 23:28:14.000000000 +0100
-+++ oiio-Release-2.0.13/src/dds.imageio/ddsinput.cpp 2021-03-07 10:21:59.273736603 +0100
-@@ -39,7 +39,7 @@
- #include <OpenImageIO/imageio.h>
- #include <OpenImageIO/typedesc.h>
-
--#include "squish/squish.h"
-+#include <squish.h>
-
- OIIO_PLUGIN_NAMESPACE_BEGIN
-
Summary: Library for reading and writing images
Summary(pl.UTF-8): Biblioteka do odczytu i zapisu obrazów
Name: OpenImageIO
-Version: 2.0.13
-Release: 6
+Version: 2.3.12.0
+Release: 0.1
License: BSD
Group: Libraries
#Source0Download: https://github.com/OpenImageIO/oiio/releases
-Source0: https://github.com/OpenImageIO/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 76ce4d246409de331ad04453423479bf
-Patch0: %{name}-link.patch
-Patch1: %{name}-system-squish.patch
+Source0: https://github.com/OpenImageIO/oiio/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e109c5a4e6844f1f58c91ec7a991dbd7
Patch2: %{name}-system-libcineon.patch
Patch3: no-clang-format.patch
-Patch4: tiff_defines.patch
URL: https://github.com/OpenImageIO/oiio
BuildRequires: Field3D-devel
%{?with_ocio:BuildRequires: OpenColorIO-devel}
Wiązanie Pythona do biblioteki OpenImageIO.
%prep
-%setup -q -n oiio-Release-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n oiio-%{version}
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%{__rm} -r src/dds.imageio/squish
-# when using system pugixml, don't use hacked headers
-%{__rm} src/include/OpenImageIO/pugi*.{c,h}pp
%build
install -d build
-diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/cmake/compiler.cmake oiio-Release-2.0.13/src/cmake/compiler.cmake
---- oiio-Release-2.0.13.org/src/cmake/compiler.cmake 2019-12-03 23:28:14.000000000 +0100
-+++ oiio-Release-2.0.13/src/cmake/compiler.cmake 2021-03-07 10:22:00.460540342 +0100
-@@ -338,32 +338,6 @@ if (CLANG_TIDY)
- # Hint: run with CLANG_TIDY_ARGS=-list-checks to list all the checks
- endif ()
+--- oiio-2.3.12.0/src/cmake/compiler.cmake.orig 2022-02-05 17:02:29.480576995 +0100
++++ oiio-2.3.12.0/src/cmake/compiler.cmake 2022-02-05 17:03:59.121664048 +0100
+@@ -432,54 +432,6 @@
--# clang-format
--find_program (CLANG_FORMAT_EXE
-- NAMES clang-format bin/clang-format
-- HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
-- ENV LLVM_DIRECTORY
-- NO_DEFAULT_PATH
-- DOC "Path to clang-format executable")
--find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
--if (CLANG_FORMAT_EXE)
-- message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
-- # Start with the list of files to include when formatting...
-- file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
-- # ... then process any list of excludes we are given
-- foreach (_pat ${CLANG_FORMAT_EXCLUDES})
-- file (GLOB_RECURSE _excl ${_pat})
-- list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
-- endforeach ()
-- #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
-- file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
-- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-- add_custom_target (clang-format
-- COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
--else ()
-- message (STATUS "clang-format not found.")
+
+ ###########################################################################
+-# clang-format options
+-#
+-# clang-format is a source code reformatter that is part of the LLVM tools.
+-# It can be used to check adherence to project code formatting rules and
+-# correct any deviations. If clang-format is found on the system, a
+-# "clang-format" build target will trigger a reformatting.
+-#
+-# Note: skip all of this checking, setup, and cmake-format target if this
+-# is being built as a subproject.
+-if (PROJECT_IS_TOP_LEVEL)
+- set (CLANG_FORMAT_EXE_HINT "" CACHE PATH "clang-format executable's directory (will search if not specified")
+- set (CLANG_FORMAT_INCLUDES "src/*.h" "src/*.cpp"
+- CACHE STRING "Glob patterns to include for clang-format")
+- set (CLANG_FORMAT_EXCLUDES "*pugixml*" "*SHA1*" "*/farmhash.cpp"
+- "src/dpx.imageio/libdpx/*"
+- "src/cineon.imageio/libcineon/*"
+- "src/dds.imageio/squish/*"
+- "src/gif.imageio/gif.h"
+- "src/hdr.imageio/rgbe.cpp"
+- "src/libutil/stb_sprintf.h"
+- CACHE STRING "Glob patterns to exclude for clang-format")
+- find_program (CLANG_FORMAT_EXE
+- NAMES clang-format bin/clang-format
+- HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
+- ENV LLVM_DIRECTORY
+- NO_DEFAULT_PATH
+- DOC "Path to clang-format executable")
+- find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
+- if (CLANG_FORMAT_EXE)
+- message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
+- # Start with the list of files to include when formatting...
+- file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
+- # ... then process any list of excludes we are given
+- foreach (_pat ${CLANG_FORMAT_EXCLUDES})
+- file (GLOB_RECURSE _excl ${_pat})
+- list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
+- endforeach ()
+- #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
+- file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
+- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+- add_custom_target (clang-format
+- COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
+- else ()
+- message (STATUS "clang-format not found.")
+- endif ()
-endif ()
-
-
- if (EXTRA_CPP_ARGS)
- message (STATUS "Extra C++ args: ${EXTRA_CPP_ARGS}")
+-###########################################################################
+ # Another way to sneak in custom compiler and DSO linking flags.
+ #
+ set (EXTRA_CPP_ARGS "" CACHE STRING "Extra C++ command line definitions")
+++ /dev/null
-From 571c8dd95c455804d9ede351d53b3eea8d47564b Mon Sep 17 00:00:00 2001
-From: Larry Gritz <lg@larrygritz.com>
-Date: Fri, 3 Apr 2020 09:47:07 -0700
-Subject: [PATCH] Protect against double definitions of GPSTAG values. (#2539)
-
-Prerelease snapshots of libtiff now define these in tiff.h.
----
- src/libOpenImageIO/exif.cpp | 70 ++++++++++++++++++++-----------------
- 1 file changed, 37 insertions(+), 33 deletions(-)
-
-diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp
-index d997f4c16e..51cb9ef911 100644
---- a/src/libOpenImageIO/exif.cpp
-+++ b/src/libOpenImageIO/exif.cpp
-@@ -528,40 +528,44 @@ pvt::exif_tagmap_ref()
-
-
-
-+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define
-+// them ourselves.
-+#ifndef GPSTAG_VERSIONID
- enum GPSTag {
-- GPSTAG_VERSIONID = 0,
-- GPSTAG_LATITUDEREF = 1,
-- GPSTAG_LATITUDE = 2,
-- GPSTAG_LONGITUDEREF = 3,
-- GPSTAG_LONGITUDE = 4,
-- GPSTAG_ALTITUDEREF = 5,
-- GPSTAG_ALTITUDE = 6,
-- GPSTAG_TIMESTAMP = 7,
-- GPSTAG_SATELLITES = 8,
-- GPSTAG_STATUS = 9,
-- GPSTAG_MEASUREMODE = 10,
-- GPSTAG_DOP = 11,
-- GPSTAG_SPEEDREF = 12,
-- GPSTAG_SPEED = 13,
-- GPSTAG_TRACKREF = 14,
-- GPSTAG_TRACK = 15,
-- GPSTAG_IMGDIRECTIONREF = 16,
-- GPSTAG_IMGDIRECTION = 17,
-- GPSTAG_MAPDATUM = 18,
-- GPSTAG_DESTLATITUDEREF = 19,
-- GPSTAG_DESTLATITUDE = 20,
-- GPSTAG_DESTLONGITUDEREF = 21,
-- GPSTAG_DESTLONGITUDE = 22,
-- GPSTAG_DESTBEARINGREF = 23,
-- GPSTAG_DESTBEARING = 24,
-- GPSTAG_DESTDISTANCEREF = 25,
-- GPSTAG_DESTDISTANCE = 26,
-- GPSTAG_PROCESSINGMETHOD = 27,
-- GPSTAG_AREAINFORMATION = 28,
-- GPSTAG_DATESTAMP = 29,
-- GPSTAG_DIFFERENTIAL = 30,
-- GPSTAG_HPOSITIONINGERROR = 31
-+ GPSTAG_VERSIONID = 0,
-+ GPSTAG_LATITUDEREF = 1,
-+ GPSTAG_LATITUDE = 2,
-+ GPSTAG_LONGITUDEREF = 3,
-+ GPSTAG_LONGITUDE = 4,
-+ GPSTAG_ALTITUDEREF = 5,
-+ GPSTAG_ALTITUDE = 6,
-+ GPSTAG_TIMESTAMP = 7,
-+ GPSTAG_SATELLITES = 8,
-+ GPSTAG_STATUS = 9,
-+ GPSTAG_MEASUREMODE = 10,
-+ GPSTAG_DOP = 11,
-+ GPSTAG_SPEEDREF = 12,
-+ GPSTAG_SPEED = 13,
-+ GPSTAG_TRACKREF = 14,
-+ GPSTAG_TRACK = 15,
-+ GPSTAG_IMGDIRECTIONREF = 16,
-+ GPSTAG_IMGDIRECTION = 17,
-+ GPSTAG_MAPDATUM = 18,
-+ GPSTAG_DESTLATITUDEREF = 19,
-+ GPSTAG_DESTLATITUDE = 20,
-+ GPSTAG_DESTLONGITUDEREF = 21,
-+ GPSTAG_DESTLONGITUDE = 22,
-+ GPSTAG_DESTBEARINGREF = 23,
-+ GPSTAG_DESTBEARING = 24,
-+ GPSTAG_DESTDISTANCEREF = 25,
-+ GPSTAG_DESTDISTANCE = 26,
-+ GPSTAG_PROCESSINGMETHOD = 27,
-+ GPSTAG_AREAINFORMATION = 28,
-+ GPSTAG_DATESTAMP = 29,
-+ GPSTAG_DIFFERENTIAL = 30,
-+ GPSTAG_GPSHPOSITIONINGERROR = 31
- };
-+#endif
-
- static const TagInfo gps_tag_table[] = {
- // clang-format off
-@@ -596,7 +600,7 @@ static const TagInfo gps_tag_table[] = {
- { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 },
- { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 },
- { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 },
-- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }
-+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }
- // clang-format on
- };
-
projects / packages / OpenImageIO.git / commitdiff