mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
79 lines
2.4 KiB
Plaintext
79 lines
2.4 KiB
Plaintext
From 2c12c6a1cba8a063d210fa477dc61f9872ad6117 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Fri, 7 Apr 2017 14:10:49 +0200
|
|
Subject: Haiku is like BSD but with nicer icons (no -lrt -ldl)
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index af5e2c1..f926e88 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -557,7 +557,7 @@ if(UNIX)
|
|
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
|
|
if(ANDROID)
|
|
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
|
|
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD")
|
|
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku")
|
|
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
|
|
elseif(EMSCRIPTEN)
|
|
# no need to link to system libs with emscripten
|
|
--
|
|
2.12.2
|
|
|
|
|
|
From f7de64ae96e89b6b161442609e54e191ebc4919c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Fri, 7 Apr 2017 14:14:46 +0200
|
|
Subject: Haiku build fix
|
|
|
|
|
|
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
|
|
index 3eeb5fe..73759d6 100644
|
|
--- a/modules/core/src/system.cpp
|
|
+++ b/modules/core/src/system.cpp
|
|
@@ -66,7 +66,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex();
|
|
# endif
|
|
#endif
|
|
|
|
-#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__
|
|
+#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __HAIKU__
|
|
# include <unistd.h>
|
|
# include <fcntl.h>
|
|
# include <elf.h>
|
|
@@ -202,7 +202,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
|
|
#include "omp.h"
|
|
#endif
|
|
|
|
-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__
|
|
+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
--
|
|
2.12.2
|
|
|
|
|
|
From e6632eafd03dc6a052499a6a20a03f1e4e97a9ab Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Fri, 7 Apr 2017 15:36:17 +0200
|
|
Subject: FFMPEG test fix for Haiku
|
|
|
|
|
|
diff --git a/cmake/checks/ffmpeg_test.cpp b/cmake/checks/ffmpeg_test.cpp
|
|
index 4a7a3e0..8f293f9 100644
|
|
--- a/cmake/checks/ffmpeg_test.cpp
|
|
+++ b/cmake/checks/ffmpeg_test.cpp
|
|
@@ -2,6 +2,10 @@
|
|
|
|
#include <stdlib.h>
|
|
|
|
+#ifdef __HAIKU__
|
|
+ #define __STDC_CONSTANT_MACROS
|
|
+#endif
|
|
+
|
|
extern "C" {
|
|
#include <libavformat/avformat.h>
|
|
#include <libavcodec/avcodec.h>
|
|
--
|
|
2.12.2
|