From 7ab36d8a61626d12d1344c22f7a8c842c1d8645f Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 3 Sep 2023 15:39:07 +0000
Subject: [PATCH] flam3, drop gcc2/patchset (#9347)

---
 media-gfx/flam3/flam3-3.1.1.recipe           | 27 ++++---
 media-gfx/flam3/patches/flam3-3.1.1.patchset | 84 --------------------
 2 files changed, 17 insertions(+), 94 deletions(-)
 delete mode 100644 media-gfx/flam3/patches/flam3-3.1.1.patchset

diff --git a/media-gfx/flam3/flam3-3.1.1.recipe b/media-gfx/flam3/flam3-3.1.1.recipe
index 5a438fd7d..974105b0d 100644
--- a/media-gfx/flam3/flam3-3.1.1.recipe
+++ b/media-gfx/flam3/flam3-3.1.1.recipe
@@ -8,22 +8,27 @@ code of sorts."
 HOMEPAGE="https://flam3.com/"
 COPYRIGHT="1992-2015 Scott Draves, Erik Reckase"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/scottdraves/flam3/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="afcd4af13897740e34f6ae1f3061bbfbda9c1dd5df3ecc9f57141c985d35d19d"
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ];then
-	PATCHES="flam3-$portVersion.patchset"
-fi
 
-ARCHITECTURES="all"
+
+ARCHITECTURES="all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	flam3$secondaryArchSuffix = $portVersion
-	cmd:flam3_animate$secondaryArchSuffix
-	cmd:flam3_convert$secondaryArchSuffix
-	cmd:flam3_genome$secondaryArchSuffix
-	cmd:flam3_render$secondaryArchSuffix
+	cmd:flam3_animate$commandSuffix
+	cmd:flam3_convert$commandSuffix
+	cmd:flam3_genome$commandSuffix
+	cmd:flam3_render$commandSuffix
 	lib:libflam3$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES="
@@ -63,7 +68,9 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure --enable-shared \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-shared \
 		--disable-static
 	make $jobArgs
 }
diff --git a/media-gfx/flam3/patches/flam3-3.1.1.patchset b/media-gfx/flam3/patches/flam3-3.1.1.patchset
deleted file mode 100644
index 588341755..000000000
--- a/media-gfx/flam3/patches/flam3-3.1.1.patchset
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3a83a1c2fd8fba40edec980d4c023f357f9d78d0 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Fri, 28 Apr 2017 22:28:42 +0200
-Subject: flam3, gcc2 patch
-
-
-diff --git a/Makefile.am b/Makefile.am
-index c3d0f42..8d841dc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
--AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
-+AM_CFLAGS = -g -O3 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
- 
- ACLOCAL_AMFLAGS = -I m4
- 
-diff --git a/flam3-genome.c b/flam3-genome.c
-index 509dbd7..5798e94 100644
---- a/flam3-genome.c
-+++ b/flam3-genome.c
-@@ -888,10 +888,12 @@ main(argc, argv)
-        fprintf(stderr, "can only find parents of one genome\n");
-        exit(1);
-      }
--     xmlDocPtr edits = cp[0].edits;
-+     {
-+     	xmlDocPtr edits = cp[0].edits;
-      xmlNode *rootnode = xmlDocGetRootElement(edits);
-      print_find_parents(rootnode, 0, 0);
-      exit(0);
-+     }
-    }
- 
-    /* pick a control point until it looks good enough */
-diff --git a/flam3.c b/flam3.c
-index 8b84629..47761f1 100644
---- a/flam3.c
-+++ b/flam3.c
-@@ -1816,7 +1816,8 @@ void flam3_print(FILE *f, flam3_genome *cp, char *extra_attributes, int print_ed
- 
-    }
- 
--   int hexpalette = argi("hexpalette",0);
-+   {
-+   	int hexpalette = argi("hexpalette",0);
- 
-    if (hexpalette) {
- 
-@@ -1891,6 +1892,7 @@ void flam3_print(FILE *f, flam3_genome *cp, char *extra_attributes, int print_ed
-          fprintf(stderr, "error: couldn't restore locale settings\n");
-       free(locale);
-    }
-+   }
- }
- 
- #define PRINTNON(p) do { if (x->p != 0.0) fprintf(f, #p "=\"%f\" ",x->p); } while(0)
-diff --git a/interpolation.c b/interpolation.c
-index 4390337..30af0a1 100644
---- a/interpolation.c
-+++ b/interpolation.c
-@@ -430,7 +430,8 @@ void flam3_interpolate_n(flam3_genome *result, int ncp,
-             new_count = 1.0;
- 
-          /* Convert the new hsv coord to back rgb */
--         double new_hsv_rgb[3];
-+         {
-+         	double new_hsv_rgb[3];
-          hsv2rgb(new_hsv, new_hsv_rgb);
- 
-          /* Store the interpolated color in the new palette */
-@@ -452,6 +453,7 @@ void flam3_interpolate_n(flam3_genome *result, int ncp,
-             result->palette[i].index = 0.0;
-          if (result->palette[i].index > 255.0)
-             result->palette[i].index = 255.0;
-+         }
-       }
-    } else {
-       /* Sweep - not the best option for float indices */
--- 
-2.7.0
-