[rhythmbox] remove some unused build options, checks and config.h stuff



commit 6e3dd2e621afc9bbeb02679814d347f9b4a49159
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jan 18 19:50:26 2022 +1000

    remove some unused build options, checks and config.h stuff
    
    We've only had one database backend for as long as I can remember.
    If someone wants to write a new one, hooking it into the build is the
    least of their problems.

 config.h.meson       | 21 ---------------------
 meson.build          | 27 +--------------------------
 meson_options.txt    |  4 ----
 rhythmdb/meson.build |  5 +----
 shell/rb-shell.c     |  8 --------
 5 files changed, 2 insertions(+), 63 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index f3493ca8d..5d14a8ca9 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -14,35 +14,14 @@
 /* Use GUdev for hardware detection */
 #mesondefine HAVE_GUDEV
 
-/* Have libbrasero-media */
-#mesondefine HAVE_LIBBRASERO_MEDIA
-
-/* Define if libdmapsharing support is enabled */
-#mesondefine HAVE_LIBDMAPSHARING
-
 /* define if Multimedia Keys are enabled */
 #mesondefine HAVE_MMKEYS
 
-/* Define if libnotify support is enabled */
-#mesondefine HAVE_NOTIFY
-
-/* Define if strftime supports %E and %O modifiers. */
-#mesondefine HAVE_STRFTIME_EXTENSION
-
 /* Name of package */
 #mesondefine PACKAGE
 
-/* Define to the level of RhythmDB coherence checking */
-#mesondefine RHYTHMDB_ENABLE_COHERENCE_CHECK
-
 /* Define if libsecret support is enabled */
 #mesondefine WITH_LIBSECRET
 
-/* Define if you are using the RhythmDB tree database */
-#mesondefine WITH_RHYTHMDB_TREE
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#mesondefine X_DISPLAY_MISSING
-#
 /* Define to the version of this package. */
 #define VERSION "@VERSION@"
diff --git a/meson.build b/meson.build
index ccb9da28e..abfc83762 100644
--- a/meson.build
+++ b/meson.build
@@ -138,15 +138,10 @@ if get_option('brasero').allowed()
   brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
 
   if brasero_media.found()
-    cdata.set('HAVE_LIBBRASERO_MEDIA', 1)
     have_libbrasero_media = true
   endif
 endif
 
-cdata.set10('WITH_RHYTHMDB_TREE', 1)
-
-cdata.set10('RHYTHMDB_ENABLE_COHERENCE_CHECK', get_option('rhythmdb_debug'))
-
 have_gnu_fwrite_unlocked = cc.has_function('fwrite_unlocked')
 cdata.set10('HAVE_GNU_FWRITE_UNLOCKED', have_gnu_fwrite_unlocked)
 
@@ -162,22 +157,6 @@ if totem_plparser_uselibcamel == 'no'
   error('totem playlist parsing library has Podcast parsing disabled')
 endif
 
-test_strftime_src = '''#include <time.h>
-int main ()
-{
-  char buf[100];
-  struct tm tm = {0};
-  tm.tm_year = 99;
-  if (strftime(buf, 100, "%EY", &tm) == 4 &&
-      strcmp (buf, "1999")==0)
-    return 0;
-  return 1;
-}'''
-
-if cc.compiles(test_strftime_src, name: 'whether strftime supports %E and %O modifiers')
-  cdata.set('HAVE_STRFTIME_EXTENSION', 1)
-endif
-
 cdata.set('GETTEXT_PACKAGE', '"rhythmbox"')
 cdata.set('PACKAGE', '"rhythmbox"')
 cdata.set('VERSION', '@0@'.format(meson.project_version()))
@@ -235,12 +214,10 @@ if get_option('daap').allowed()
   libdmapsharing4 = dependency('libdmapsharing-4.0', version: '>= 3.9.4', required: false)
 
   if libdmapsharing4.found()
-    cdata.set('HAVE_LIBDMAPSHARING4', 1)
     have_libdmapsharing = true
   else
     libdmapsharing = dependency('libdmapsharing-3.0', version: '>= 2.9.19', required: get_option('daap'))
     if libdmapsharing.found()
-      cdata.set('HAVE_LIBDMAPSHARING', 1)
       have_libdmapsharing = true
     endif
   endif
@@ -278,9 +255,7 @@ configure_file(input : 'config.h.meson',
   output : 'config.h',
 configuration : cdata)
 
-summary({'Database': get_option('database'),
-         'Coherence check level': get_option('rhythmdb_debug'),
-         'Tests': enable_check},
+summary({'Tests': enable_check},
         section: 'General')
 summary({'Multimedia keys': enable_mmkeys,
          'iPod integration': use_ipod,
diff --git a/meson_options.txt b/meson_options.txt
index 4237bf141..73e113bff 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,9 +31,5 @@ option('help', type: 'boolean', value: 'true',
        description: 'Install user documentation')
 option('gtk_doc', type: 'boolean', value: 'false',
        description: 'Use gtk-doc to build documentation')
-option('database', type: 'combo', choices: ['tree'], value: 'tree',
-       description: 'Select the database to use (default tree)')
 option('tests', type: 'boolean', value: 'false',
        description: 'Build tests')
-option('rhythmdb_debug', type: 'combo', choices: ['0', '1', '2'], value: '0',
-       description: 'Level of RhythmDB coherence checking')
diff --git a/rhythmdb/meson.build b/rhythmdb/meson.build
index de438d9c5..1a91cf6c0 100644
--- a/rhythmdb/meson.build
+++ b/rhythmdb/meson.build
@@ -26,12 +26,9 @@ rhythmdb_sources = files(
   'rhythmdb-query-results.c',
   'rhythmdb-query.c',
   'rhythmdb-song-entry-types.c',
+  'rhythmdb-tree.c',
 )
 
-if get_option('database') == 'tree'
-  rhythmdb_sources += files('rhythmdb-tree.c')
-endif
-
 c_args = [
   '-DGNOMELOCALEDIR="' + datadir + '/locale"',
   '-DG_LOG_DOMAIN="RhythmDB"',
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 9e23286cb..96476d055 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -61,11 +61,7 @@
 #include "rb-shell.h"
 #include "rb-debug.h"
 #include "rb-dialog.h"
-#ifdef WITH_RHYTHMDB_TREE
 #include "rhythmdb-tree.h"
-#else
-#error "no database specified. configure broken?"
-#endif
 #include "rb-display-page-tree.h"
 #include "rb-display-page-group.h"
 #include "rb-file-helpers.h"
@@ -457,11 +453,7 @@ construct_db (RBShell *shell)
                pathname = rb_find_user_data_file ("rhythmdb.xml");
        }
 
-#ifdef WITH_RHYTHMDB_TREE
        shell->priv->db = rhythmdb_tree_new (pathname);
-#elif defined(WITH_RHYTHMDB_GDA)
-       shell->priv->db = rhythmdb_gda_new (pathname);
-#endif
        g_free (pathname);
 
        if (shell->priv->dry_run)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]