sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: One config file to rule them all

Browse source 
Group all the three config files from clutter/cogl/meta into one
and also remove unnused configurations and replace duplicated ones

This also fixes Cogl usage of HAS_X11/HAS_XLIB to match the expected
build options

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3368>
This commit is contained in:
Bilal Elmoussaoui 2023-11-07 11:56:00 +01:00 committed by Marge Bot
parent ebba651c81
commit f5dac3a5d9
246 changed files with 337 additions and 409 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clutter/.gitignore vendored
View file

@ -18,9 +18,6 @@ stamp-enum-types
stamp-marshal stamp-marshal
tags tags
/ChangeLog* /ChangeLog*
clutter-build-config.h
clutter-build-config.h.in
clutter-config.h
clutter-enum-types.[ch] clutter-enum-types.[ch]
clutter-marshal.[ch] clutter-marshal.[ch]
gcov-report.txt gcov-report.txt

2
clutter/clutter/cally/cally-actor.c
View file

@ -66,7 +66,7 @@
* *
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib.h> #include <glib.h>

2
clutter/clutter/cally/cally-clone.c
View file

@ -66,7 +66,7 @@
* a11y POV should still be managed as a image (with the proper properties, * a11y POV should still be managed as a image (with the proper properties,
* position, size, etc.). * position, size, etc.).
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cally/cally-clone.h" #include "cally/cally-clone.h"
#include "cally/cally-actor-private.h" #include "cally/cally-actor-private.h"

2
clutter/clutter/cally/cally-root.c
View file

@ -33,7 +33,7 @@
* [class@Clutter.StageManager]). * [class@Clutter.StageManager]).
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cally/cally-root.h" #include "cally/cally-root.h"

2
clutter/clutter/cally/cally-stage.c
View file

@ -31,7 +31,7 @@
* being a canvas. Anyway, this is required for applications using * being a canvas. Anyway, this is required for applications using
* just clutter, or directly [class@Clutter.Stage] * just clutter, or directly [class@Clutter.Stage]
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cally/cally-stage.h" #include "cally/cally-stage.h"
#include "cally/cally-actor-private.h" #include "cally/cally-actor-private.h"

2
clutter/clutter/cally/cally-text.c
View file

@ -35,7 +35,7 @@
* [class@Clutter.Text], #AtkText and #AtkEditableText * [class@Clutter.Text], #AtkText and #AtkEditableText
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cally/cally-text.h" #include "cally/cally-text.h"
#include "cally/cally-actor-private.h" #include "cally/cally-actor-private.h"

4
clutter/clutter/cally/cally-util.c
View file

@ -35,7 +35,7 @@
* available any accessible object. * available any accessible object.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -128,7 +128,7 @@ cally_util_get_toolkit_name (void)
static const gchar * static const gchar *
cally_util_get_toolkit_version (void) cally_util_get_toolkit_version (void)
{ {
return MUTTER_VERSION; return VERSION;
} }
static guint static guint

2
clutter/clutter/cally/cally.c
View file

@ -27,7 +27,7 @@
* *
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

2
clutter/clutter/clutter-action.c
View file

@ -38,7 +38,7 @@
* various event-related signals provided by [class@Actor] itself. * various event-related signals provided by [class@Actor] itself.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-action.h" #include "clutter/clutter-action.h"
#include "clutter/clutter-action-private.h" #include "clutter/clutter-action-private.h"

2
clutter/clutter/clutter-actor-box.c
View file

@ -1,4 +1,4 @@
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-actor-meta.c
View file

@ -38,7 +38,7 @@
* any kind of modification. * any kind of modification.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-actor-meta-private.h" #include "clutter/clutter-actor-meta-private.h"

6
clutter/clutter/clutter-actor.c
View file

