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

GMIC: use cmake for build

Browse Source 
* build libgmic shared lib
* add devel package
* add haiku icons
This commit is contained in:
Gerasim Troeglazov
2021-10-02 22:57:38 +10:00
parent ae6d38f807
commit 1091d2177d
2 changed files with 106 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,22 +1,9 @@
From b73254d460e1eb24ca0713197b24ca144b46cb3b Mon Sep 17 00:00:00 2001
From 8571f5d46af6675f7c23b9fcd4e95c0577de9320 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 1 Oct 2021 20:50:15 +1000
Subject: Fix for Haiku
Subject: Fix build for Haiku
diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
index 9a0d1ee..1313934 100644
--- a/gmic-qt/gmic_qt.pro
+++ b/gmic-qt/gmic_qt.pro
@@ -141,7 +141,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 6698bc0..1546281 100644
--- a/src/gmic.h
@@ -32,7 +19,31 @@ index 6698bc0..1546281 100644
+
#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
+++ b/gmic-qt/CMakeLists.txt
@@ -240,7 +240,7 @@ add_definitions(-Dgmic_gui)
add_definitions(-Dcimg_use_abort)
add_definitions(-Dcimg_appname=\"gmic\")
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE AND NOT HAIKU)
add_definitions(-Dcimg_display=1)
add_definitions(-D_IS_LINUX_)
add_definitions(-Dcimg_use_vt100)
@@ -261,6 +261,10 @@ if (APPLE)
add_definitions(-mmacosx-version-min=10.9 -Wno-macro-redefined -Wno-deprecated-register)
endif()
+if (HAIKU)
+ add_definitions(-Dcimg_display=0)
+endif()
+
if (WIN32)
add_definitions(-Dcimg_display=2)
add_definitions(-DPSAPI_VERSION=1)
--
2.30.2