diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2018-10-04 14:39:01 +0200 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-10-08 16:54:06 +0300 |
| commit | ddb382855e25cd0fd81c56f75f380d4c4422fbad (patch) | |
| tree | ebd4479f475f236820ce1ccc3717373680634767 | |
| parent | e3b1c3498abf54377245e6d298b4cbcef663d8b4 (diff) | |
igt: Make pixman mandatory
So far, pixman was used exclusively when the Chamelium support was enabled.
However, since we're going to use it as one of the backend to do the
igt_fb conversions between formats, we'll need it all the time. Make
that explicit.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/meson.build | 5 | ||||
| -rw-r--r-- | meson.build | 9 |
4 files changed, 8 insertions, 11 deletions
@@ -145,6 +145,7 @@ the default configuration (package names may vary): libcairo2-dev libdrm-dev libkmod-dev + libpixman-1-dev libpciaccess-dev libprocps-dev libunwind-dev @@ -157,7 +158,6 @@ The following dependencies are required for building chamelium support (package names may vary): libxmlrpc-core-c3-dev - libpixman-1-dev libudev-dev libglib2.0-dev libgsl-dev diff --git a/configure.ac b/configure.ac index c75ef284..b80e905e 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,7 @@ PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXran PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0]) PKG_CHECK_MODULES(LIBUDEV, [libudev]) PKG_CHECK_MODULES(GLIB, [glib-2.0]) +PKG_CHECK_MODULES(PIXMAN, [pixman-1]) PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no]) AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes]) @@ -206,8 +207,6 @@ if test "x$enable_chamelium" = xyes; then AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.]) fi fi - PKG_CHECK_MODULES(PIXMAN, pixman-1, [], - [AC_MSG_ERROR([Failed to find pixman, required by chamelium.])]) if test x"$gsl" != xyes; then AC_MSG_ERROR([Failed to find gsl, required by chamelium.]) fi diff --git a/lib/meson.build b/lib/meson.build index e60e5e02..7e2c9b7a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -66,6 +66,7 @@ lib_deps = [ math, realtime, ssl, + pixman, ] if libdrm_intel.found() @@ -79,8 +80,8 @@ if valgrind.found() lib_deps += valgrind endif -if gsl.found() and pixman.found() - lib_deps += [ gsl, pixman ] +if gsl.found() + lib_deps += [ gsl ] lib_sources += [ 'igt_frame.c', 'igt_audio.c' ] endif diff --git a/meson.build b/meson.build index faf1b764..eff35585 100644 --- a/meson.build +++ b/meson.build @@ -105,6 +105,7 @@ libprocps = dependency('libprocps', required : true) libunwind = dependency('libunwind', required : true) libdw = dependency('libdw', required : true) ssl = dependency('openssl', required : true) +pixman = dependency('pixman-1', required : true) valgrind = null_dep valgrindinfo = 'No' @@ -123,16 +124,12 @@ glib = dependency('glib-2.0', required : true) gsl = null_dep alsa = null_dep -pixman = null_dep if _build_audio or _build_chamelium gsl = dependency('gsl', required : _audio_required or _chamelium_required) endif if _build_audio alsa = dependency('alsa', required : _audio_required) endif -if _build_chamelium - pixman = dependency('pixman-1', required : _chamelium_required) -endif audioinfo = 'No' if _build_audio and alsa.found() and gsl.found() @@ -164,8 +161,8 @@ endif chamelium = null_dep chameliuminfo = 'No' -if _build_chamelium and pixman.found() and gsl.found() and xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() - chamelium = declare_dependency(dependencies : [ pixman, xmlrpc, +if _build_chamelium and gsl.found() and xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() + chamelium = declare_dependency(dependencies : [ xmlrpc, xmlrpc_util, xmlrpc_client]) config.set('HAVE_CHAMELIUM', 1) chameliuminfo = 'Yes' |