From 3b1a691bb06a04e6e851af6827d7d47db2ccfb7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 7 Mar 2021 10:36:04 +0100 Subject: [PATCH] - rediff patches --- OpenImageIO-link.patch | 7 ++++--- OpenImageIO-system-libcineon.patch | 14 ++++++++------ OpenImageIO-system-squish.patch | 16 +++++++++------- no-clang-format.patch | 7 ++++--- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/OpenImageIO-link.patch b/OpenImageIO-link.patch index c03daf5..df27e16 100644 --- a/OpenImageIO-link.patch +++ b/OpenImageIO-link.patch @@ -1,6 +1,7 @@ ---- OpenImageIO-oiio-4070df8/src/libutil/CMakeLists.txt~ 2015-12-19 07:44:03.000000000 +0100 -+++ OpenImageIO-oiio-4070df8/src/libutil/CMakeLists.txt 2015-12-26 10:54:02.944577313 +0100 -@@ -16,6 +16,7 @@ +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}) diff --git a/OpenImageIO-system-libcineon.patch b/OpenImageIO-system-libcineon.patch index 87e2ee2..861d402 100644 --- a/OpenImageIO-system-libcineon.patch +++ b/OpenImageIO-system-libcineon.patch @@ -1,13 +1,15 @@ ---- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100 -+++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt 2011-11-26 09:06:45.788174965 +0100 +diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/cineon.imageio/CMakeLists.txt oiio-Release-2.0.13/src/cineon.imageio/CMakeLists.txt +--- oiio-Release-2.0.13.org/src/cineon.imageio/CMakeLists.txt 2019-12-03 23:28:14.000000000 +0100 ++++ 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) ---- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineoninput.cpp.orig 2011-11-05 08:35:00.000000000 +0100 -+++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineoninput.cpp 2011-11-26 09:07:11.938175840 +0100 +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) */ @@ -15,5 +17,5 @@ -#include "libcineon/Cineon.h" +#include - #include "dassert.h" - #include "typedesc.h" + #include + #include diff --git a/OpenImageIO-system-squish.patch b/OpenImageIO-system-squish.patch index ad76121..e849691 100644 --- a/OpenImageIO-system-squish.patch +++ b/OpenImageIO-system-squish.patch @@ -1,16 +1,18 @@ ---- OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100 -+++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt 2011-11-18 21:22:02.993174921 +0100 -@@ -1,4 +1,1 @@ +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) ---- OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100 -+++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp 2011-11-18 21:30:04.823191054 +0100 +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 "imageio.h" - #include "fmath.h" + #include + #include -#include "squish/squish.h" +#include diff --git a/no-clang-format.patch b/no-clang-format.patch index a1fcc50..beee031 100644 --- a/no-clang-format.patch +++ b/no-clang-format.patch @@ -1,6 +1,7 @@ ---- OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake~ 2019-04-01 07:28:42.000000000 +0200 -+++ OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake 2019-04-21 11:32:25.692670361 +0200 -@@ -338,32 +338,6 @@ +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 () -- 2.44.0