all: Force declared GLib version

37 files changed, 82 insertions, 4 deletions

diff --git a/internal/meson.build b/internal/meson.build
new file mode 100644
index 0000000..4060f6a
--- /dev/null
+++ b/internal/meson.build
@@ -0,0 +1,3 @@
+config_h = configure_file(output : 'config.h', configuration : conf)
+config_h_inc = include_directories('.')
+
diff --git a/libgupnp-av/fragment-util.c b/libgupnp-av/fragment-util.c
index f899fc4..76fb286 100644
--- a/libgupnp-av/fragment-util.c
+++ b/libgupnp-av/fragment-util.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <stdarg.h>
 #include <libxml/parserInternals.h>
 
diff --git a/libgupnp-av/gupnp-av-error.c b/libgupnp-av/gupnp-av-error.c
index 586cb32..6030985 100644
--- a/libgupnp-av/gupnp-av-error.c
+++ b/libgupnp-av/gupnp-av-error.c
@@ -10,6 +10,8 @@
  *
  */
 
+#include <config.h>
+
 #include "gupnp-av-error.h"
 
 /**
diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c
index e8e35eb..4fe2788 100644
--- a/libgupnp-av/gupnp-cds-last-change-parser.c
+++ b/libgupnp-av/gupnp-cds-last-change-parser.c
@@ -17,6 +17,8 @@
  *
  */
 
+#include <config.h>
+
 #include "xml-util.h"
 #include "gupnp-cds-last-change-parser.h"
 
diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c
index c1387e7..a17c31a 100644
--- a/libgupnp-av/gupnp-didl-lite-container.c
+++ b/libgupnp-av/gupnp-didl-lite-container.c
@@ -17,6 +17,7 @@
  *
  * #GUPnPDIDLLiteContainer respresents a DIDL-Lite container element.
  */
+#include <config.h>
 
 #include <string.h>
 
diff --git a/libgupnp-av/gupnp-didl-lite-contributor.c b/libgupnp-av/gupnp-didl-lite-contributor.c
index 5969fff..2907051 100644
--- a/libgupnp-av/gupnp-didl-lite-contributor.c
+++ b/libgupnp-av/gupnp-didl-lite-contributor.c
@@ -16,6 +16,8 @@
  * producer, director, producer and contributor) property in a DIDL-Lite object.
  */
 
+#include <config.h>
+
 #include "gupnp-didl-lite-contributor.h"
 #include "gupnp-didl-lite-contributor-private.h"
 #include "xml-util.h"
diff --git a/libgupnp-av/gupnp-didl-lite-createclass.c b/libgupnp-av/gupnp-didl-lite-createclass.c
index bb55d16..122c3bb 100644
--- a/libgupnp-av/gupnp-didl-lite-createclass.c
+++ b/libgupnp-av/gupnp-didl-lite-createclass.c
@@ -17,6 +17,8 @@
  * #GUPnPDIDLLiteCreateClass respresents a DIDL-Lite create class element.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-didl-lite-createclass.h"
diff --git a/libgupnp-av/gupnp-didl-lite-descriptor.c b/libgupnp-av/gupnp-didl-lite-descriptor.c
index 675c311..941f849 100644
--- a/libgupnp-av/gupnp-didl-lite-descriptor.c
+++ b/libgupnp-av/gupnp-didl-lite-descriptor.c
@@ -15,6 +15,8 @@
  * #GUPnPDIDLLiteDescriptor respresent a DIDL-Lite descriptor (desc) element.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-didl-lite-descriptor.h"
diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c
index bae7a16..e73d3dd 100644
--- a/libgupnp-av/gupnp-didl-lite-item.c
+++ b/libgupnp-av/gupnp-didl-lite-item.c
@@ -14,6 +14,7 @@
  *
  * #GUPnPDIDLLiteItem respresents a DIDL-Lite item element.
  */
+#include <config.h>
 
 #include <string.h>
 
diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c
index ad86d34..67a683c 100644
--- a/libgupnp-av/gupnp-didl-lite-object.c
+++ b/libgupnp-av/gupnp-didl-lite-object.c
@@ -17,6 +17,8 @@
  * #GUPnPDIDLLiteObject respresent a DIDL-Lite object element.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-didl-lite-object.h"
diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
index a4fb333..3a5727f 100644
--- a/libgupnp-av/gupnp-didl-lite-parser.c
+++ b/libgupnp-av/gupnp-didl-lite-parser.c
@@ -15,6 +15,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <ctype.h>
 #include "gupnp-av.h"
diff --git a/libgupnp-av/gupnp-didl-lite-resource.c b/libgupnp-av/gupnp-didl-lite-resource.c
index 067bcb5..38473b1 100644
--- a/libgupnp-av/gupnp-didl-lite-resource.c
+++ b/libgupnp-av/gupnp-didl-lite-resource.c
@@ -19,6 +19,8 @@
  * #GUPnPDIDLLiteResource respresent a DIDL-Lite resource (res) element.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-didl-lite-resource.h"
diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c
index 6f1e7f5..6b9a7b4 100644
--- a/libgupnp-av/gupnp-didl-lite-writer.c
+++ b/libgupnp-av/gupnp-didl-lite-writer.c
@@ -16,6 +16,8 @@
  * #GUPnPDIDLLiteWriter is a helper class for writing DIDL-Lite fragments.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-didl-lite-writer.h"
diff --git a/libgupnp-av/gupnp-dlna.c b/libgupnp-av/gupnp-dlna.c
index b289872..3eec37b 100644
--- a/libgupnp-av/gupnp-dlna.c
+++ b/libgupnp-av/gupnp-dlna.c
@@ -8,6 +8,8 @@
  *
  */
 
+#include <config.h>
+
 #include "gupnp-dlna.h"
 
 GType
diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
index 7a181f7..16e5ddd 100644
--- a/libgupnp-av/gupnp-feature-list-parser.c
+++ b/libgupnp-av/gupnp-feature-list-parser.c
@@ -16,6 +16,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 #include "gupnp-feature-list-parser.h"
 #include "gupnp-av.h"
diff --git a/libgupnp-av/gupnp-feature.c b/libgupnp-av/gupnp-feature.c
index 2fe4ce7..ee12015 100644
--- a/libgupnp-av/gupnp-feature.c
+++ b/libgupnp-av/gupnp-feature.c
@@ -14,6 +14,8 @@
  * #GUPnPFeature respresent a Feature element.
  */
 
+#include <config.h>
+
 #include "gupnp-feature.h"
 
 struct _GUPnPFeaturePrivate {
diff --git a/libgupnp-av/gupnp-last-change-parser.c b/libgupnp-av/gupnp-last-change-parser.c
index 3f28fbd..672a0cf 100644
--- a/libgupnp-av/gupnp-last-change-parser.c
+++ b/libgupnp-av/gupnp-last-change-parser.c
@@ -17,6 +17,7 @@
  * generated by AVTransport and RenderingControl services.
  *
  */
+#include <config.h>
 
 
 #include <gobject/gvaluecollector.h>
diff --git a/libgupnp-av/gupnp-media-collection.c b/libgupnp-av/gupnp-media-collection.c
index 8dca36f..bd25deb 100644
--- a/libgupnp-av/gupnp-media-collection.c
+++ b/libgupnp-av/gupnp-media-collection.c
@@ -14,6 +14,8 @@
  * #GUPnPMediaCollection is a helper class for writing media collection files.
  **/
 
+#include <config.h>
+
 #include "gupnp-media-collection.h"
 #include "gupnp-didl-lite-writer.h"
 #include "gupnp-didl-lite-writer-private.h"
diff --git a/libgupnp-av/gupnp-protocol-info.c b/libgupnp-av/gupnp-protocol-info.c
index fb7c8c8..f2efc4c 100644
--- a/libgupnp-av/gupnp-protocol-info.c
+++ b/libgupnp-av/gupnp-protocol-info.c
@@ -18,6 +18,8 @@
  * strings used in UPnP AV specifications.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <stdlib.h>
 #include "gupnp-protocol-info.h"
diff --git a/libgupnp-av/gupnp-search-criteria-parser.c b/libgupnp-av/gupnp-search-criteria-parser.c
index aa407f0..3a2c4d4 100644
--- a/libgupnp-av/gupnp-search-criteria-parser.c
+++ b/libgupnp-av/gupnp-search-criteria-parser.c
@@ -19,6 +19,8 @@
  * over disjunction.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include "gupnp-search-criteria-parser.h"
diff --git a/libgupnp-av/gvalue-util.c b/libgupnp-av/gvalue-util.c
index 5382b11..e391e9a 100644
--- a/libgupnp-av/gvalue-util.c
+++ b/libgupnp-av/gvalue-util.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/libgupnp-av/meson.build b/libgupnp-av/meson.build
index 2dc1bb9..307cbfe 100644
--- a/libgupnp-av/meson.build
+++ b/libgupnp-av/meson.build
@@ -44,12 +44,13 @@ gupnp_av_lib = library('gupnp-av-1.0',
             'time-utils.c',
             'xml-util.c',
             'xsd-data.c',
-            marshall_sources
+            marshall_sources,
         ],
         install: true,
         version : version,
-        c_args : common_cflags + ['-DDATADIR="@0@"'.format(join_paths(get_option('prefix'), get_option('datadir'), 'gupnp-av'))],
-        dependencies : [gobject, libxml],
+        c_args : common_cflags,
+        include_directories : config_h_inc,
+        dependencies : [glib, gobject, libxml],
         darwin_versions : darwin_versions,
 )
 gupnp_av = declare_dependency(link_with : gupnp_av_lib, include_directories : include_directories('..'))
