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

alembic: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-12-26 20:53:45 +10:00
parent 7ba75b1e54
commit 8687823841
3 changed files with 35 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media-libs/alembic/alembic-1.7.12.recipe → media-libs/alembic/alembic-1.8.3.recipe
View File

@@ -24,11 +24,11 @@ COPYRIGHT="2009-2016 Sony Pictures Imageworks
LICENSE="ALEMBIC"
REVISION="1"
SOURCE_URI="https://github.com/alembic/alembic/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="6c603b87c9a3eaa13618e577dd9ef5277018cdcd09ac82d3c196ad8bed6a1b48"
CHECKSUM_SHA256="b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb"
SOURCE_FILENAME="alembic-$portVersion.tar.gz"
PATCHES="alembic-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandBinDir=$binDir
@@ -53,11 +53,10 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libHalf_2_4$secondaryArchSuffix
lib:libhdf5$secondaryArchSuffix
lib:libIex_2_4$secondaryArchSuffix
lib:libIlmThread_2_4$secondaryArchSuffix
lib:libImath_2_4$secondaryArchSuffix
lib:libIex_3_0$secondaryArchSuffix
lib:libIlmThread_3_0$secondaryArchSuffix
lib:libImath_3_0$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -72,11 +71,9 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_program_options$secondaryArchSuffix
devel:libHalf_2_4$secondaryArchSuffix
devel:libhdf5$secondaryArchSuffix
devel:libIexMath_2_4$secondaryArchSuffix
devel:libIlmThread_2_4$secondaryArchSuffix
devel:libImath_2_4$secondaryArchSuffix
devel:libIlmThread_3_0$secondaryArchSuffix
devel:libImath_3_0$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -114,6 +111,7 @@ BUILD()
export ILMBASE_INC_DIR="`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir/OpenEXR"
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_HDF5=ON \
-DALEMBIC_LIB_USES_BOOST=ON \
$cmakeDirArgs

73
media-libs/alembic/patches/alembic-1.7.12.patchset
View File

@@ -1,73 +0,0 @@
From 2a37f467024bf26482833493b4af5ccd5dee8d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 31 Mar 2018 08:49:25 +0200
Subject: Haiku build fixes
diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
index 679a02f..8c5a505 100644
--- a/cmake/Modules/FindIlmBase.cmake
+++ b/cmake/Modules/FindIlmBase.cmake
@@ -92,6 +92,7 @@ FIND_PATH(ILMBASE_INCLUDE_DIR
IlmBaseConfig.h
HINTS
${_ilmbase_SEARCH_DIRS}
+ "$ENV{ILMBASE_INC_DIR}"
PATH_SUFFIXES
include
include/OpenEXR
diff --git a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
index f163173..c5a2a27 100644
--- a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
+++ b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
@@ -67,6 +67,9 @@ Alembic::Util::int64_t ffsll( Alembic::Util::int64_t iValue )
return 0;
}
+#elif defined( __HAIKU__ )
+#define COMPARE_EXCHANGE( V, COMP, EXCH ) __atomic_compare_exchange_n( &V, &COMP, EXCH, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST )
+#include <strings.h>
// gcc 4.8 and above not using C++11
#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8
@@ -107,6 +110,13 @@ StreamManager::~StreamManager()
{
}
+#ifdef __HAIKU__
+int ffsll(long long i)
+{
+ return (__builtin_ffsll(i));
+}
+#endif
+
StreamIDPtr StreamManager::get()
{
--
2.24.0
From bcc682c510731b89768366c48ed2700666e45dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 18 Sep 2018 21:46:33 +0200
Subject: Build fix
diff --git a/lib/Alembic/Ogawa/IStreams.cpp b/lib/Alembic/Ogawa/IStreams.cpp
index c2eb987..a4cd761 100644
--- a/lib/Alembic/Ogawa/IStreams.cpp
+++ b/lib/Alembic/Ogawa/IStreams.cpp
@@ -38,7 +38,8 @@
#include <stdexcept>
-#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
+#if defined (__unix__) || defined (__HAIKU__) || \
+ (defined (__APPLE__) && defined (__MACH__))
#include <sys/mman.h>
#include <sys/stat.h>
--
2.24.0

27
media-libs/alembic/patches/alembic-1.8.3.patchset Normal file
View File

@@ -0,0 +1,27 @@
From 2a37f467024bf26482833493b4af5ccd5dee8d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 31 Mar 2018 08:49:25 +0200
Subject: Haiku build fixes
diff --git a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
index 8cc1cc2..163240e 100644
--- a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
+++ b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
@@ -99,6 +99,13 @@ StreamManager::~StreamManager()
{
}
+#ifdef __HAIKU__
+int ffsll(long long i)
+{
+ return (__builtin_ffsll(i));
+}
+#endif
+
StreamIDPtr StreamManager::get()
{
--
2.30.2