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

GMIC: add missing requires, fix OS detection

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-10-03 00:04:53 +10:00
parent 343b70ec2f
commit 73f4920c2c
2 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-gfx/gmic/gmic-2.9.9.recipe
View File

@@ -8,7 +8,7 @@ volumetric images, hence including 2D color images."
HOMEPAGE="https://gmic.eu"
COPYRIGHT="Sébastien Fourey"
LICENSE="GNU GPL v3"
REVISION="3"
REVISION="4"
SOURCE_URI="https://gmic.eu/files/source/gmic_$portVersion.tar.gz"
CHECKSUM_SHA256="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0"
SOURCE_DIR="gmic-$portVersion"
@@ -27,13 +27,19 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libfftw3$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libgomp$secondaryArchSuffix
lib:libGraphicsMagick++$secondaryArchSuffix
lib:libGraphicsMagickWand$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libOpenEXR_3_0$secondaryArchSuffix
lib:libOpenEXRUtil_3_0$secondaryArchSuffix
lib:libopencv_core$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
@@ -55,7 +61,6 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
devel:libfftw3$secondaryArchSuffix
devel:libGL$secondaryArchSuffix

57
media-gfx/gmic/patches/gmic-2.9.9.patchset
View File

@@ -1,25 +1,9 @@
From 8571f5d46af6675f7c23b9fcd4e95c0577de9320 Mon Sep 17 00:00:00 2001
From 4ad3c1d9c998b6d07f783f4834ac854440713d11 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 1 Oct 2021 20:50:15 +1000
Subject: Fix build for Haiku
diff --git a/src/gmic.h b/src/gmic.h
index 6698bc0..1546281 100644
--- a/src/gmic.h
+++ b/src/gmic.h
@@ -51,6 +51,11 @@
#
*/
+#ifdef __HAIKU__
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
#ifndef gmic_version
#define gmic_version 299
diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
index 93119fa..149a61b 100644
--- a/gmic-qt/CMakeLists.txt
@@ -44,6 +28,45 @@ index 93119fa..149a61b 100644
if (WIN32)
add_definitions(-Dcimg_display=2)
add_definitions(-DPSAPI_VERSION=1)
diff --git a/src/gmic.h b/src/gmic.h
index 6698bc0..1546281 100644
--- a/src/gmic.h
+++ b/src/gmic.h
@@ -51,6 +51,11 @@
#
*/
+#ifdef __HAIKU__
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
#ifndef gmic_version
#define gmic_version 299
--
2.30.2
From ded9d6f8c2b1c814d4674a554baedcad0b726f52 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 3 Oct 2021 00:00:52 +1000
Subject: Add Haiku to detected OS
diff --git a/src/CImg.h b/src/CImg.h
index efdbaf4..da43a30 100644
--- a/src/CImg.h
+++ b/src/CImg.h
@@ -7124,6 +7124,8 @@ namespace cimg_library_suffixed {
static const char *const str = "Irix";
#elif defined(__MACOSX__) || defined(__APPLE__)
static const char *const str = "Mac OS";
+#elif defined(__HAIKU__)
+ static const char *const str = "Haiku";
#elif defined(unix) || defined(__unix) || defined(__unix__)
static const char *const str = "Generic Unix";
#elif defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \
--
2.30.2