- rediff patches

[packages/OpenImageIO.git] / OpenImageIO-system-squish.patch

diff --git a/OpenImageIO-system-squish.patch b/OpenImageIO-system-squish.patch
index ad7612149c0d7c557327a10707dcf9d5b2671c7e..e8496910264720276bf9a2e0e609daa736e5b889 100644 (file)
--- 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 <OpenImageIO/imageio.h>
+ #include <OpenImageIO/typedesc.h>
  
 -#include "squish/squish.h"
 +#include <squish.h>