@ -479,7 +479,7 @@
* ``` * ```
*/ */
#include "clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>
@ -3566,7 +3566,7 @@ clutter_actor_paint (ClutterActor *self,
if (!clutter_actor_is_mapped (self)) if (!clutter_actor_is_mapped (self))
return; return;
#ifdef COGL_HAS_TRACING #ifdef HAVE_PROFILER
COGL_TRACE_SCOPED_ANCHOR (ClutterActorPaint); COGL_TRACE_SCOPED_ANCHOR (ClutterActorPaint);
if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))
@ -8734,7 +8734,7 @@ clutter_actor_allocate (ClutterActor *self,
!clutter_actor_has_mapped_clones (self)) !clutter_actor_has_mapped_clones (self))
return; return;
#ifdef COGL_HAS_TRACING #ifdef HAVE_PROFILER
COGL_TRACE_SCOPED_ANCHOR (ClutterActorAllocate); COGL_TRACE_SCOPED_ANCHOR (ClutterActorAllocate);
if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))

2
clutter/clutter/clutter-align-constraint.c
View file

@ -32,7 +32,7 @@
* [class@Actor] using an alignment factor * [class@Actor] using an alignment factor
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-align-constraint.h" #include "clutter/clutter-align-constraint.h"

2
clutter/clutter/clutter-animatable.c
View file

@ -36,7 +36,7 @@
* depending on a progress factor, expressed as a floating point value. * depending on a progress factor, expressed as a floating point value.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-animatable.h" #include "clutter/clutter-animatable.h"
#include "clutter/clutter-interval.h" #include "clutter/clutter-interval.h"

4
clutter/clutter/clutter-backend.c
View file

