mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
openimageio2.2, fix build (#13600)
use boost1.85, libraw 0.20.2 and libfmt8
This commit is contained in:
@@ -59,12 +59,12 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.83.0
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.85.0
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix >= 3
|
||||
devel:libdeflate$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libfmt$secondaryArchSuffix
|
||||
devel:libfmt$secondaryArchSuffix >= 8
|
||||
devel:libgif$secondaryArchSuffix
|
||||
devel:libglew$secondaryArchSuffix
|
||||
devel:libheif$secondaryArchSuffix
|
||||
@@ -77,7 +77,7 @@ BUILD_REQUIRES="
|
||||
devel:libOpenEXRUtil_3_2$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libpugixml$secondaryArchSuffix
|
||||
devel:libraw$secondaryArchSuffix
|
||||
devel:libraw$secondaryArchSuffix >= 20
|
||||
devel:libssl$secondaryArchSuffix >= 3
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libwebp$secondaryArchSuffix
|
||||
@@ -103,7 +103,6 @@ BUILD()
|
||||
$cmakeDirArgs \
|
||||
-DUSE_PYTHON=OFF \
|
||||
-DUSE_EXTERNAL_PUGIXML=ON \
|
||||
-DOIIO_BUILD_TESTS=OFF \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DOIIO_BUILD_TESTS=OFF \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo -Wno-dev
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8459508cce4d5df1c4f292a46ea73b770a6bdc9b Mon Sep 17 00:00:00 2001
|
||||
From 99f709c7d176f4a7f6312208f4d348fbd7540b1b 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
|
||||
@@ -98,10 +98,10 @@ index 90fd11b..a28ee3e 100644
|
||||
ifeq (${uname},cygwin)
|
||||
platform := windows
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From ed3a6e472c020616d2838b9b6761fdeb8fa0a4bd Mon Sep 17 00:00:00 2001
|
||||
From ddfe0d307673c74336ad55c74b81111703072fe4 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
|
||||
@@ -130,10 +130,10 @@ index 01c52a4..a651689 100644
|
||||
OIIO_PLUGIN_NAMESPACE_BEGIN
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 90b912504e67a15fdf3889c5628dc705ce8f9966 Mon Sep 17 00:00:00 2001
|
||||
From 37fd2c88ce89ac06c7b062252afd04f606aed992 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 08:11:28 +0200
|
||||
Subject: Build fix for missing _DEFAULT_SOURCE
|
||||
@@ -153,5 +153,37 @@ index 3764df2..22765e6 100644
|
||||
|
||||
#include <map>
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 100228cf6eb7923bd281af3312c0a143ce06ad59 Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Thu, 8 Jan 2026 14:52:36 +0100
|
||||
Subject: Fix build for boost1.85
|
||||
|
||||
|
||||
diff --git a/src/libutil/filesystem.cpp b/src/libutil/filesystem.cpp
|
||||
index 712fe4d..c4b7582 100644
|
||||
--- a/src/libutil/filesystem.cpp
|
||||
+++ b/src/libutil/filesystem.cpp
|
||||
@@ -227,7 +227,7 @@ Filesystem::searchpath_find(const std::string& filename_utf8,
|
||||
const filesystem::path d(u8path(d_utf8));
|
||||
filesystem::path f = d / filename;
|
||||
error_code ec;
|
||||
- if (filesystem::is_regular(f, ec)) {
|
||||
+ if (filesystem::is_regular_file(f, ec)) {
|
||||
return pathstr(f);
|
||||
}
|
||||
|
||||
@@ -922,7 +922,7 @@ Filesystem::scan_for_matching_filenames(const std::string& pattern_,
|
||||
!ec && it != end_it; ++it) {
|
||||
std::string itpath = Filesystem::generic_filepath(
|
||||
it->path().string());
|
||||
- if (filesystem::is_regular(itpath, ec)) {
|
||||
+ if (filesystem::is_regular_file(itpath, ec)) {
|
||||
const std::string f = pathstr(itpath);
|
||||
match_results<std::string::const_iterator> frame_match;
|
||||
if (regex_match(f, frame_match, pattern_re)) {
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user