[igt-dev] [PATCH i-g-t 1/2] Make GLib mandatory

[Daniel Vetter]

On Thu, Jun 21, 2018 at 02:06:24PM +0300, Petri Latvala wrote:
> GLib was originally made optional for Android builds, and Android
> support was dropped a while ago due to lack of use and maintenance.
> 
> Building without GLib was broken without bug reports anyway.
> 
> Signed-off-by: Petri Latvala <petri.latvala at intel.com>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  configure.ac   |  8 +-------
>  lib/igt_core.c | 10 ----------
>  lib/igt_rc.h   |  2 --
>  meson.build    |  5 +----
>  4 files changed, 2 insertions(+), 23 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 2f6bc70e..1ee4e90e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -177,10 +177,7 @@ PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXran
>  # for testdisplay
>  PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0])
>  PKG_CHECK_MODULES(LIBUDEV, [libudev])
> -PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib=yes], [glib=no])
> -if test x"$glib" = xyes; then
> -	AC_DEFINE(HAVE_GLIB,1,[Enable glib support])
> -fi
> +PKG_CHECK_MODULES(GLIB, [glib-2.0])
>  PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no])
>  AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes])
>  
> @@ -206,9 +203,6 @@ if test "x$enable_chamelium" = xyes; then
>  	fi
>  	PKG_CHECK_MODULES(PIXMAN, pixman-1, [],
>  			  [AC_MSG_ERROR([Failed to find pixman, required by chamelium.])])
> -	if test x"$glib" != xyes; then
> -		AC_MSG_ERROR([Failed to find glib, required by chamelium.])
> -	fi
>  	if test x"$gsl" != xyes; then
>  		AC_MSG_ERROR([Failed to find gsl, required by chamelium.])
>  	fi
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index 06d8b037..3313050c 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -55,9 +55,7 @@
>  #include <limits.h>
>  #include <locale.h>
>  #include <uwildmat/uwildmat.h>
> -#ifdef HAVE_GLIB
>  #include <glib.h>
> -#endif
>  
>  #include "drmtest.h"
>  #include "intel_chipset.h"
> @@ -299,9 +297,7 @@ static struct {
>  } log_buffer;
>  static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
>  
> -#ifdef HAVE_GLIB
>  GKeyFile *igt_key_file;
> -#endif
>  
>  char *igt_frame_dump_path;
>  
> @@ -573,7 +569,6 @@ static void oom_adjust_for_doom(void)
>  
>  }
>  
> -#ifdef HAVE_GLIB
>  static void common_init_config(void)
>  {
>  	char *key_file_env = NULL;
> @@ -624,7 +619,6 @@ out:
>  	if (!key_file_env && key_file_loc)
>  		free(key_file_loc);
>  }
> -#endif
>  
>  static void common_init_env(void)
>  {
> @@ -778,9 +772,7 @@ static int common_init(int *argc, char **argv,
>  		}
>  	}
>  
> -#ifdef HAVE_GLIB
>  	common_init_config();
> -#endif
>  
>  out:
>  	free(short_opts);
> @@ -1435,10 +1427,8 @@ void igt_exit(void)
>  {
>  	igt_exit_called = true;
>  
> -#ifdef HAVE_GLIB
>  	if (igt_key_file)
>  		g_key_file_free(igt_key_file);
> -#endif
>  
>  	if (run_single_subtest && !run_single_subtest_found) {
>  		igt_warn("Unknown subtest: %s\n", run_single_subtest);
> diff --git a/lib/igt_rc.h b/lib/igt_rc.h
> index d7a314c5..53e5ce66 100644
> --- a/lib/igt_rc.h
> +++ b/lib/igt_rc.h
> @@ -25,10 +25,8 @@
>  #ifndef IGT_RC_H
>  #define IGT_RC_H
>  
> -#ifdef HAVE_GLIB
>  #include <glib.h>
>  
>  extern GKeyFile *igt_key_file;
>  
> -#endif /* HAVE_GLIB */
>  #endif /* IGT_RC_H */
> diff --git a/meson.build b/meson.build
> index cd736d8e..98216fc4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -50,10 +50,7 @@ endif
>  
>  cairo = dependency('cairo', version : '>1.12.0', required : true)
>  libudev = dependency('libudev', required : true)
> -glib = dependency('glib-2.0', required : false)
> -if glib.found()
> -	config.set('HAVE_GLIB', 1)
> -endif
> +glib = dependency('glib-2.0', required : true)
>  
>  gsl = dependency('gsl', required : false)
>  alsa = dependency('alsa', required : false)
> -- 
> 2.14.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch