From 928b85d25c6d946572c419252218ad46fd21f538 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 28 Jun 2019 15:48:47 +0200
Subject: [PATCH] app: add gegl:bayer-matrix and gegl:linear-sinusoid to the
 menus

in Filters -> Render -> Pattern. Also depend on GEGL from git.
---
 app/actions/filters-actions.c | 10 ++++++++++
 app/sanity.c                  |  4 +++-
 app/tools/gimpgegltool.c      |  2 ++
 app/widgets/gimphelp-ids.h    |  2 ++
 configure.ac                  |  2 +-
 menus/image-menu.xml.in       |  2 ++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
index 7e2930993d..16b3fcbf02 100644
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@@ -183,6 +183,11 @@ static const GimpStringActionEntry filters_interactive_actions[] =
     "gegl:apply-lens",
     GIMP_HELP_FILTER_APPLY_LENS },
 
+  { "filters-bayer-matrix", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Bayer Matrix..."), NULL, NULL,
+    "gegl:bayer-matrix",
+    GIMP_HELP_FILTER_BAYER_MATRIX },
+
   { "filters-brightness-contrast", GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST,
     NC_("filters-action", "B_rightness-Contrast..."), NULL, NULL,
     "gimp:brightness-contrast",
@@ -413,6 +418,11 @@ static const GimpStringActionEntry filters_interactive_actions[] =
     "gimp:levels",
     GIMP_HELP_TOOL_LEVELS },
 
+  { "filters-linear-sinusoid", GIMP_ICON_TOOL_LEVELS,
+    NC_("filters-action", "_Linear Sinusoid..."), NULL, NULL,
+    "gegl:linear-sinusoid",
+    GIMP_HELP_FILTER_LINEAR_SINUSOID },
+
   { "filters-little-planet", GIMP_ICON_GEGL,
     NC_("filters-action", "_Little Planet..."), NULL, NULL,
     "gegl:stereographic-projection",
diff --git a/app/sanity.c b/app/sanity.c
index 16e8abde6d..75fcdfb42a 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -518,7 +518,7 @@ sanity_check_gegl (void)
 
 #define GEGL_REQUIRED_MAJOR 0
 #define GEGL_REQUIRED_MINOR 4
-#define GEGL_REQUIRED_MICRO 16
+#define GEGL_REQUIRED_MICRO 17
 
   gegl_get_version (&gegl_major_version,
                     &gegl_minor_version,
@@ -605,6 +605,7 @@ sanity_check_gegl_ops (void)
   static const gchar *required_ops[] =
   {
     "gegl:alien-map",
+    "gegl:bayer-matrix",
     "gegl:buffer-sink",
     "gegl:buffer-source",
     "gegl:c2g",
@@ -652,6 +653,7 @@ sanity_check_gegl_ops (void)
     "gegl:invert-linear",
     "gegl:lens-distortion",
     "gegl:lens-flare",
+    "gegl:linear-sinusoid",
     "gegl:long-shadow",
     "gegl:mantiuk06",
     "gegl:map-absolute",
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index 2cac139812..2e7b4a1656 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -148,6 +148,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:alien-map",
     "gegl:antialias",
     "gegl:apply-lens",
+    "gegl:bayer-matrix",
     "gegl:bump-map",
     "gegl:c2g",
     "gegl:cartoon",
@@ -191,6 +192,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:invert-gamma",
     "gegl:lens-distortion",
     "gegl:lens-flare",
+    "gegl:linear-sinusoid",
     "gegl:long-shadow",
     "gegl:mantiuk06",
     "gegl:maze",
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 93f2f77479..6874f5ec94 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -344,6 +344,7 @@
 #define GIMP_HELP_FILTER_ANTIALIAS                "gimp-filter-antialias"
 #define GIMP_HELP_FILTER_APPLY_CANVAS             "gimp-filter-apply-canvas"
 #define GIMP_HELP_FILTER_APPLY_LENS               "gimp-filter-apply-lens"
+#define GIMP_HELP_FILTER_BAYER_MATRIX             "gimp-filter-bayer-matrix"
 #define GIMP_HELP_FILTER_BUMP_MAP                 "gimp-filter-bump-map"
 #define GIMP_HELP_FILTER_C2G                      "gimp-filter-c2g"
 #define GIMP_HELP_FILTER_CARTOON                  "gimp-filter-cartoon"
@@ -390,6 +391,7 @@
 #define GIMP_HELP_FILTER_KALEIDOSCOPE             "gimp-filter-kaleidoscope"
 #define GIMP_HELP_FILTER_LENS_DISTORTION          "gimp-filter-lens-distortion"
 #define GIMP_HELP_FILTER_LENS_FLARE               "gimp-filter-lens-flare"
+#define GIMP_HELP_FILTER_LINEAR_SINUSOID          "gimp-filter-linear-sinusoid"
 #define GIMP_HELP_FILTER_LITTLE_PLANET            "gimp-filter-little-planet"
 #define GIMP_HELP_FILTER_LONG_SHADOW              "gimp-filter-long-shadow"
 #define GIMP_HELP_FILTER_MANTIUK_2006             "gimp-filter-manituk-2006"
diff --git a/configure.ac b/configure.ac
index 4e86462877..13a8df6b00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ m4_define([fontconfig_required_version], [2.12.4])
 m4_define([freetype2_required_version], [2.1.7])
 m4_define([gdk_pixbuf_required_version], [2.30.8])
 m4_define([gegl_major_minor_version], [0.4])
-m4_define([gegl_micro_version], [16])
+m4_define([gegl_micro_version], [17])
 m4_define([gegl_required_version],
           [gegl_major_minor_version.gegl_micro_version])
 m4_define([gexiv2_required_version], [0.10.6])
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index f04586f61e..c559d9e52a 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -804,9 +804,11 @@
 	  <menuitem action="filters-noise-solid" />
 	</menu>
         <menu action="filters-render-pattern-menu" name="Pattern">
+	  <menuitem action="filters-bayer-matrix" />
 	  <menuitem action="filters-checkerboard" />
 	  <menuitem action="filters-diffraction-patterns" />
 	  <menuitem action="filters-grid" />
+	  <menuitem action="filters-linear-sinusoid" />
 	  <menuitem action="filters-maze" />
 	  <menuitem action="filters-sinus" />
 	  <menuitem action="filters-spiral" />