Commit 24acc89f authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

depend on GEGL >= 0.0.17, add check for BABL => 0.0.21.

2008-06-04  Michael Natterer  <mitch@gimp.org>

	* configure.in: depend on GEGL >= 0.0.17, add check for
	BABL => 0.0.21.

	* app/sanity.c: bump GEGL sanity check and add BABL check.

	* app/gegl/gimpoperationcolorbalance.c
	* app/gegl/gimpoperationcolorize.c
	* app/gegl/gimpoperationcurves.c
	* app/gegl/gimpoperationdesaturate.c
	* app/gegl/gimpoperationhuesaturation.c
	* app/gegl/gimpoperationlevels.c
	* app/gegl/gimpoperationposterize.c
	* app/gegl/gimpoperationthreshold.c: adapt to new process()
	signature.


svn path=/trunk/; revision=25886
parent 2750e8d6
2008-06-04 Michael Natterer <mitch@gimp.org>
* configure.in: depend on GEGL >= 0.0.17, add check for
BABL => 0.0.21.
* app/sanity.c: bump GEGL sanity check and add BABL check.
* app/gegl/gimpoperationcolorbalance.c
* app/gegl/gimpoperationcolorize.c
* app/gegl/gimpoperationcurves.c
* app/gegl/gimpoperationdesaturate.c
* app/gegl/gimpoperationhuesaturation.c
* app/gegl/gimpoperationlevels.c
* app/gegl/gimpoperationposterize.c
* app/gegl/gimpoperationthreshold.c: adapt to new process()
signature.
2008-06-03 Sven Neumann <sven@gimp.org>
* libgimp/gimpitemcombobox.c: fixed comments.
......
......@@ -35,7 +35,8 @@
static gboolean gimp_operation_color_balance_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationColorBalance, gimp_operation_color_balance,
......@@ -115,7 +116,8 @@ static gboolean
gimp_operation_color_balance_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpColorBalanceConfig *config = GIMP_COLOR_BALANCE_CONFIG (point->config);
......
......@@ -34,7 +34,8 @@
static gboolean gimp_operation_colorize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationColorize, gimp_operation_colorize,
......@@ -78,7 +79,8 @@ static gboolean
gimp_operation_colorize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpColorizeConfig *config = GIMP_COLORIZE_CONFIG (point->config);
......
......@@ -38,7 +38,8 @@
static gboolean gimp_operation_curves_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationCurves, gimp_operation_curves,
......@@ -82,7 +83,8 @@ static gboolean
gimp_operation_curves_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpCurvesConfig *config = GIMP_CURVES_CONFIG (point->config);
......
......@@ -34,7 +34,8 @@
static gboolean gimp_operation_desaturate_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationDesaturate, gimp_operation_desaturate,
......@@ -78,7 +79,8 @@ static gboolean
gimp_operation_desaturate_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpDesaturateConfig *config = GIMP_DESATURATE_CONFIG (point->config);
......
......@@ -35,7 +35,8 @@
static gboolean gimp_operation_hue_saturation_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationHueSaturation, gimp_operation_hue_saturation,
......@@ -127,7 +128,8 @@ static gboolean
gimp_operation_hue_saturation_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpHueSaturationConfig *config = GIMP_HUE_SATURATION_CONFIG (point->config);
......
......@@ -35,7 +35,8 @@
static gboolean gimp_operation_levels_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationLevels, gimp_operation_levels,
......@@ -110,7 +111,8 @@ static gboolean
gimp_operation_levels_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (point->config);
......
......@@ -35,7 +35,8 @@
static gboolean gimp_operation_posterize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationPosterize, gimp_operation_posterize,
......@@ -79,7 +80,8 @@ static gboolean
gimp_operation_posterize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpPosterizeConfig *config = GIMP_POSTERIZE_CONFIG (point->config);
......
......@@ -34,7 +34,8 @@
static gboolean gimp_operation_threshold_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples);
glong samples,
GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationThreshold, gimp_operation_threshold,
......@@ -78,7 +79,8 @@ static gboolean
gimp_operation_threshold_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples)
glong samples,
GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpThresholdConfig *config = GIMP_THRESHOLD_CONFIG (point->config);
......
......@@ -36,6 +36,7 @@ static gchar * sanity_check_glib (void);
static gchar * sanity_check_pango (void);
static gchar * sanity_check_fontconfig (void);
static gchar * sanity_check_freetype (void);
static gchar * sanity_check_babl (void);
static gchar * sanity_check_gegl (void);
static gchar * sanity_check_filename_encoding (void);
......@@ -59,6 +60,9 @@ sanity_check (void)
if (! abort_message)
abort_message = sanity_check_freetype ();
if (! abort_message)
abort_message = sanity_check_babl ();
if (! abort_message)
abort_message = sanity_check_gegl ();
......@@ -247,6 +251,44 @@ sanity_check_freetype (void)
return NULL;
}
static gchar *
sanity_check_babl (void)
{
gint babl_major_version;
gint babl_minor_version;
gint babl_micro_version;
#define BABL_REQUIRED_MAJOR 0
#define BABL_REQUIRED_MINOR 0
#define BABL_REQUIRED_MICRO 21
babl_get_version (&babl_major_version,
&babl_minor_version,
&babl_micro_version);
if (babl_major_version < BABL_REQUIRED_MAJOR ||
babl_minor_version < BABL_REQUIRED_MINOR ||
babl_micro_version < BABL_REQUIRED_MICRO)
{
return g_strdup_printf
("BABL version too old!\n\n"
"GIMP requires BABL version %d.%d.%d or later.\n"
"Installed BABL version is %d.%d.%d.\n\n"
"Somehow you or your software packager managed\n"
"to install GIMP with an older BABL version.\n\n"
"Please upgrade to BABL version %d.%d.%d or later.",
BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO,
babl_major_version, babl_minor_version, babl_micro_version,
BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO);
}
#undef BABL_REQUIRED_MAJOR
#undef BABL_REQUIRED_MINOR
#undef BABL_REQUIRED_MICRO
return NULL;
}
static gchar *
sanity_check_gegl (void)
{
......@@ -256,7 +298,7 @@ sanity_check_gegl (void)
#define GEGL_REQUIRED_MAJOR 0
#define GEGL_REQUIRED_MINOR 0
#define GEGL_REQUIRED_MICRO 16
#define GEGL_REQUIRED_MICRO 17
gegl_get_version (&gegl_major_version,
&gegl_minor_version,
......
......@@ -40,7 +40,8 @@ m4_define([gimp_stable],
m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages
m4_define([gegl_required_version], [0.0.16])
m4_define([babl_required_version], [0.0.21])
m4_define([gegl_required_version], [0.0.17])
m4_define([glib_required_version], [2.16.1])
m4_define([gtk_required_version], [2.12.1])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
......@@ -429,6 +430,10 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
###############################
PKG_CHECK_MODULES(BABL, babl >= babl_required_version, :,
AC_MSG_ERROR([Test for BABL failed. Please get it from http://gegl.org/]))
PKG_CHECK_MODULES(GEGL, gegl >= gegl_required_version, :,
AC_MSG_ERROR([Test for GEGL failed. Please get it from http://gegl.org/]))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment