haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

OIIO: bump (#6460)

Browse Source 
* OIIO: bump

Co-authored-by: begasus <begasus@gmail.com>
This commit is contained in:
extrowerk
2022-04-11 08:34:13 +02:00
committed by GitHub
parent d9117df2fd
commit 4e5bcfdb53
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media-libs/openimageio/openimageio-2.2.16.0.recipe → media-libs/openimageio/openimageio-2.3.10.0.recipe
View File

@@ -9,16 +9,16 @@ HOMEPAGE="https://github.com/OpenImageIO/"
COPYRIGHT="2008-present Contributors to the OpenImageIO project."
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="d1a59f32dbba3ba71ad2e62e107034d1c5287bca1b0696474e927d504cd05ef4"
SOURCE_URI="$HOMEPAGE/oiio/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="3b8a43135792373da7d8897a5937dce96cfd2a2bfb92ff8c51a870df1e9cfbd9"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
SOURCE_DIR="oiio-Release-$portVersion"
SOURCE_DIR="oiio-$portVersion"
PATCHES="openimageio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="2.2.16"
libVersion="2.3.10"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -108,6 +108,10 @@ BUILD_PREREQUIRES="
cmd:python3
"
TEST_REQUIRES="
cmd:git
"
defineDebugInfoPackage openimageio$secondaryArchSuffix \
$binDir/iconvert \
$binDir/idiff \
@@ -125,7 +129,9 @@ BUILD()
-DUSE_PYTHON=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DOIIO_BUILD_TESTS=OFF \
-DBUILD_TESTING=OFF
-DBUILD_TESTING=OFF \
-DOIIO_BUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=Release
make -C build $jobArgs
}

16
media-libs/openimageio/patches/openimageio-2.2.16.0.patchset → media-libs/openimageio/patches/openimageio-2.3.10.0.patchset
View File

@@ -1,4 +1,4 @@
From 6b3879484f08f799f8261336d3fb3e7297400127 Mon Sep 17 00:00:00 2001
From bdebf5dd0e91a422066460ca9c272504819af6d0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 7 Jun 2015 22:05:26 +0000
Subject: Haiku patch
@@ -23,10 +23,10 @@ index a1ea8bd..9015ce7 100644
#undef bswap_32
diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
index 7b89dc0..4abe293 100644
index 699d592..059af0f 100644
--- a/src/libOpenImageIO/CMakeLists.txt
+++ b/src/libOpenImageIO/CMakeLists.txt
@@ -176,7 +176,9 @@ if (MINGW)
@@ -166,7 +166,9 @@ if (MINGW)
target_link_libraries (OpenImageIO PRIVATE ws2_32)
endif()
@@ -38,10 +38,10 @@ index 7b89dc0..4abe293 100644
if (MSVC)
# In some MSVC setups, the IBA functions with huge template expansions
diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
index 61edc0b..4627990 100644
index 9732df5..5940e70 100644
--- a/src/libutil/sysutil.cpp
+++ b/src/libutil/sysutil.cpp
@@ -58,6 +58,12 @@
@@ -59,6 +59,12 @@
# include <unistd.h>
#endif
@@ -54,7 +54,7 @@ index 61edc0b..4627990 100644
#include <OpenImageIO/dassert.h>
#include <OpenImageIO/strutil.h>
#include <OpenImageIO/sysutil.h>
@@ -255,7 +261,7 @@ Sysutil::this_program_path()
@@ -275,7 +281,7 @@ Sysutil::this_program_path()
size_t cb = sizeof(filename);
int r = 1;
sysctl(mib, 4, filename, &cb, NULL, 0);
@@ -101,14 +101,14 @@ index 90fd11b..a28ee3e 100644
2.30.2
From adfd806d493760052597972e8be99dc1eba4ace7 Mon Sep 17 00:00:00 2001
From b625b70c76a765d38af3a9af3dc163eb35e46ee0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Nov 2019 23:18:49 +0100
Subject: tiff uses uint32 instead of uint32_t
diff --git a/src/tiff.imageio/tiffinput.cpp b/src/tiff.imageio/tiffinput.cpp
index 01c52a4..a651689 100644
index 650b1b1..ea5d0b6 100644
--- a/src/tiff.imageio/tiffinput.cpp
+++ b/src/tiff.imageio/tiffinput.cpp
@@ -8,6 +8,7 @@