haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

openimageio2.3, rename recipe, drop obselete ones (#10614)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-06-21 18:37:26 +02:00
committed by GitHub
parent 6ab78c3219
commit aa6b22e54f
7 changed files with 7 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
media-libs/openimageio/openimageio-1.7.15.recipe
View File

@@ -1,112 +0,0 @@
SUMMARY="A library to read and write images"
DESCRIPTION="OpenImageIO is a library for reading and writing images, and a \
bunch of related classes, utilities, and applications. There is a particular \
emphasis on formats and functionality used in professional, large-scale \
animation and visual effects work for film.
OpenImageIO is used extensively in animation and VFX studios all over the \
world, and is also incorporated into several commercial products."
HOMEPAGE="https://github.com/OpenImageIO/"
COPYRIGHT="2008-2017 Larry Gritz et al."
LICENSE="BSD (3-clause)"
REVISION="4"
SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="5db80981a3f87ad4a2a0c684884ad28f8c879570318dc79ba485b69e6fe77e73"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
SOURCE_DIR="oiio-Release-$portVersion"
PATCHES="openimageio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
openimageio$secondaryArchSuffix = $portVersion
cmd:iconvert
cmd:idiff
cmd:igrep
cmd:iinfo
cmd:maketx
cmd:oiiotool
lib:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.7
lib:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.7
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_atomic$secondaryArchSuffix
lib:libboost_chrono$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libglew$secondaryArchSuffix
lib:libhalf$secondaryArchSuffix
lib:libilmimf$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libopencolorio$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libssl$secondaryArchSuffix #yeah, really
lib:libtiff$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
openimageio${secondaryArchSuffix}_devel = $portVersion
devel:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.7
devel:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.7
"
REQUIRES_devel="
openimageio$secondaryArchSuffix == $portVersion base
devel:libboost_system$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
devel:libhalf$secondaryArchSuffix
devel:libilmimf$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
export CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR"
make USE_OPENSSL=1 $jobArgs
}
INSTALL()
{
mkdir -p $binDir $libDir $includeDir $docDir
cp -R dist/haiku*/bin/* $binDir/
cp -R dist/haiku*/lib/* $libDir/
cp -R dist/haiku*/include/* $includeDir/
cp -R dist/haiku*/doc/* $docDir/
prepareInstalledDevelLibs libOpenImageIO libOpenImageIO_Util
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

119
media-libs/openimageio/openimageio-1.7.17.recipe
View File

@@ -1,119 +0,0 @@
SUMMARY="A library to read and write images"
DESCRIPTION="OpenImageIO is a library for reading and writing images, and a \
bunch of related classes, utilities, and applications. There is a particular \
emphasis on formats and functionality used in professional, large-scale \
animation and visual effects work for film.
OpenImageIO is used extensively in animation and VFX studios all over the \
world, and is also incorporated into several commercial products."
HOMEPAGE="https://github.com/OpenImageIO/"
COPYRIGHT="2008-2017 Larry Gritz et al."
LICENSE="BSD (3-clause)"
REVISION="4"
SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
SOURCE_DIR="oiio-Release-$portVersion"
PATCHES="openimageio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
openimageio$secondaryArchSuffix = $portVersion
cmd:iconvert
cmd:idiff
cmd:igrep
cmd:iinfo
cmd:maketx
cmd:oiiotool
lib:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.8
lib:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.8
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_atomic$secondaryArchSuffix
lib:libboost_chrono$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libglew$secondaryArchSuffix
lib:libhalf$secondaryArchSuffix
lib:libilmimf$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libopencolorio$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libssl$secondaryArchSuffix #yeah, really
lib:libtiff$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
openimageio${secondaryArchSuffix}_devel = $portVersion
devel:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.8
devel:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.8
"
REQUIRES_devel="
openimageio$secondaryArchSuffix == $portVersion base
devel:libboost_system$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
devel:libhalf$secondaryArchSuffix
devel:libilmimf$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
mkdir -p build
cd build
cmake .. \
-DUSE_OPENSSL=ON \
-DUSE_PYTHON=OFF \
-DCMAKE_CXX_FLAGS="-DBOOST_NO_CXX11_CONSTEXPR" \
-DDOC_INSTALL_DIR=$docDir \
-DFONTS_INSTALL_DIR="$fontsDir/ttfonts" \
-DINCLUDE_INSTALL_DIR=$includeDir \
-DMAN_INSTALL_DIR=$manDir \
$cmakeDirArgs
make $jobArgs
}
INSTALL()
{
cd build
make install
prepareInstalledDevelLibs libOpenImageIO libOpenImageIO_Util
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

136
media-libs/openimageio/openimageio-1.8.6.recipe
View File

@@ -1,136 +0,0 @@
SUMMARY="A library to read and write images"
DESCRIPTION="OpenImageIO is a library for reading and writing images, and a \
bunch of related classes, utilities, and applications. There is a particular \
emphasis on formats and functionality used in professional, large-scale \
animation and visual effects work for film.
OpenImageIO is used extensively in animation and VFX studios all over the \
world, and is also incorporated into several commercial products."
HOMEPAGE="https://github.com/OpenImageIO/"
COPYRIGHT="2008-2017 Larry Gritz et al."
LICENSE="BSD (3-clause)"
REVISION="10"
SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="9e070d56c0f71496ca77290a78abd948af9c2799983bc27c22a36dcc16ffe2e3"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
SOURCE_DIR="oiio-Release-$portVersion"
PATCHES="openimageio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
openimageio$secondaryArchSuffix = $portVersion
cmd:iconvert
cmd:idiff
cmd:igrep
cmd:iinfo
cmd:maketx
cmd:oiiotool
lib:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.8
lib:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.8
"
REQUIRES="
haiku$secondaryArchSuffix
# lib:libavcodec$secondaryArchSuffix
lib:libboost_atomic$secondaryArchSuffix
lib:libboost_chrono$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libglew$secondaryArchSuffix
lib:libhalf$secondaryArchSuffix
# lib:libhdf5$secondaryArchSuffix
lib:libilmimf$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libopencolorio$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpugixml$secondaryArchSuffix
lib:libraw$secondaryArchSuffix
lib:libssl$secondaryArchSuffix #yeah, really
lib:libtiff$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
openimageio${secondaryArchSuffix}_devel = $portVersion
devel:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.8
devel:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.8
"
REQUIRES_devel="
openimageio$secondaryArchSuffix == $portVersion base
devel:libboost_system$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
# devel:libavcodec$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
devel:libhalf$secondaryArchSuffix
# devel:libhdf5$secondaryArchSuffix
devel:libilmimf$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpugixml$secondaryArchSuffix
devel:libraw$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage openimageio$secondaryArchSuffix \
$binDir/iconvert \
$binDir/idiff \
$binDir/igrep \
$binDir/iinfo \
$binDir/maketx \
$binDir/oiiotool \
$libDir/libOpenImageIO.so.$portVersion \
$libDir/libOpenImageIO_Util.so.$portVersion
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DUSE_OPENSSL=ON \
-DUSE_PYTHON=OFF \
-DCMAKE_CXX_FLAGS="-DBOOST_NO_CXX11_CONSTEXPR" \
-DDOC_INSTALL_DIR=$docDir \
-DFONTS_INSTALL_DIR="$fontsDir/ttfonts" \
-DINCLUDE_INSTALL_DIR=$includeDir/OpenImageIO \
-DMAN_INSTALL_DIR=$manDir \
-DUSE_EXTERNAL_PUGIXML=ON \
$cmakeDirArgs
make -C build $jobArgs
}
INSTALL()
{
make -C build install
prepareInstalledDevelLibs libOpenImageIO libOpenImageIO_Util
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

12
media-libs/openimageio/openimageio-2.3.10.0.recipe → media-libs/openimageio/openimageio2.3-2.3.10.0.recipe
View File

@@ -8,7 +8,7 @@ world, and is also incorporated into several commercial products."
HOMEPAGE="https://github.com/OpenImageIO/"
COPYRIGHT="2008-present Contributors to the OpenImageIO project."
LICENSE="BSD (3-clause)"
REVISION="4"
REVISION="5"
SOURCE_URI="$HOMEPAGE/oiio/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="23e2dc4b0fe82f1ccbc794b29608a3022aa9728cda766026dd7e1d4c0fc40f69"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
@@ -29,7 +29,7 @@ libVersion="2.3.10"
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
PROVIDES="
openimageio$secondaryArchSuffix = $portVersion
openimageio2.3$secondaryArchSuffix = $portVersion
cmd:iconvert$commandSuffix = $portVersion
cmd:idiff$commandSuffix = $portVersion
cmd:igrep$commandSuffix = $portVersion
@@ -71,12 +71,12 @@ REQUIRES="
"
PROVIDES_devel="
openimageio${secondaryArchSuffix}_devel = $portVersion
openimageio2.3${secondaryArchSuffix}_devel = $portVersion
devel:libOpenImageIO$secondaryArchSuffix = $libVersionCompat
devel:libOpenImageIO_Util$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
openimageio$secondaryArchSuffix == $portVersion base
openimageio2.3$secondaryArchSuffix == $portVersion base
devel:libboost_system$secondaryArchSuffix
"
@@ -85,6 +85,7 @@ BUILD_REQUIRES="
devel:libboost_system$secondaryArchSuffix >= 1.83.0
devel:libbz2$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libdeflate$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libfmt$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
@@ -116,7 +117,7 @@ BUILD_PREREQUIRES="
cmd:python3
"
defineDebugInfoPackage openimageio$secondaryArchSuffix \
defineDebugInfoPackage openimageio2.3$secondaryArchSuffix \
$commandBinDir/iconvert \
$commandBinDir/idiff \
$commandBinDir/igrep \
@@ -131,6 +132,7 @@ BUILD()
cmake -B build -S . \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DINSTALL_FONTS:BOOL=OFF \
-DUSE_PYTHON=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DBUILD_TESTING=OFF \

119
media-libs/openimageio/patches/openimageio-1.7.15.patchset
View File

@@ -1,119 +0,0 @@
From 0d155647f10278b130cf4cd74489665177656d35 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
diff --git a/src/libutil/farmhash.cpp b/src/libutil/farmhash.cpp
index 256ce4d..e8baa21 100644
--- a/src/libutil/farmhash.cpp
+++ b/src/libutil/farmhash.cpp
@@ -159,6 +159,13 @@
#define bswap_64(x) bswap64(x)
#endif
+#elif defined(__HAIKU__)
+
+#undef bswap_32
+#undef bswap_64
+#define bswap_32 __builtin_bswap32
+#define bswap_64 __builtin_bswap64
+
#else
#undef bswap_32
diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
index 0aa25c0..c061ccc 100644
--- a/src/libutil/sysutil.cpp
+++ b/src/libutil/sysutil.cpp
@@ -77,6 +77,12 @@
# include <sys/ioctl.h>
#endif
+#if defined (__HAIKU__)
+# include <sys/types.h>
+# include <sys/resource.h>
+# include <unistd.h>
+#endif
+
#include <OpenImageIO/dassert.h>
#include <OpenImageIO/sysutil.h>
#include <OpenImageIO/strutil.h>
@@ -255,7 +261,7 @@ Sysutil::this_program_path ()
size_t cb = sizeof(filename);
int r=1;
sysctl(mib, 4, filename, &cb, NULL, 0);
-#elif defined(__GNU__) || defined(__OpenBSD__)
+#elif defined(__GNU__) || defined(__OpenBSD__) || defined(__HAIKU__)
int r = 0;
#else
// No idea what platform this is
diff --git a/src/libutil/xxhash.cpp b/src/libutil/xxhash.cpp
index b17c7f8..4b00d09 100644
--- a/src/libutil/xxhash.cpp
+++ b/src/libutil/xxhash.cpp
@@ -126,8 +126,10 @@ typedef unsigned long long U64;
#if defined(__GNUC__) && !defined(XXH_USE_UNALIGNED_ACCESS)
# define _PACKED __attribute__ ((packed))
#else
+#ifndef __HAIKU__
# define _PACKED
#endif
+#endif
#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
# ifdef __IBMC__
diff --git a/src/make/detectplatform.mk b/src/make/detectplatform.mk
index dacdc2e..bd9ccb6 100644
--- a/src/make/detectplatform.mk
+++ b/src/make/detectplatform.mk
@@ -46,6 +46,14 @@ ifeq (${platform},unknown)
endif
endif
+ # Haiku
+ ifeq (${uname},haiku)
+ platform := haiku
+ ifeq (${hw},x86_64)
+ platform := haiku64
+ endif
+ endif
+
# Windows
ifeq (${uname},cygwin)
platform := windows
--
2.12.2
From 7fff1ebe616dee4d87698d4aac5155016f8da9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 21 Jun 2017 19:15:08 +0200
Subject: Search path fix
diff --git a/src/cmake/modules/FindFreetype.cmake b/src/cmake/modules/FindFreetype.cmake
index 9f3d16f..5619e3e 100644
--- a/src/cmake/modules/FindFreetype.cmake
+++ b/src/cmake/modules/FindFreetype.cmake
@@ -24,6 +24,8 @@ FIND_PATH (FREETYPE_INCLUDE_DIRS ft2build.h
/usr/local/include/freetype2/freetype
/sw/include
/opt/local/include
+ /system/develop/headers/freetype2
+ /system/develop/headers/x86/freetype2
DOC "The directory where freetype.h resides")
FIND_LIBRARY (FREETYPE_LIBRARIES
NAMES FREETYPE freetype
@@ -36,6 +38,8 @@ FIND_LIBRARY (FREETYPE_LIBRARIES
/usr/local/lib
/sw/lib
/opt/local/lib
+ /system/lib
+ /system/lib/x86
DOC "The FREETYPE library")
if (FREETYPE_INCLUDE_DIRS AND FREETYPE_LIBRARIES)
set (FREETYPE_FOUND TRUE)
--
2.12.2

117
media-libs/openimageio/patches/openimageio-1.7.17.patchset
View File

@@ -1,117 +0,0 @@
From 0d155647f10278b130cf4cd74489665177656d35 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
diff --git a/src/libutil/farmhash.cpp b/src/libutil/farmhash.cpp
index 256ce4d..e8baa21 100644
--- a/src/libutil/farmhash.cpp
+++ b/src/libutil/farmhash.cpp
@@ -159,6 +159,13 @@
#define bswap_64(x) bswap64(x)
#endif
+#elif defined(__HAIKU__)
+
+#undef bswap_32
+#undef bswap_64
+#define bswap_32 __builtin_bswap32
+#define bswap_64 __builtin_bswap64
+
#else
#undef bswap_32
diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
index 0aa25c0..c061ccc 100644
--- a/src/libutil/sysutil.cpp
+++ b/src/libutil/sysutil.cpp
@@ -77,6 +77,12 @@
# include <sys/ioctl.h>
#endif
+#if defined (__HAIKU__)
+# include <sys/types.h>
+# include <sys/resource.h>
+# include <unistd.h>
+#endif
+
#include <OpenImageIO/dassert.h>
#include <OpenImageIO/sysutil.h>
#include <OpenImageIO/strutil.h>
@@ -255,7 +261,7 @@ Sysutil::this_program_path ()
size_t cb = sizeof(filename);
int r=1;
sysctl(mib, 4, filename, &cb, NULL, 0);
-#elif defined(__GNU__) || defined(__OpenBSD__)
+#elif defined(__GNU__) || defined(__OpenBSD__) || defined(__HAIKU__)
int r = 0;
#else
// No idea what platform this is
diff --git a/src/libutil/xxhash.cpp b/src/libutil/xxhash.cpp
index b17c7f8..4b00d09 100644
--- a/src/libutil/xxhash.cpp
+++ b/src/libutil/xxhash.cpp
@@ -126,8 +126,10 @@ typedef unsigned long long U64;
#if defined(__GNUC__) && !defined(XXH_USE_UNALIGNED_ACCESS)
# define _PACKED __attribute__ ((packed))
#else
+#ifndef __HAIKU__
# define _PACKED
#endif
+#endif
#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
# ifdef __IBMC__
diff --git a/src/make/detectplatform.mk b/src/make/detectplatform.mk
index dacdc2e..bd9ccb6 100644
--- a/src/make/detectplatform.mk
+++ b/src/make/detectplatform.mk
@@ -46,6 +46,14 @@ ifeq (${platform},unknown)
endif
endif
+ # Haiku
+ ifeq (${uname},haiku)
+ platform := haiku
+ ifeq (${hw},x86_64)
+ platform := haiku64
+ endif
+ endif
+
# Windows
ifeq (${uname},cygwin)
platform := windows
--
2.12.2
From 7fff1ebe616dee4d87698d4aac5155016f8da9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 21 Jun 2017 19:15:08 +0200
Subject: Search path fix
diff --git a/src/cmake/modules/FindFreetype.cmake b/src/cmake/modules/FindFreetype.cmake
index 9f3d16f..5619e3e 100644
--- a/src/cmake/modules/FindFreetype.cmake
+++ b/src/cmake/modules/FindFreetype.cmake
@@ -24,6 +24,8 @@ FIND_PATH (FREETYPE_INCLUDE_DIRS ft2build.h
/usr/local/include/freetype2/freetype
/sw/include
/opt/local/include
+ /system/develop/headers/freetype2
+ /system/develop/headers/x86/freetype2
DOC "The directory where freetype.h resides")
FIND_LIBRARY (FREETYPE_LIBRARIES
NAMES FREETYPE freetype
@@ -36,6 +38,8 @@ FIND_LIBRARY (FREETYPE_LIBRARIES
/usr/local/lib
/sw/lib
/opt/local/lib
+ /system/lib
+ /system/lib/x86
DOC "The FREETYPE library")
if (FREETYPE_INCLUDE_DIRS AND FREETYPE_LIBRARIES)
set (FREETYPE_FOUND TRUE)
--
2.12.2

87
media-libs/openimageio/patches/openimageio-1.8.6.patchset
View File

@@ -1,87 +0,0 @@
From 0d155647f10278b130cf4cd74489665177656d35 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
diff --git a/src/libutil/farmhash.cpp b/src/libutil/farmhash.cpp
index 05250a6..2a2e0fa 100644
--- a/src/libutil/farmhash.cpp
+++ b/src/libutil/farmhash.cpp
@@ -159,6 +159,13 @@
#define bswap_64(x) bswap64(x)
#endif
+#elif defined(__HAIKU__)
+
+#undef bswap_32
+#undef bswap_64
+#define bswap_32 __builtin_bswap32
+#define bswap_64 __builtin_bswap64
+
#else
#undef bswap_32
diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
index dda7bc7..75151a5 100644
--- a/src/libutil/sysutil.cpp
+++ b/src/libutil/sysutil.cpp
@@ -77,6 +77,12 @@
# include <sys/ioctl.h>
#endif
+#if defined (__HAIKU__)
+# include <sys/types.h>
+# include <sys/resource.h>
+# include <unistd.h>
+#endif
+
#include <OpenImageIO/dassert.h>
#include <OpenImageIO/sysutil.h>
#include <OpenImageIO/strutil.h>
@@ -255,7 +261,7 @@ Sysutil::this_program_path ()
size_t cb = sizeof(filename);
int r=1;
sysctl(mib, 4, filename, &cb, NULL, 0);
-#elif defined(__GNU__) || defined(__OpenBSD__)
+#elif defined(__GNU__) || defined(__OpenBSD__) || defined(__HAIKU__)
int r = 0;
#else
// No idea what platform this is
diff --git a/src/libutil/xxhash.cpp b/src/libutil/xxhash.cpp
index cfb1278..ef6698a 100644
--- a/src/libutil/xxhash.cpp
+++ b/src/libutil/xxhash.cpp
@@ -126,8 +126,10 @@ typedef unsigned long long U64;
#if defined(__GNUC__) && !defined(XXH_USE_UNALIGNED_ACCESS)
# define _PACKED __attribute__ ((packed))
#else
+#ifndef __HAIKU__
# define _PACKED
#endif
+#endif
#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
# ifdef __IBMC__
diff --git a/src/make/detectplatform.mk b/src/make/detectplatform.mk
index dacdc2e..4918389 100644
--- a/src/make/detectplatform.mk
+++ b/src/make/detectplatform.mk
@@ -46,6 +46,14 @@ ifeq (${platform},unknown)
endif
endif
+ # Haiku
+ ifeq (${uname},haiku)
+ platform := haiku
+ ifeq (${hw},x86_64)
+ platform := haiku64
+ endif
+ endif
+
# Windows
ifeq (${uname},cygwin)
platform := windows
--
2.15.0