diff --git a/libgupnp-av/time-utils.c b/libgupnp-av/time-utils.c
index 2bed3b7..a143d02 100644
--- a/libgupnp-av/time-utils.c
+++ b/libgupnp-av/time-utils.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <glib.h>
 
 #include "time-utils.h"
diff --git a/libgupnp-av/xml-util.c b/libgupnp-av/xml-util.c
index 8599ce7..0d1661b 100644
--- a/libgupnp-av/xml-util.c
+++ b/libgupnp-av/xml-util.c
@@ -11,6 +11,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <glib/gprintf.h>
 
diff --git a/libgupnp-av/xsd-data.c b/libgupnp-av/xsd-data.c
index 7ce8578..62b6a57 100644
--- a/libgupnp-av/xsd-data.c
+++ b/libgupnp-av/xsd-data.c
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  */
+#include <config.h>
 
 #include <libxml/parser.h>
 #include <libxml/xmlschemas.h>
diff --git a/meson.build b/meson.build
index 4fe728c..109ae0a 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,9 @@ project('gupnp-av', 'c', version : '0.13.0', default_options: ['c_std=c11'])
 
 gnome = import('gnome')
 
-gobject = dependency('gobject-2.0', version : '>= 2.58')
+glib_version = '2.58'
+gobject = dependency('gobject-2.0', version : '>= ' + glib_version)
+glib = dependency('glib-2.0', version : '>= ' + glib_version)
 libxml = dependency('libxml-2.0')
 
 cc = meson.get_compiler('c')
@@ -69,10 +71,19 @@ endif
 
 common_cflags = cc.get_supported_arguments(test_cflags)
 
+add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c')
+conf = configuration_data()
+conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir'), 'gupnp-av'))
+conf.set_quoted('VERSION', meson.project_version())
+conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_' + glib_version.underscorify())
+conf.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_' + glib_version.underscorify())
+subdir('internal')
+
 subdir('libgupnp-av')
 subdir('tests')
 subdir('data')
 
