G'MIC: bump version

This commit is contained in:
Gerasim Troeglazov
2020-04-18 19:45:35 +10:00
parent 4f5ee7b9ef
commit afdc8ee3e4
3 changed files with 40 additions and 50 deletions

View File

@@ -1,48 +0,0 @@
From 69cb819208cc812917ff46ebd5a0c907f3de4e03 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 19 Oct 2019 19:39:57 +1000
Subject: Disable cimg_display
diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
index cc3a9fd..8a592ad 100644
--- a/gmic-qt/gmic_qt.pro
+++ b/gmic-qt/gmic_qt.pro
@@ -133,7 +133,7 @@ message("CImg version is" $$CIMG_VERSION)
!win32 {
LIBS += -lfftw3_threads
- DEFINES += cimg_display=1
+ DEFINES += cimg_display=0
}
win32 {
--
2.23.0
From 907eb68a52cbeac91f5173577cd96e131f3ff816 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 19 Oct 2019 20:24:06 +1000
Subject: Add missing includes
diff --git a/src/gmic.h b/src/gmic.h
index bcf32c0..4d773cc 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 274
--
2.23.0

View File

@@ -0,0 +1,38 @@
From 388ba393df8331ba385fe0d86c7a963722bf1af6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 18 Apr 2020 19:05:21 +1000
Subject: Fix for Haiku
diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
index cd6b341..1fb5149 100644
--- a/gmic-qt/gmic_qt.pro
+++ b/gmic-qt/gmic_qt.pro
@@ -138,7 +138,7 @@ message("CImg version is" $$CIMG_VERSION)
!win32 {
LIBS += -lfftw3_threads
- DEFINES += cimg_display=1
+ DEFINES += cimg_display=0
}
win32 {
diff --git a/src/gmic.h b/src/gmic.h
index ec56da6..5ca9bd4 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 290
--
2.26.0