4 files changed, 76 insertions, 37 deletions
diff --git a/graphics/openimageio/ffmpeg-5.1.diff b/graphics/openimageio/ffmpeg-5.1.diff
new file mode 100644
index 0000000000..6d3633c831
--- /dev/null
+++ b/graphics/openimageio/ffmpeg-5.1.diff
@@ -0,0 +1,37 @@
+From b4b3e26d3b58a4f0feee175290ec7bb4924ebec3 Mon Sep 17 00:00:00 2001
+From: Michael Cho <cho-m@tuta.io>
+Date: Thu, 11 Aug 2022 23:29:06 -0700
+Subject: [PATCH] cmake: fix ffmpeg 5.1 detection (#3516)
+
+---
+ src/cmake/modules/FindFFmpeg.cmake | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/cmake/modules/FindFFmpeg.cmake b/src/cmake/modules/FindFFmpeg.cmake
+index bb1e9d65fa..0e5ac2979a 100644
+--- a/src/cmake/modules/FindFFmpeg.cmake
++++ b/src/cmake/modules/FindFFmpeg.cmake
+@@ -59,7 +59,11 @@ else ()
+ endif ()
+ 
+ if (FFMPEG_INCLUDES)
+-  file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
++  set (_libavcodec_version_major_h "${FFMPEG_INCLUDES}/libavcodec/version_major.h")
++  if (NOT EXISTS "${_libavcodec_version_major_h}")
++    set (_libavcodec_version_major_h "${FFMPEG_INCLUDES}/libavcodec/version.h")
++  endif()
++  file(STRINGS "${_libavcodec_version_major_h}" TMP
+        REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
+   string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR "${TMP}")
+   file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+@@ -69,7 +73,9 @@ if (FFMPEG_INCLUDES)
+        REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
+   string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO "${TMP}")
+   set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
+-  if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
++  if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.37.100)
++      set (FFMPEG_VERSION 5.1)
++  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
+       set (FFMPEG_VERSION 5.0)
+   elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.134.100)
+       set (FFMPEG_VERSION 4.4)
diff --git a/graphics/openimageio/oiio-include-cstdio.diff b/graphics/openimageio/oiio-include-cstdio.diff
deleted file mode 100644
index 48d6aad832..0000000000
--- a/graphics/openimageio/oiio-include-cstdio.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/jpeg2000.imageio/jpeg2000output-v1.cpp.orig	2019-08-02 13:53:54.000000000 +1000
-+++ src/jpeg2000.imageio/jpeg2000output-v1.cpp	2019-08-07 21:54:04.354000000 +1000
-@@ -28,6 +28,7 @@
-   (This is the Modified BSD License)
- */
- 
-+#include <cstdio>
- #include <vector>
- 
- #include "openjpeg.h"
diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild
index 0e7e19edb3..5be9a3d692 100644
--- a/graphics/openimageio/openimageio.SlackBuild
+++ b/graphics/openimageio/openimageio.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openimageio
 
-# Copyright 2015-2019 Christoph Willing Brisbane, Australia
+# Copyright 2015-2023 Christoph Willing Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openimageio
-SRCNAM=oiio-Release
-VERSION=${VERSION:-2.0.10}
-BUILD=${BUILD:-1}
+SRCNAM=OpenImageIO-Release
+VERSION=${VERSION:-2.2.21.0}
+FMT=${FMT:-"fmt-7.1.3"}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
-
-PYLIB_INSTALL_DIRECTORY=$(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-PYLIB3_INSTALL_DIRECTORY=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,10 +71,18 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $SRCNAM-$VERSION
+tar xf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
-patch -p0 < $CWD/oiio-include-cstdio.diff
+patch -p1 < $CWD/ffmpeg-5.1.diff
+
+# Use private fmt
+mkdir -p ext
+cd ext
+tar xf $CWD/${FMT}.tar.gz
+ln -s $FMT fmt
+cd ..
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,26 +90,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# save this for GCC 7.0
-#sed -i "s|std=c++11|std=c++11 -Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new|" CMakeLists.txt
-
 mkdir -p build
 cd build
   cmake ../ \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-    -DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
-    -DOPENJPEG_OPENJPEG_LIBRARY_RELEASE="/usr/lib${LIBDIRSUFFIX}/libopenmj2.so" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fcommon" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_FMT_FORCE:BOOL=TRUE \
     -DPYLIB_INCLUDE_SONAME:BOOL=TRUE \
     -DPYLIB_LIB_PREFIX:BOOL=FALSE \
-    -DUSE_OCIO:BOOL=TRUE \
-    -DUSE_OPENJPEG:BOOL=TRUE \
+    -DUSE_OPENJPEG:BOOL=FALSE \
     -DOIIO_BUILD_TESTS:BOOL=FALSE \
     -DUSE_PYTHON:BOOL=TRUE \
-    -DUSE_EXTERNAL_PUGIXML:BOOL=FALSE \
-    -DPYBIND11_INCLUDE_DIR:STRING=/usr/include/python2.7 \
+    -DPYTHON_VERSION=$(python3 --version | cut -d' ' -f2) \
 
   make
   make install DESTDIR=$PKG
@@ -110,4 +120,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/openimageio/openimageio.info b/graphics/openimageio/openimageio.info
index 9b3f6f5d1d..6149a876d1 100644
--- a/graphics/openimageio/openimageio.info
+++ b/graphics/openimageio/openimageio.info
@@ -1,10 +1,12 @@
 PRGNAM="openimageio"
-VERSION="2.0.10"
+VERSION="2.2.21.0"
 HOMEPAGE="https://sites.google.com/site/openimageio/home"
-DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/Release-2.0.10/oiio-Release-2.0.10.tar.gz"
-MD5SUM="b29934b036e83029d6bb89273de2e0c8"
+DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/Release-2.2.21.0/OpenImageIO-Release-2.2.21.0.tar.gz \
+	https://github.com/fmtlib/fmt/archive/7.1.3/fmt-7.1.3.tar.gz"
+MD5SUM="384ba30cadc2ceb62edd3895b797a6d1 \
+	2522ec65070c0bda0ca288677ded2831"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg libwebp opencv opencolorio pybind11 robin-map qt5 dcmtk"
+REQUIRES="opencolorio robin-map dcmtk hdf5"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"