mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 21:02:14 +00:00
cleanup: Stop allowing deprecated Cogl API usage
Allow only specific files to use those deprecated APIs making it easier to find where deprecated APIs are still in use and avoid introducing new usages without being noticed Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3400>
This commit is contained in:
parent
da2771e293
commit
371d28a766
@ -112,6 +112,8 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include "cogl/cogl.h"
|
||||
|
||||
#include "clutter/clutter-shader-effect.h"
|
||||
|
@ -17,6 +17,8 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include "clutter/clutter-stage-view.h"
|
||||
#include "clutter/clutter-stage-view-private.h"
|
||||
|
||||
|
@ -303,7 +303,6 @@ if have_introspection
|
||||
clutter_introspection_args = introspection_args + [
|
||||
'-DCLUTTER_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
|
||||
'-DCLUTTER_COMPILATION=1',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DG_LOG_DOMAIN="Clutter"'
|
||||
]
|
||||
|
||||
|
@ -7,7 +7,6 @@ clutter_includes = [clutter_includepath, cogl_includepath]
|
||||
clutter_c_args = [
|
||||
'-DCLUTTER_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
|
||||
'-DCLUTTER_COMPILATION=1',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DCOGL_ENABLE_MUTTER_API',
|
||||
'-DG_LOG_DOMAIN="Clutter"',
|
||||
]
|
||||
|
@ -50,7 +50,6 @@ if have_introspection
|
||||
mtk_introspection_args = introspection_args + [
|
||||
'-DMTK_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
|
||||
'-DMTK_COMPILATION=1',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DG_LOG_DOMAIN="Mtk"'
|
||||
]
|
||||
|
||||
|
@ -25,6 +25,8 @@
|
||||
* Emmanuele Bassi
|
||||
*/
|
||||
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "backends/meta-stage-impl-private.h"
|
||||
|
@ -177,7 +177,6 @@ mutter_deps = [
|
||||
|
||||
mutter_c_args = [
|
||||
'-DCOGL_ENABLE_MUTTER_API',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DSN_API_NOT_YET_FROZEN=1',
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
|
@ -1,6 +1,5 @@
|
||||
clutter_tests_conform_c_args = [
|
||||
'-DG_LOG_DOMAIN="Clutter-Conform"',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
clutter_tests_conform_c_args += clutter_debug_c_args
|
||||
|
@ -4,7 +4,6 @@ clutter_tests_interactive_includepath = include_directories('.')
|
||||
clutter_tests_interactive_c_args = [
|
||||
'-DTESTS_DATADIR="@0@"'.format(clutter_tests_interactive_srcdir),
|
||||
'-DG_DISABLE_SINGLE_INCLUDES',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
clutter_tests_interactive_c_args += clutter_debug_c_args
|
||||
|
@ -1,3 +1,5 @@
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include <clutter/clutter.h>
|
||||
|
||||
#include <errno.h>
|
||||
|
@ -1,6 +1,5 @@
|
||||
clutter_tests_micro_bench_c_args = [
|
||||
'-DG_DISABLE_SINGLE_INCLUDES',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
clutter_tests_micro_bench_c_args += clutter_debug_c_args
|
||||
|
@ -1,7 +1,6 @@
|
||||
clutter_tests_performance_c_args = [
|
||||
'-DTESTS_DATA_DIR="@0@"'.format(clutter_tests_interactive_srcdir),
|
||||
'-DG_DISABLE_SINGLE_INCLUDES',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
|
||||
|
@ -58,8 +58,6 @@ cogl_test_conformance_includes = [
|
||||
|
||||
cogl_test_c_args = [
|
||||
cogl_debug_c_args,
|
||||
'-DCOGL_DISABLE_DEPRECATED',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
'-DTESTS_DATADIR="@0@/tests/data"'.format(cogl_srcdir),
|
||||
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
|
||||
]
|
||||
|
@ -1,3 +1,5 @@
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include <cogl/cogl.h>
|
||||
|
||||
#include <string.h>
|
||||
|
@ -1,3 +1,5 @@
|
||||
#define COGL_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include <cogl/cogl.h>
|
||||
|
||||
#include <string.h>
|
||||
|
@ -28,8 +28,6 @@ foreach unit_test: cogl_unit_tests
|
||||
c_args: [
|
||||
'-D__COGL_H_INSIDE__',
|
||||
'-DCOGL_ENABLE_MUTTER_API',
|
||||
'-DCOGL_DISABLE_DEPRECATED',
|
||||
'-DCOGL_DISABLE_DEPRECATION_WARNINGS',
|
||||
],
|
||||
include_directories: [
|
||||
cogl_includepath,
|
||||
|
Loading…
Reference in New Issue
Block a user