[rhythmbox/wip/sam/meson: 39/39] Update and fix Meson build instructions

[Sam Thursfield <sthursfield src gnome org>]

commit 13906337cfbf094d5a7b744e5b5f67b904d66ab1
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Aug 4 13:47:50 2017 +0100

    Update and fix Meson build instructions

 lib/meson.build                |    3 ++-
 meson.build                    |   23 +----------------------
 meson_options.txt              |    2 --
 plugins/meson.build            |    4 ----
 plugins/visualizer/meson.build |   34 ----------------------------------
 shell/meson.build              |    4 ++--
 6 files changed, 5 insertions(+), 65 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index b275887..f0b4d17 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -45,7 +45,7 @@ lib_dependencies = [
    libpeas_gtk, libxml
 ]
 
-librb = library('rb', lib_sources,
+librb = static_library('rb', lib_sources,
   c_args: lib_c_args + ['-DG_LOG_DOMAIN="Rhythmbox"'],
   include_directories: [configinc],
   dependencies: lib_dependencies,
@@ -54,6 +54,7 @@ librb = library('rb', lib_sources,
 )
 
 lib_dep = declare_dependency(
+  link_whole: librb,
   link_with: librb,
   dependencies: lib_dependencies,
   include_directories: [configinc, libinc],
diff --git a/meson.build b/meson.build
index cad66be..995ea3a 100644
--- a/meson.build
+++ b/meson.build
@@ -224,7 +224,7 @@ if set_more_warnings == true and cc.get_id() == 'gcc'
     '-Wreturn-type', '-Wswitch', '-Wtrigraphs', '-Wunused-function',
     '-Wunused-label', '-Wunused-value', '-Wchar-subscripts',
     '-Wmissing-declarations', '-Wmissing-prototypes', '-Wnested-externs',
-    '-Wpointer-arith', '-Wcast-align', '-Wformat-security', '-Wall', '-Werror',
+    '-Wpointer-arith', '-Wcast-align', '-Wformat-security', '-Wall',
     '-Wno-deprecated-declarations', '-std=gnu89']
 
   # in configure.ac this option is only added if '-O0' is not present in the CFLAGS
@@ -317,21 +317,6 @@ if get_option('daap') != 'no'
   endif
 endif
 
-use_clutter = false
-if get_option('visualizer') != 'no'
-  clutter = dependency('clutter-1.0', version: '>= 1.8', required: false)
-  clutter_x11 = dependency('clutter-x11-1.0', version: '>= 1.8', required: false)
-  clutter_gst = dependency('clutter-gst-2.0', version: '>= 2.0', required: false)
-  clutter_gtk = dependency('clutter-gtk-1.0', version: '>= 1.8', required: false)
-  mx = dependency('mx-1.0', version: '>= 1.0.1', required: false)
-
-  if clutter.found() and clutter_x11.found() and clutter_gst.found() and clutter_gtk.found() and mx.found()
-    use_clutter = true
-  elif get_option('visualizer') == 'yes'
-    error('Visualizer support explicitly requested, but clutter couldn\'t be found')
-  endif
-endif
-
 if get_option('grilo') != 'no'
   grilo = dependency('grilo-0.3', version: '>= 0.3.0', required: false)
 
@@ -430,12 +415,6 @@ else
   message('   iTunes detection browser plugin (for podcasts) disabled')
 endif
 
-if use_clutter
-  message('** Visualizer plugin enabled')
-else
-  message('   Visualizer plugin disabled')
-endif
-
 message('End options')
 
 configinc = include_directories('.')
diff --git a/meson_options.txt b/meson_options.txt
index ab0dcf9..6282325 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,8 +28,6 @@ option('python-plugins', type: 'combo', choices: ['yes', 'no', 'auto'], value: '
        description: 'Enable Python plugins')
 option('vala-plugins', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
        description: 'Enable Vala plugins')
-option('visualizer', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
-       description: 'Enable visualizer plugin support')
 
 option('database', type: 'combo', choices: ['tree'], value: 'tree',
        description: 'Select the database to use (default tree)')
diff --git a/plugins/meson.build b/plugins/meson.build
index 5193cf3..e0584a3 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -51,10 +51,6 @@ if enable_fm_radio
   subdir('fmradio')
 endif
 
-if use_clutter
-  subdir('visualizer')
-endif
-
 if use_notify
   subdir('notification')
 endif
diff --git a/shell/meson.build b/shell/meson.build
index 8f36942..aa4c0e3 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -37,8 +37,8 @@ shell_headers = [
 install_headers(shell_headers, subdir: 'rhythmbox/shell')
 
 resources = gnome.compile_resources('rb-resources', 'rhythmbox.gresource.xml',
-  source_dir: ['../data/'],
-  dependencies: playlists_xml)
+  source_dir: ['../data/'])
+  #dependencies: playlists_xml)
 
 shell_sources = [
   authors_tab,