@ -37,7 +37,7 @@
* and settings. * and settings.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-backend-private.h" #include "clutter/clutter-backend-private.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"
@ -222,7 +222,7 @@ clutter_backend_real_create_context (ClutterBackend *backend,
drivers_list = g_getenv ("CLUTTER_DRIVER"); drivers_list = g_getenv ("CLUTTER_DRIVER");
if (drivers_list == NULL) if (drivers_list == NULL)
drivers_list = CLUTTER_DRIVERS; drivers_list = "*";
known_drivers = g_strsplit (drivers_list, ",", 0); known_drivers = g_strsplit (drivers_list, ",", 0);

2
clutter/clutter/clutter-base-types.c
View file

@ -30,7 +30,7 @@
* across the whole API. * across the whole API.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-types.h" #include "clutter/clutter-types.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"

2
clutter/clutter/clutter-bezier.c
View file

@ -21,7 +21,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>

2
clutter/clutter/clutter-bin-layout.c
View file

@ -42,7 +42,7 @@
* shows how to pack actors inside a #ClutterBinLayout. * shows how to pack actors inside a #ClutterBinLayout.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-bind-constraint.c
View file

@ -81,7 +81,7 @@
* ``` * ```
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-binding-pool.c
View file

@ -93,7 +93,7 @@
* key binding handler returned %FALSE. * key binding handler returned %FALSE.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-binding-pool.h" #include "clutter/clutter-binding-pool.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"

2
clutter/clutter/clutter-blur-effect.c
View file

@ -35,7 +35,7 @@
#define CLUTTER_IS_BLUR_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT)) #define CLUTTER_IS_BLUR_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
#define CLUTTER_BLUR_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass)) #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-blur-effect.h" #include "clutter/clutter-blur-effect.h"

2
clutter/clutter/clutter-box-layout.c
View file

@ -46,7 +46,7 @@
* #ClutterBoxLayout by using clutter_box_layout_set_spacing(). * #ClutterBoxLayout by using clutter_box_layout_set_spacing().
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-brightness-contrast-effect.c
View file

@ -35,7 +35,7 @@
#define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT)) #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
#define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass)) #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

11
clutter/clutter/clutter-build-config.h.meson
View file

@ -1,11 +0,0 @@
/* The prefix for our gettext translation domains. */
#mesondefine GETTEXT_PACKAGE
/* Mutter version */
#mesondefine MUTTER_VERSION
/* List of Cogl drivers */
#mesondefine CLUTTER_DRIVERS
/* Supports PangoFt2 */
#mesondefine HAVE_PANGO_FT2

2
clutter/clutter/clutter-canvas.c
View file

@ -39,7 +39,7 @@
* for an example of how to use #ClutterCanvas.. * for an example of how to use #ClutterCanvas..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>
#include <cairo-gobject.h> #include <cairo-gobject.h>

2
clutter/clutter/clutter-click-action.c
View file

@ -87,7 +87,7 @@
* ``` * ```
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-click-action.h" #include "clutter/clutter-click-action.h"

2
clutter/clutter/clutter-clone.c
View file

@ -36,7 +36,7 @@
* implementation. * implementation.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-actor-private.h" #include "clutter/clutter-actor-private.h"
#include "clutter/clutter-clone.h" #include "clutter/clutter-clone.h"

2
clutter/clutter/clutter-color-state.c
View file

@ -43,7 +43,7 @@
* actor content is in pq or not, and things like that * actor content is in pq or not, and things like that
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-color-state.h" #include "clutter/clutter-color-state.h"

2
clutter/clutter/clutter-color.c
View file

@ -21,7 +21,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-colorize-effect.c
View file

@ -35,7 +35,7 @@
#define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT)) #define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
#define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass)) #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-colorize-effect.h" #include "clutter/clutter-colorize-effect.h"

2
clutter/clutter/clutter-constraint.c
View file

@ -125,7 +125,7 @@
* can be recovered at any point using clutter_actor_meta_get_actor(). * can be recovered at any point using clutter_actor_meta_get_actor().
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <string.h> #include <string.h>

2
clutter/clutter/clutter-content.c
View file

@ -34,7 +34,7 @@
* to share the resources associated with painting the same content.. * to share the resources associated with painting the same content..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-actor-private.h" #include "clutter/clutter-actor-private.h"
#include "clutter/clutter-content-private.h" #include "clutter/clutter-content-private.h"

2
clutter/clutter/clutter-damage-history.c
View file

@ -16,7 +16,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-damage-history.h" #include "clutter/clutter-damage-history.h"

2
clutter/clutter/clutter-deform-effect.c
View file

@ -48,7 +48,7 @@
* deformation algorithm. * deformation algorithm.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cogl/cogl.h" #include "cogl/cogl.h"

2
clutter/clutter/clutter-desaturate-effect.c
View file

@ -37,7 +37,7 @@
#define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT)) #define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT))
#define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass)) #define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-easing.c
View file

@ -1,4 +1,4 @@
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-easing.h" #include "clutter/clutter-easing.h"

2
clutter/clutter/clutter-effect.c
View file

@ -159,7 +159,7 @@
* ``` * ```
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-effect.h" #include "clutter/clutter-effect.h"

2
clutter/clutter/clutter-enum-types.c.in
View file

@ -1,5 +1,5 @@
/*** BEGIN file-header ***/ /*** BEGIN file-header ***/
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
/*** END file-header ***/ /*** END file-header ***/

2
clutter/clutter/clutter-event.c
View file

@ -23,7 +23,7 @@
* *
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-backend-private.h" #include "clutter/clutter-backend-private.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"

2
clutter/clutter/clutter-feature.c
View file

@ -35,7 +35,7 @@
* run-time. * run-time.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
clutter/clutter/clutter-fixed-layout.c
View file

@ -33,7 +33,7 @@
* layout policies as #ClutterGroup. * layout policies as #ClutterGroup.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter/clutter-fixed-layout.h" #include "clutter/clutter-fixed-layout.h"

2
clutter/clutter/clutter-flatten-effect.c
View file

@ -27,7 +27,7 @@
need to do anything on top of the ClutterOffscreenEffect class so need to do anything on top of the ClutterOffscreenEffect class so
it only exists because that class is abstract */ it only exists because that class is abstract */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-flatten-effect.h" #include "clutter/clutter-flatten-effect.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"

2
clutter/clutter/clutter-flow-layout.c
View file

@ -51,7 +51,7 @@
* shows how to use the #ClutterFlowLayout. * shows how to use the #ClutterFlowLayout.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

8
clutter/clutter/clutter-frame-clock.c
View file

@ -15,7 +15,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-frame-clock.h" #include "clutter/clutter-frame-clock.h"
@ -284,7 +284,7 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
} }
} }
#ifdef COGL_HAS_TRACING #ifdef HAVE_PROFILER
if (G_UNLIKELY (cogl_is_tracing_enabled ())) if (G_UNLIKELY (cogl_is_tracing_enabled ()))
{ {
int64_t current_time_us; int64_t current_time_us;
@ -710,7 +710,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
ClutterFrameResult result; ClutterFrameResult result;
int64_t ideal_dispatch_time_us, lateness_us; int64_t ideal_dispatch_time_us, lateness_us;
#ifdef COGL_HAS_TRACING #ifdef HAVE_PROFILER
int64_t this_dispatch_ready_time_us; int64_t this_dispatch_ready_time_us;
int64_t this_dispatch_time_us; int64_t this_dispatch_time_us;
@ -804,7 +804,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
break; break;
} }
#ifdef COGL_HAS_TRACING #ifdef HAVE_PROFILER
if (this_dispatch_ready_time_us != -1 && if (this_dispatch_ready_time_us != -1 &&
G_UNLIKELY (cogl_is_tracing_enabled ())) G_UNLIKELY (cogl_is_tracing_enabled ()))
{ {

2
clutter/clutter/clutter-gesture-action.c
View file

@ -81,7 +81,7 @@
* instead. * instead.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"

2
clutter/clutter/clutter-graphene.c
View file

@ -22,7 +22,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-graphene.h" #include "clutter/clutter-graphene.h"

2
clutter/clutter/clutter-grid-layout.c
View file

@ -26,7 +26,7 @@
* Matthias Clasen * Matthias Clasen
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-image.c
View file

@ -34,7 +34,7 @@
* for an example of how to use #ClutterImage.. * for an example of how to use #ClutterImage..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-image.h" #include "clutter/clutter-image.h"

2
clutter/clutter/clutter-input-device-tool.c
View file

@ -21,7 +21,7 @@
* Author: Carlos Garnacho <carlosg@gnome.org> * Author: Carlos Garnacho <carlosg@gnome.org>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-device-tool.h" #include "clutter/clutter-input-device-tool.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"

2
clutter/clutter/clutter-input-device.c
View file

@ -32,7 +32,7 @@
* its contents are usually defined by the Clutter backend in use. * its contents are usually defined by the Clutter backend in use.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-device.h" #include "clutter/clutter-input-device.h"

2
clutter/clutter/clutter-input-focus.c
View file

@ -17,7 +17,7 @@
* Author: Carlos Garnacho <carlosg@gnome.org> * Author: Carlos Garnacho <carlosg@gnome.org>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-focus.h" #include "clutter/clutter-input-focus.h"
#include "clutter/clutter-input-focus-private.h" #include "clutter/clutter-input-focus-private.h"

2
clutter/clutter/clutter-input-method.c
View file

@ -17,7 +17,7 @@
* Author: Carlos Garnacho <carlosg@gnome.org> * Author: Carlos Garnacho <carlosg@gnome.org>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-event-private.h" #include "clutter/clutter-event-private.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"

2
clutter/clutter/clutter-input-only-action.c
View file

@ -19,7 +19,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-only-action.h" #include "clutter/clutter-input-only-action.h"

2
clutter/clutter/clutter-input-only-actor.c
View file

@ -19,7 +19,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-only-actor.h" #include "clutter/clutter-input-only-actor.h"

2
clutter/clutter/clutter-input-pointer-a11y.c
View file

@ -21,7 +21,7 @@
* mousetweaks Copyright (C) 2007-2010 Gerd Kohlberger <gerdko gmail com> * mousetweaks Copyright (C) 2007-2010 Gerd Kohlberger <gerdko gmail com>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-backend-private.h" #include "clutter/clutter-backend-private.h"
#include "clutter/clutter-enum-types.h" #include "clutter/clutter-enum-types.h"

2
clutter/clutter/clutter-interval.c
View file

@ -42,7 +42,7 @@
* and value computation. * and value computation.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
clutter/clutter/clutter-keyframe-transition.c
View file

@ -60,7 +60,7 @@
* interval.. * interval..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-keyframe-transition.h" #include "clutter/clutter-keyframe-transition.h"

2
clutter/clutter/clutter-keymap.c
View file

@ -17,7 +17,7 @@
* Author: Carlos Garnacho <carlosg@gnome.org> * Author: Carlos Garnacho <carlosg@gnome.org>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-keymap-private.h" #include "clutter/clutter-keymap-private.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"

2
clutter/clutter/clutter-keysyms-table.c
View file

@ -1,4 +1,4 @@
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib.h> #include <glib.h>

2
clutter/clutter/clutter-layout-manager.c
View file

@ -88,7 +88,7 @@
* the #ClutterActor child of the #ClutterActor. * the #ClutterActor child of the #ClutterActor.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib-object.h> #include <glib-object.h>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>

2
clutter/clutter/clutter-layout-meta.c
View file

@ -35,7 +35,7 @@
* [class@Actor] using a [class@LayoutManager]. * [class@Actor] using a [class@LayoutManager].
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-layout-meta.h" #include "clutter/clutter-layout-meta.h"
#include "clutter/clutter-debug.h" #include "clutter/clutter-debug.h"

2
clutter/clutter/clutter-main.c
View file

@ -47,7 +47,7 @@
* [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18) * [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18)
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

2
clutter/clutter/clutter-offscreen-effect.c
View file

@ -85,7 +85,7 @@
* of [vfunc@OffscreenEffect.create_pipeline]. * of [vfunc@OffscreenEffect.create_pipeline].
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-offscreen-effect.h" #include "clutter/clutter-offscreen-effect.h"

2
clutter/clutter/clutter-page-turn-effect.c
View file

@ -33,7 +33,7 @@
* A simple page turning effect * A simple page turning effect
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-paint-context.c
View file

@ -15,7 +15,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-paint-context-private.h" #include "clutter/clutter-paint-context-private.h"
#include "clutter/clutter-frame.h" #include "clutter/clutter-frame.h"

2
clutter/clutter/clutter-paint-node.c
View file

@ -47,7 +47,7 @@
* The `ClutterPaintNodeClass` structure contains only private data. * The `ClutterPaintNodeClass` structure contains only private data.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#include <pango/pango.h> #include <pango/pango.h>

2
clutter/clutter/clutter-paint-nodes.c
View file

@ -23,7 +23,7 @@
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-paint-node-private.h" #include "clutter/clutter-paint-node-private.h"

2
clutter/clutter/clutter-paint-volume.c
View file

@ -24,7 +24,7 @@
* Emmanuele Bassi <ebassi@linux.intel.com> * Emmanuele Bassi <ebassi@linux.intel.com>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <string.h> #include <string.h>

2
clutter/clutter/clutter-pan-action.c
View file

@ -51,7 +51,7 @@
* when dragging. * when dragging.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-pan-action.h" #include "clutter/clutter-pan-action.h"

2
clutter/clutter/clutter-path-constraint.c
View file

@ -34,7 +34,7 @@
* control how far along the path the [class@Actor] should be.. * control how far along the path the [class@Actor] should be..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-path-constraint.h" #include "clutter/clutter-path-constraint.h"

2
clutter/clutter/clutter-path.c
View file

@ -58,7 +58,7 @@
* [method@Path.add_string] for details. * [method@Path.add_string] for details.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>

2
clutter/clutter/clutter-pick-context.c
View file

@ -15,7 +15,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-backend.h" #include "clutter/clutter-backend.h"
#include "clutter/clutter-pick-context-private.h" #include "clutter/clutter-pick-context-private.h"

2
clutter/clutter/clutter-property-transition.c
View file

@ -28,7 +28,7 @@
* can be used to tween a property of a [iface@Animatable] instance. * can be used to tween a property of a [iface@Animatable] instance.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-property-transition.h" #include "clutter/clutter-property-transition.h"

2
clutter/clutter/clutter-rotate-action.c
View file

@ -31,7 +31,7 @@
* the logic for recognizing rotate gestures using two touch points. * the logic for recognizing rotate gestures using two touch points.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-scroll-actor.c
View file

@ -40,7 +40,7 @@
* for an example of how to use #ClutterScrollActor.. * for an example of how to use #ClutterScrollActor..
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-scroll-actor.h" #include "clutter/clutter-scroll-actor.h"

2
clutter/clutter/clutter-seat.c
View file

@ -21,7 +21,7 @@
* Author: Carlos Garnacho <carlosg@gnome.org> * Author: Carlos Garnacho <carlosg@gnome.org>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-input-device-tool.h" #include "clutter/clutter-input-device-tool.h"
#include "clutter/clutter-input-pointer-a11y-private.h" #include "clutter/clutter-input-pointer-a11y-private.h"

2
clutter/clutter/clutter-settings.c
View file

@ -15,7 +15,7 @@
* for instance the default font name. * for instance the default font name.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-settings.h" #include "clutter/clutter-settings.h"

2
clutter/clutter/clutter-shader-effect.c
View file

@ -110,7 +110,7 @@
* ``` * ```
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "cogl/cogl.h" #include "cogl/cogl.h"

2
clutter/clutter/clutter-shader-types.c
View file

@ -24,7 +24,7 @@
* *
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib-object.h> #include <glib-object.h>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>

2
clutter/clutter/clutter-snap-constraint.c
View file

@ -33,7 +33,7 @@
* An offset can be applied to the constraint, to provide spacing. * An offset can be applied to the constraint, to provide spacing.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-stage-manager.c
View file

@ -35,7 +35,7 @@
* be emitted * be emitted
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-stage-manager-private.h" #include "clutter/clutter-stage-manager-private.h"

2
clutter/clutter/clutter-stage-view.c
View file

@ -15,7 +15,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-stage-view.h" #include "clutter/clutter-stage-view.h"
#include "clutter/clutter-stage-view-private.h" #include "clutter/clutter-stage-view-private.h"

2
clutter/clutter/clutter-stage-window.c
View file

@ -1,4 +1,4 @@
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib-object.h> #include <glib-object.h>

2
clutter/clutter/clutter-stage.c
View file

@ -35,7 +35,7 @@
* parent class corresponding function. * parent class corresponding function.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-swipe-action.c
View file

@ -35,7 +35,7 @@
* the logic for recognizing swipe gestures. * the logic for recognizing swipe gestures.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-swipe-action.h" #include "clutter/clutter-swipe-action.h"

2
clutter/clutter/clutter-tap-action.c
View file

@ -51,7 +51,7 @@
* ``` * ```
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-tap-action.h" #include "clutter/clutter-tap-action.h"

2
clutter/clutter/clutter-text-buffer.c
View file

@ -17,7 +17,7 @@
* Author: Stef Walter <stefw@collabora.co.uk> * Author: Stef Walter <stefw@collabora.co.uk>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-text-buffer.h" #include "clutter/clutter-text-buffer.h"
#include "clutter/clutter-marshal.h" #include "clutter/clutter-marshal.h"

2
clutter/clutter/clutter-text.c
View file

@ -37,7 +37,7 @@
* [method@Text.set_selectable]. * [method@Text.set_selectable].
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-texture-content.c
View file

@ -24,7 +24,7 @@
* Robert Mader <robert.mader@posteo.de> * Robert Mader <robert.mader@posteo.de>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-texture-content.h" #include "clutter/clutter-texture-content.h"

2
clutter/clutter/clutter-timeline.c
View file

@ -74,7 +74,7 @@
* [class@Transition]. * [class@Transition].
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-timeline.h" #include "clutter/clutter-timeline.h"

2
clutter/clutter/clutter-transition-group.c
View file

@ -35,7 +35,7 @@
* 5 seconds of the transition will be played. * 5 seconds of the transition will be played.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-transition-group.h" #include "clutter/clutter-transition-group.h"

2
clutter/clutter/clutter-transition.c
View file

@ -30,7 +30,7 @@
* computes the interpolation between two values, stored by a [class@Interval]. * computes the interpolation between two values, stored by a [class@Interval].
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include "clutter/clutter-transition.h" #include "clutter/clutter-transition.h"

2
clutter/clutter/clutter-util.c
View file

@ -30,7 +30,7 @@
* Various miscellaneous utilility functions. * Various miscellaneous utilility functions.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <fribidi.h> #include <fribidi.h>
#include <math.h> #include <math.h>

2
clutter/clutter/clutter-virtual-input-device.c
View file

@ -21,7 +21,7 @@
* Author: Jonas Ådahl <jadahl@gmail.com> * Author: Jonas Ådahl <jadahl@gmail.com>
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <glib-object.h> #include <glib-object.h>

2
clutter/clutter/clutter-zoom-action.c
View file

@ -44,7 +44,7 @@
* distance between two touch points. * distance between two touch points.
*/ */
#include "clutter/clutter-build-config.h" #include "config.h"
#include <math.h> #include <math.h>

17
clutter/clutter/meson.build
View file

@ -244,21 +244,6 @@ cally_private_headers = [
clutter_built_sources = [] clutter_built_sources = []
clutter_built_headers = [] clutter_built_headers = []
clutter_built_private_headers = []
cdata = configuration_data()
cdata.set_quoted('MUTTER_VERSION', meson.project_version())
cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
cdata.set('CLUTTER_DRIVERS', '"*"')
cdata.set('HAVE_PANGO_FT2', have_pango_ft2)
clutter_build_config_h = configure_file(
input: 'clutter-build-config.h.meson',
output: 'clutter-build-config.h',
configuration: cdata,
install: false,
)
clutter_built_private_headers += clutter_build_config_h
clutter_enum_types = gnome.mkenums('clutter-enum-types', clutter_enum_types = gnome.mkenums('clutter-enum-types',
sources: clutter_headers, sources: clutter_headers,
@ -297,7 +282,7 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
version: '0.0.0', version: '0.0.0',
soversion: 0, soversion: 0,
c_args: clutter_c_args, c_args: clutter_c_args,
include_directories: clutter_includes, include_directories: [clutter_includes, top_includepath],
dependencies: [clutter_deps], dependencies: [clutter_deps],
gnu_symbol_visibility: 'hidden', gnu_symbol_visibility: 'hidden',
link_with: [ link_with: [

10
cogl/cogl-config.h.meson
View file

@ -1,10 +0,0 @@
/* Have GL for rendering */
#mesondefine HAVE_COGL_GL
/* Have GLES 2.0 for rendering */
#mesondefine HAVE_COGL_GLES2
/* Enable unit tests */
#mesondefine ENABLE_UNIT_TESTS
#define COGL_CONFIG_H_INCLUDED 1

2
cogl/cogl-pango/cogl-pango-display-list.c
View file

@ -26,7 +26,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "cogl-config.h" #include "config.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>

2
cogl/cogl-pango/cogl-pango-fontmap.c
View file

@ -26,7 +26,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "cogl-config.h" #include "config.h"
/* This is needed to get the Pango headers to export stuff needed to /* This is needed to get the Pango headers to export stuff needed to
subclass */ subclass */

2
cogl/cogl-pango/cogl-pango-glyph-cache.c
View file

@ -26,7 +26,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "cogl-config.h" #include "config.h"
#include <glib.h> #include <glib.h>

Some files were not shown because too many files have changed in this diff Show more