openexr3.2, bump version (#10612)

This commit is contained in:
Schrijvers Luc
2024-06-20 12:16:43 +02:00
committed by GitHub
parent cd8e6edcf1
commit 6aca906c7b
2 changed files with 14 additions and 12 deletions

View File

@@ -10,7 +10,7 @@ COPYRIGHT="2021, Contributors to the OpenEXR Project."
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="65de6459c245a4977ce4d7777e70b30d7ef48ec38e0cfb10205706ca50a8bf2e"
CHECKSUM_SHA256="81e6518f2c4656fdeaf18a018f135e96a96e7f66dbe1c1f05860dd94772176cc"
SOURCE_FILENAME="openexr-$portVersion.tar.gz"
SOURCE_DIR="openexr-$portVersion"
PATCHES="openexr-$portVersion.patchset"
@@ -18,13 +18,13 @@ PATCHES="openexr-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="31.3.2.2"
libVersion="31.$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
libImathVersion="29.8.0"
libImathVersion="29.10.0"
libImathVersionCompat="$libImathVersion compat >= ${libImathVersion%%.*}"
PROVIDES="
openexr32$secondaryArchSuffix = $portVersion
openexr3.2$secondaryArchSuffix = $portVersion
lib:libIex_3_2$secondaryArchSuffix = $libVersionCompat
lib:libIlmThread_3_2$secondaryArchSuffix = $libVersionCompat
lib:libImath_3_1$secondaryArchSuffix = $libImathVersionCompat
@@ -42,24 +42,25 @@ CONFLICTS="
"
PROVIDES_tools="
openexr32${secondaryArchSuffix}_tools = $portVersion
openexr3.2${secondaryArchSuffix}_tools = $portVersion
cmd:exr2aces$secondaryArchSuffix = $portVersion
cmd:exrenvmap$secondaryArchSuffix = $portVersion
cmd:exrheader$secondaryArchSuffix = $portVersion
cmd:exrinfo$secondaryArchSuffix = $portVersion
cmd:exrmakepreview$secondaryArchSuffix = $portVersion
cmd:exrmaketiled$secondaryArchSuffix = $portVersion
cmd:exrmanifest$secondaryArchSuffix = $portVersion
cmd:exrmultipart$secondaryArchSuffix = $portVersion
cmd:exrmultiview$secondaryArchSuffix = $portVersion
cmd:exrstdattr$secondaryArchSuffix = $portVersion
"
REQUIRES_tools="
$REQUIRES
openexr32$secondaryArchSuffix == $portVersion base
openexr3.2$secondaryArchSuffix == $portVersion base
"
PROVIDES_devel="
openexr32${secondaryArchSuffix}_devel = $portVersion
openexr3.2${secondaryArchSuffix}_devel = $portVersion
devel:libIex_3_2$secondaryArchSuffix = $libVersionCompat
devel:libIlmThread_3_2$secondaryArchSuffix = $libVersionCompat
devel:libImath_3_1$secondaryArchSuffix = $libImathVersionCompat
@@ -74,7 +75,7 @@ PROVIDES_devel="
devel:libOpenEXRUtil$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
openexr32$secondaryArchSuffix == $portVersion base
openexr3.2$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
openexr${secondaryArchSuffix}_devel
@@ -94,6 +95,7 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python3
"
BUILD()

View File

@@ -1,16 +1,16 @@
From 91bbf0c150b298de0a0530e2b7cca2846bd51bf9 Mon Sep 17 00:00:00 2001
From 90e9ecb91b585659ce6e1ed00d977c8c3bf80b07 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 26 Oct 2019 20:01:01 +0200
Subject: define bswap_32 for Haiku.
diff --git a/src/test/OpenEXRTest/bswap_32.h b/src/test/OpenEXRTest/bswap_32.h
index f67cc03..39ac3a3 100644
index 33c636b..8f0cdb9 100644
--- a/src/test/OpenEXRTest/bswap_32.h
+++ b/src/test/OpenEXRTest/bswap_32.h
@@ -22,6 +22,9 @@
# include <sys/bswap.h>
# include <sys/types.h>
# include <machine/bswap.h>
# define bswap_32(x) bswap32 (x)
+#elif defined(__HAIKU__)
+# include <ByteOrder.h>
@@ -19,5 +19,5 @@ index f67cc03..39ac3a3 100644
# include <byteswap.h>
#endif
--
2.43.2
2.45.1