[shotwell] Revert "build: Consistent meson_options.txt"

[Jens Georg <jensgeorg src gnome org>]

commit 25450824e26d5b4c246e728c4c45c076597d635d
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 30 13:10:06 2020 +0200

    Revert "build: Consistent meson_options.txt"
    
    This reverts commit 8e23fa183482cb08a3fd1e31db8fcd5a74bfc590.
    
    Broken...

 flatpak/org.gnome.Shotwell.json |  4 ++--
 meson.build                     |  8 ++++----
 meson_options.txt               | 12 ++++++------
 src/meson.build                 |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 6299e2c4..418c27db 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -223,8 +223,8 @@
             "buildsystem" : "meson",
             "config-opts" : [
                 "-Dudev=false",
-                "-Dinstall_apport_hook=false",
-                "-Dface_detection=true",
+                "-Dinstall-apport-hook=false",
+                "-Dface-detection=true",
                 "-Dface_detection_helper_bus=private"
             ],
             "sources" : [
diff --git a/meson.build b/meson.build
index 566cc006..145fcda9 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ webpdemux = dependency('libwebpdemux')
 webp = dependency('libwebp')
 
 unity_available = false
-if unity.found() and get_option('unity')
+if unity.found() and get_option('unity-support')
   unity_available = true
   add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
 endif
@@ -93,7 +93,7 @@ foreach measure : get_option('measure')
                        language : 'vala')
 endforeach
 
-if not get_option('dupe_detection')
+if not get_option('dupe-detection')
   add_global_arguments(['--define=NO_DUPE_DETECTION'], language : 'vala')
 endif
 
@@ -101,14 +101,14 @@ if get_option('udev') and gudev.found()
   add_global_arguments(['--define=HAVE_UDEV'], language : 'vala')
 endif
 
-if get_option('face_detection')
+if get_option('face-detection')
   add_global_arguments(['--define=ENABLE_FACES'], language : 'vala')
 
   if get_option('face_detection_helper_bus') == 'private'
       add_global_arguments(['--define=FACEDETECT_BUS_PRIVATE'], language : 'vala')
   endif
 
-  if get_option('face_detection_helper')
+  if get_option('face-detection-helper')
       subproject('shotwell-facedetect')
   endif
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 39cd8c09..0338d469 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,12 @@
-option('unity', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
+option('unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
 option('publishers', type: 'array', choices: 
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], value : 
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], description: 'The list of publishing 
plugins to build')
-option('extra_plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of 
extra publishing plugins')
+option('extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of 
extra publishing plugins')
 option('trace', type: 'array', choices: ['dtors', 'import', 'md5', 'metadata-writer', 'monitoring', 
'pixbuf-cache', 'reflow', 'reflow-items'], value : [], description: 'Enable various trace options')
 option('measure', type: 'array', choices: ['enhance', 'import', 'pipeline', 'view-filtering', 
'thumbnail-cache'], value : [], description : 'Enable various timing measurements')
-option('dupe_detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
+option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
 option('udev', type: 'boolean', value : 'true', description: 'Enable or disable udev support')
-option('install_apport_hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
-option('face_detection', type:'boolean', value:false, description: 'Enable face detection and recognition 
features')
-option('face_detection_helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')
+option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
+option('face-detection', type:'boolean', value:false, description: 'Enable face detection and recognition 
features')
+option('face-detection-helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')
 option('face_detection_helper_bus', type:'combo', choices: ['private', 'session'], value : 'session', 
description: 'Which DBus bus to use for external helper tool')
 option('fatal_warnings', type:'boolean', value:false)
diff --git a/src/meson.build b/src/meson.build
index 896878c7..b9729445 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,7 +26,7 @@ shotwell_libs = [sw_graphics_processor]
 face_sources = []
 face_obj = ''
 
-if get_option('face_detection')
+if get_option('face-detection')
   face_sources = (['faces/FacesBranch.vala',
                      'faces/FacePage.vala',
                      'faces/FaceShape.vala',