+
 pkg = import('pkgconfig')
 pkg.generate(
     gupnp_av_lib,
diff --git a/tests/check-feature-list-parser.c b/tests/check-feature-list-parser.c
index 32fd1af..94e968a 100644
--- a/tests/check-feature-list-parser.c
+++ b/tests/check-feature-list-parser.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libgupnp-av/gupnp-feature-list-parser.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/check-search.c b/tests/check-search.c
index 400ba45..19287d2 100644
--- a/tests/check-search.c
+++ b/tests/check-search.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libgupnp-av/gupnp-search-criteria-parser.h>
 #include <stdlib.h>
 
diff --git a/tests/fragments.c b/tests/fragments.c
index 9782e3d..52385ba 100644
--- a/tests/fragments.c
+++ b/tests/fragments.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <glib-object.h>
 #include <libgupnp-av/gupnp-didl-lite-object.h>
 #include <libgupnp-av/gupnp-didl-lite-writer.h>
diff --git a/tests/gtest/meson.build b/tests/gtest/meson.build
index 57b776f..ee23726 100644
--- a/tests/gtest/meson.build
+++ b/tests/gtest/meson.build
@@ -21,6 +21,7 @@ foreach subtest : tests
             test_name,
             test_source,
             dependencies : [gupnp_av, gobject, libxml],
+            include_directories: config_h_inc,
             c_args: [common_cflags, '-DDATA_PATH="@0@"'.format(meson.current_source_dir())]
         ),
         env : test_env
diff --git a/tests/gtest/test-cds-last-change-parser.c b/tests/gtest/test-cds-last-change-parser.c
index 52f9fc4..0e82d23 100644
--- a/tests/gtest/test-cds-last-change-parser.c
+++ b/tests/gtest/test-cds-last-change-parser.c
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/gtest/test-didl-lite-object.c b/tests/gtest/test-didl-lite-object.c
index 62b6cac..10825da 100644
--- a/tests/gtest/test-didl-lite-object.c
+++ b/tests/gtest/test-didl-lite-object.c
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  */
+#include <config.h>
 
 #include <libgupnp-av/gupnp-didl-lite-object.h>
 #include <libgupnp-av/gupnp-didl-lite-writer.h>
diff --git a/tests/gtest/test-last-change-parser.c b/tests/gtest/test-last-change-parser.c
index 22fbfa4..2d7343b 100644
--- a/tests/gtest/test-last-change-parser.c
+++ b/tests/gtest/test-last-change-parser.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libgupnp-av/gupnp-last-change-parser.h>
 
 #define TEST_GENERAL \
diff --git a/tests/gtest/test-media-collection.c b/tests/gtest/test-media-collection.c
index c4755b3..8855812 100644
--- a/tests/gtest/test-media-collection.c
+++ b/tests/gtest/test-media-collection.c
@@ -9,6 +9,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include <libgupnp-av/gupnp-media-collection.h>
diff --git a/tests/gtest/test-regression.c b/tests/gtest/test-regression.c
index 93736fb..80e5c86 100644
--- a/tests/gtest/test-regression.c
+++ b/tests/gtest/test-regression.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libgupnp-av/gupnp-didl-lite-parser.h>
 #include <libgupnp-av/gupnp-didl-lite-writer.h>
 
diff --git a/tests/meson.build b/tests/meson.build
index e506a05..43c0070 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -4,6 +4,7 @@ executable(
         'test-search-criteria-parser.c'
     ],
     c_args : common_cflags,
+    include_directories: config_h_inc,
     dependencies : [gobject, libxml, gupnp_av]
 )
 
@@ -11,6 +12,7 @@ check_search = executable(
     'check-search',
     'check-search.c',
     c_args : common_cflags,
+    include_directories: config_h_inc,
     dependencies : [gobject, libxml, gupnp_av]
 )
 
@@ -18,6 +20,7 @@ check_feature_list_parser = executable(
     'check-feature-list-parser',
     'check-feature-list-parser.c',
     c_args : common_cflags,
+    include_directories: config_h_inc,
     dependencies : [gobject, libxml, gupnp_av]
 )
 
@@ -25,6 +28,7 @@ fragments = executable(
     'fragments',
     'fragments.c',
     c_args : [common_cflags, '-DABS_TOP_SRCDIR="@0@"'.format(meson.source_root())],
+    include_directories: config_h_inc,
     dependencies : [gobject, libxml, gupnp_av]
 )
 
diff --git a/tests/test-search-criteria-parser.c b/tests/test-search-criteria-parser.c
index 2872e59..eabcd34 100644
--- a/tests/test-search-criteria-parser.c
+++ b/tests/test-search-criteria-parser.c
@@ -7,6 +7,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libgupnp-av/gupnp-search-criteria-parser.h>
 #include <stdlib.h>