gmic: fix build for secondary arch

This commit is contained in:
Gerasim Troeglazov
2022-06-14 14:56:00 +10:00
parent 4932818e83
commit 7eb0f9a631
2 changed files with 35 additions and 5 deletions

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="1"
REVISION="2"
SOURCE_URI="https://gmic.eu/files/source/gmic_$portVersion.tar.gz"
CHECKSUM_SHA256="d5070c559c75161a225d74a99c19faf2485a3983139290f998cc6359bb318ba4"
SOURCE_DIR="gmic-$portVersion"

View File

@@ -1,4 +1,4 @@
From b3f34b1eaf80d92a0ae6bc6bccfbcddc594c1e88 Mon Sep 17 00:00:00 2001
From 976030a8b5fea9e717318a6005b6d65727af8e41 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 12 May 2022 10:07:44 +1000
Subject: Fix build for Haiku
@@ -39,7 +39,7 @@ index 003d2bd..4669002 100644
2.36.1
From 4f7ddc35db70888d59aa96eef0c766e3999801bc Mon Sep 17 00:00:00 2001
From c874a0ffea157eb73a269f61bdbf0976876ac0c3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 12 May 2022 10:08:03 +1000
Subject: Add Haiku to detected OS
@@ -62,7 +62,7 @@ index f956160..74c1b22 100644
2.36.1
From 014bf026dc466e77ffd1b62f4435de8b98dd5b6b Mon Sep 17 00:00:00 2001
From 80e4abb099f8c1c0b1a646bb3e39e24fc62437f3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 12 May 2022 10:08:15 +1000
Subject: Fix save file with default quality
@@ -86,7 +86,7 @@ index 973c0ae..73eb636 100644
2.36.1
From a19a4fd1f35883ca36272a4f190131d7a7e884e2 Mon Sep 17 00:00:00 2001
From dc0f75dd0ca3c72845285ce7487c54fe4f8876cb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 13 Jun 2022 20:26:15 +1000
Subject: Disable flto, use -O1 optimization
@@ -143,3 +143,33 @@ index 970558c..746239e 100644
--
2.36.1
From 87c7f2e3c4e251e06da2f1ae3dabc4333fb586f0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 14 Jun 2022 13:51:36 +1000
Subject: Use uint32* for tiff buffer
diff --git a/src/CImg.h b/src/CImg.h
index 74c1b22..694e744 100644
--- a/src/CImg.h
+++ b/src/CImg.h
@@ -54443,13 +54443,13 @@ namespace cimg_library_suffixed {
(samplesperpixel==1 || samplesperpixel==3 || samplesperpixel==4)) ||
(bitspersample==1 && samplesperpixel==1)) {
// Special case for unsigned color images.
- cimg_uint32 *const raster = (cimg_uint32*)_TIFFmalloc(nx*ny*sizeof(cimg_uint32));
+ uint32 *const raster = (uint32*)_TIFFmalloc(nx*ny*sizeof(uint32));
if (!raster) {
_TIFFfree(raster); TIFFClose(tif);
throw CImgException(_cimg_instance
"load_tiff(): Failed to allocate memory (%s) for file '%s'.",
cimg_instance,
- cimg::strbuffersize(nx*ny*sizeof(cimg_uint32)),filename);
+ cimg::strbuffersize(nx*ny*sizeof(uint32)),filename);
}
TIFFReadRGBAImage(tif,nx,ny,raster,0);
switch (spectrum) {
--
2.36.1