all: API bump

25 files changed, 139 insertions, 97 deletions

diff --git a/doc/reference/librygel-core/meson.build b/doc/reference/librygel-core/meson.build
index f4ceca96..7a403e8a 100644
--- a/doc/reference/librygel-core/meson.build
+++ b/doc/reference/librygel-core/meson.build
@@ -1,14 +1,14 @@
 if valadoc.found()
 core_doc_common_args = [
         '--package-name', 'librygel-core',
-        '--package-version', '2.6',
+        '--package-version', '2.8',
         '-b', join_paths(meson.source_root(), 'src', 'librygel-core'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
         '--pkg', 'gio-2.0',
         '--pkg', 'gee-0.8',
-        '--pkg', 'gupnp-1.2',
+        '--pkg', 'gupnp-1.6',
         '--pkg', 'gmodule-2.0',
         '--pkg', 'posix'
  ]
@@ -41,7 +41,7 @@ gtkdoc_core_target = custom_target('gtkdoc-core',
         core_doc_common_args,
         '-X', join_paths(meson.build_root(), 'src/librygel-core/rygel-core.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         '-b', join_paths(meson.source_root(), 'src', 'librygel-core'),
         core_sources
     ]
diff --git a/doc/reference/librygel-db/meson.build b/doc/reference/librygel-db/meson.build
index 9c6fffd5..7c19246f 100644
--- a/doc/reference/librygel-db/meson.build
+++ b/doc/reference/librygel-db/meson.build
@@ -1,7 +1,7 @@
 if valadoc.found()
 db_doc_common_args = [
         '--package-name', 'librygel-db',
-        '--package-version', '2.6',
+        '--package-version', '2.8',
         '-b', join_paths(meson.source_root(), 'src', 'librygel-db'),
         '--vapidir', join_paths(meson.source_root(), 'vapi'),
         '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
@@ -11,12 +11,12 @@ db_doc_common_args = [
         '--directory', '@OUTPUT@',
         '--pkg', 'gio-2.0',
         '--pkg', 'gee-0.8',
-        '--pkg', 'gupnp-1.2',
+        '--pkg', 'gupnp-1.6',
         '--pkg', 'gmodule-2.0',
         '--pkg', 'posix',
         '--pkg', 'sqlite3',
         '--pkg', 'gupnp-av-1.0',
-        '--pkg', 'rygel-core-2.6',
+        '--pkg', 'rygel-core-2.8',
 ]
 
 custom_target('valadoc-db',
@@ -46,9 +46,9 @@ gtkdoc_db_target = custom_target('gtkdoc-db',
         '--doclet', 'gtkdoc',
         '-X', join_paths(meson.build_root(), 'src/librygel-db/rygel-db.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-db/librygel-db-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-db/librygel-db-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         db_sources
     ]
 )
diff --git a/doc/reference/librygel-renderer-gst/meson.build b/doc/reference/librygel-renderer-gst/meson.build
index 51e95d72..e722c21f 100644
--- a/doc/reference/librygel-renderer-gst/meson.build
+++ b/doc/reference/librygel-renderer-gst/meson.build
@@ -1,7 +1,7 @@
 if valadoc.found()
 renderer_gst_doc_common_args = [
         '--package-name', 'librygel-renderer-gst',
-        '--package-version', '2.6',
+        '--package-version', '2.8',
         '-b', join_paths(meson.source_root(), 'src', 'librygel-renderer-gst'),
         '--vapidir', join_paths(meson.source_root(), 'vapi'),
         '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
@@ -12,12 +12,12 @@ renderer_gst_doc_common_args = [
         '--directory', '@OUTPUT@',
         '--pkg', 'gio-2.0',
         '--pkg', 'gee-0.8',
-        '--pkg', 'gupnp-1.2',
+        '--pkg', 'gupnp-1.6',
         '--pkg', 'gmodule-2.0',
         '--pkg', 'posix',
         '--pkg', 'gupnp-av-1.0',
-        '--pkg', 'rygel-core-2.6',
-        '--pkg', 'rygel-renderer-2.6',
+        '--pkg', 'rygel-core-2.8',
+        '--pkg', 'rygel-renderer-2.8',
         '--pkg', 'gstreamer-1.0',
         '--pkg', 'gstreamer-audio-1.0'
 ]
@@ -49,11 +49,11 @@ gtkdoc_renderer_gst_target = custom_target('gtkdoc-renderer-gst',
         '--doclet', 'gtkdoc',
         '-X', join_paths(meson.build_root(), 'src/librygel-renderer/rygel-renderer.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer-gst/librygel-renderer-gst-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-renderer-gst/librygel-renderer-gst-2.8.so'),
         renderer_gst_sources
     ]
 )
diff --git a/doc/reference/librygel-renderer/meson.build b/doc/reference/librygel-renderer/meson.build
index 1b2532f8..6e46eb99 100644
--- a/doc/reference/librygel-renderer/meson.build
+++ b/doc/reference/librygel-renderer/meson.build
@@ -1,7 +1,7 @@
 if valadoc.found()
 renderer_doc_common_args = [
         '--package-name', 'librygel-renderer',
-        '--package-version', '2.6',
+        '--package-version', '2.8',
         '-b', join_paths(meson.source_root(), 'src', 'librygel-renderer'),
         '--vapidir', join_paths(meson.source_root(), 'vapi'),
         '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
@@ -11,11 +11,11 @@ renderer_doc_common_args = [
         '--directory', '@OUTPUT@',
         '--pkg', 'gio-2.0',
         '--pkg', 'gee-0.8',
-        '--pkg', 'gupnp-1.2',
+        '--pkg', 'gupnp-1.6',
         '--pkg', 'gmodule-2.0',
         '--pkg', 'posix',
         '--pkg', 'gupnp-av-1.0',
-        '--pkg', 'rygel-core-2.6'
+        '--pkg', 'rygel-core-2.8'
 ]
 
 custom_target('valadoc-renderer',
@@ -45,9 +45,9 @@ gtkdoc_renderer_target = custom_target('gtkdoc-renderer',
         '--doclet', 'gtkdoc',
         '-X', join_paths(meson.build_root(), 'src/librygel-renderer/rygel-renderer.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         renderer_sources
     ]
 )
diff --git a/doc/reference/librygel-server/meson.build b/doc/reference/librygel-server/meson.build
index 390e575a..8b07c599 100644
--- a/doc/reference/librygel-server/meson.build
+++ b/doc/reference/librygel-server/meson.build
@@ -1,7 +1,7 @@
 if valadoc.found()
 server_doc_common_args = [
         '--package-name', 'librygel-server',
-        '--package-version', '2.6',
+        '--package-version', '2.8',
         '-b', join_paths(meson.source_root(), 'src', 'librygel-server'),
         '--vapidir', join_paths(meson.source_root(), 'vapi'),
         '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
@@ -11,11 +11,11 @@ server_doc_common_args = [
         '--directory', '@OUTPUT@',
         '--pkg', 'gio-2.0',
         '--pkg', 'gee-0.8',
-        '--pkg', 'gupnp-1.2',
+        '--pkg', 'gupnp-1.6',
         '--pkg', 'gmodule-2.0',
         '--pkg', 'posix',
         '--pkg', 'gupnp-av-1.0',
-        '--pkg', 'rygel-core-2.6',
+        '--pkg', 'rygel-core-2.8',
         '--pkg', 'libmediaart-2.0'
 ]
 
@@ -46,9 +46,9 @@ gtkdoc_server_target = custom_target('gtkdoc-server',
         '--doclet', 'gtkdoc',
         '-X', join_paths(meson.build_root(), 'src/librygel-server/rygel-server.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-server/librygel-server-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-server/librygel-server-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.6.so'),
+        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         server_sources
     ]
 )
diff --git a/meson.build b/meson.build
index 7c661805..ce5a6e32 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,7 @@ i18n = import('i18n')
 gnome = import('gnome')
 
 rygel_libdir = join_paths(get_option('prefix'), get_option('libdir'))
-rygel_includedir = join_paths(get_option('includedir'), 'rygel-2.6')
+rygel_includedir = join_paths(get_option('includedir'), 'rygel-2.8')
 rygel_vapidir = join_paths(get_option('prefix'), get_option('datadir'), 'vala/vapi')
 
 if not get_option('uninstalled')
@@ -23,8 +23,8 @@ if not get_option('uninstalled')
     rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
     'rygel')
     rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
-    rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
-    rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
+    rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.8', 'plugins')
+    rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.8', 'engines')
     rygel_presetdir = join_paths(rygel_datadir, 'presets')
     rygel_icondir = join_paths(get_option('prefix'), get_option('datadir'), 'icons', 'hicolor')
     rygel_bigicondir = join_paths(rygel_datadir, 'icons', '120x120')
@@ -153,36 +153,50 @@ pc_conf.set('RYGEL_MEDIA_ENGINE_DIR', rygel_enginedir)
 pc_conf.set('RYGEL_PLUGIN_LINKER_FLAGS', '-module -avoid-version -shared -export-dynamic -export-symbols-regex \'module_init\'')
 pc_conf.set('RYGEL_ENGINE_LINKER_FLAGS', '-module -avoid-version -shared -export-dynamic -export-symbols-regex \'module_get_instance\'')
 
-configure_file(output: 'rygel-core-2.6.pc',
-               input: 'rygel-core-2.6.pc.in',
+configure_file(output: 'rygel-core-2.8.pc',
+               input: 'rygel-core-2.8.pc.in',
                configuration: pc_conf,
                install: true,
                install_dir : pkgconfig_dir)
 
-configure_file(output: 'rygel-server-2.6.pc',
-               input: 'rygel-server-2.6.pc.in',
+configure_file(output: 'rygel-server-2.8.pc',
+               input: 'rygel-server-2.8.pc.in',
                configuration: pc_conf,
                install: true,
                install_dir : pkgconfig_dir)
 
-configure_file(output: 'rygel-renderer-2.6.pc',
-               input: 'rygel-renderer-2.6.pc.in',
+configure_file(output: 'rygel-renderer-2.8.pc',
+               input: 'rygel-renderer-2.8.pc.in',
                configuration: pc_conf,
                install: true,
                install_dir : pkgconfig_dir)
 
-configure_file(output: 'rygel-renderer-gst-2.6.pc',
-               input: 'rygel-renderer-gst-2.6.pc.in',
+configure_file(output: 'rygel-renderer-gst-2.8.pc',
+               input: 'rygel-renderer-gst-2.8.pc.in',
                configuration: pc_conf,
                install: true,
                install_dir : pkgconfig_dir)
 
-configure_file(output: 'rygel-ruih-2.0.pc',
-               input: 'rygel-ruih-2.0.pc.in',
+configure_file(output: 'rygel-ruih-2.8.pc',
+               input: 'rygel-ruih-2.8.pc.in',
                configuration: pc_conf,
                install: true,
                install_dir : pkgconfig_dir)
 
+v = meson.project_version().split('.')
+soversion = 0
+library_minor = v[0].to_int() * 100 + v[1].to_int()
+library_micro = v[2].to_int()
+
+lib_version = '@0@.@1@.@2@'.format(soversion, library_minor, library_micro)
+version_arr = lib_version.split('.')
+major_version = version_arr[0].to_int()
+minor_version = version_arr[1].to_int()
+micro_version = version_arr[2].to_int()
+current = major_version + minor_version + 1
+interface_age = micro_version
+darwin_versions = [current, '@0@.@1@'.format(current, interface_age)]
+
 subdir('src')
 subdir('po')
 subdir('data')
@@ -196,3 +210,25 @@ endif
 if get_option('tests')
     subdir('tests')
 endif
+
+summary(
+  {
+    'Version' : meson.project_version(),
+    'API Version' : '2.8',
+    'Library version' : lib_version,
+    'Darwin version': darwin_versions,
+  },
+  section: 'Versioning'
+)
+
+summary(
+  {
+    'Plugins' : get_option('plugins'),
+    'GStreamer' : get_option('gstreamer'),
+    'Media Engines' : get_option('engines'),
+    'Configuration GUI' : get_option('gtk'),
+    'Documentation' : get_option('api-docs'),
+    'Man Pages' : get_option('man_pages'),
+  },
+  section: 'Features'
+)
diff --git a/rygel-core-2.6.pc.in b/rygel-core-2.8.pc.in
index d02fccf5..d02fccf5 100644
--- a/rygel-core-2.6.pc.in
+++ b/rygel-core-2.8.pc.in
diff --git a/rygel-renderer-2.6.pc.in b/rygel-renderer-2.8.pc.in
index d5a27007..d5a27007 100644
--- a/rygel-renderer-2.6.pc.in
+++ b/rygel-renderer-2.8.pc.in
diff --git a/rygel-renderer-gst-2.6.pc.in b/rygel-renderer-gst-2.8.pc.in
index 89d5ea85..89d5ea85 100644
--- a/rygel-renderer-gst-2.6.pc.in
+++ b/rygel-renderer-gst-2.8.pc.in
diff --git a/rygel-ruih-2.0.pc.in b/rygel-ruih-2.8.pc.in
index 39c0ba0c..39c0ba0c 100644
--- a/rygel-ruih-2.0.pc.in
+++ b/rygel-ruih-2.8.pc.in
diff --git a/rygel-server-2.6.pc.in b/rygel-server-2.8.pc.in
index 1772ef78..1772ef78 100644
--- a/rygel-server-2.6.pc.in
+++ b/rygel-server-2.8.pc.in
diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build
index fd43bebe..ff160e45 100644
--- a/src/librygel-core/meson.build
+++ b/src/librygel-core/meson.build
@@ -38,30 +38,31 @@ build_config = declare_dependency(include_directories : config_include,
 # Rygel GIR generation is a tad special. We need to hammer in custom namespaces
 # since the libraries used to be in one binary. So
 # Step one: Build the library, generate the GIR from vala but do not install it
-core_lib = library('rygel-core-2.6', core_sources,
+core_lib = library('rygel-core-2.8', core_sources,
         dependencies : core_deps,
         include_directories: [config_include, include_directories('.')],
-        version: '2.0.4',
+        version: lib_version,
+        darwin_versions: darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelCore"'],
-        vala_gir : 'Rygel-2.6.gir',
+        vala_gir : 'Rygel-2.8.gir',
         vala_header : 'rygel-core.h',
         install: true,
         install_dir : [true, rygel_includedir, true, false])
-install_data('rygel-core-2.6.deps', install_dir : rygel_vapidir)
+install_data('rygel-core-2.8.deps', install_dir : rygel_vapidir)
 
 if g_ir_compiler.found()
 # Step two: Do the namespace magic with sed
 # We cannot use input: here since the generated ninja build file does not seem
-# to know that Rygel-2.6.gir is a result of building rygel-core-2.6 target
+# to know that Rygel-2.8.gir is a result of building rygel-core-2.8 target
 # The custom_target call depends on the core_lib to make sure it is build before
 # and the name of the generated GIR is passed directly to sed as part of the
 # commandline
-core_gir = custom_target('RygelCore-2.6.gir',
+core_gir = custom_target('RygelCore-2.8.gir',
               command: [sed, '-e', 's,Rygel[.],RygelCore.,g',
                         '-e', 's,namespace name="Rygel",namespace name="RygelCore",g',
-                        join_paths(meson.current_build_dir(), 'Rygel-2.6.gir')],
+                        join_paths(meson.current_build_dir(), 'Rygel-2.8.gir')],
               depends: core_lib,
-              output: 'RygelCore-2.6.gir',
+              output: 'RygelCore-2.8.gir',
               capture: true,
               install: true,
               install_dir: gir_dir)
@@ -69,9 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir',
 # Step three: Compile the typelib. The dependency issue is similar to step two,
 # so we depend on the custom_target from that step and pass the input through
 # commandline.
-custom_target('RygelCore-2.6.typelib',
-               command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')],
-               output: 'RygelCore-2.6.typelib',
+custom_target('RygelCore-2.8.typelib',
+               command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.8.gir')],
+               output: 'RygelCore-2.8.typelib',
                depends: [ core_lib, core_gir ],
                install: true,
                install_dir: typelib_dir)
diff --git a/src/librygel-core/rygel-core-2.6.deps b/src/librygel-core/rygel-core-2.8.deps
index e30cec7a..f0c70b76 100644
--- a/src/librygel-core/rygel-core-2.6.deps
+++ b/src/librygel-core/rygel-core-2.8.deps
@@ -1,4 +1,4 @@
 gee-0.8
 gio-2.0
 libxml-2.0
-gupnp-1.2
+gupnp-1.6
diff --git a/src/librygel-db/meson.build b/src/librygel-db/meson.build
index ec7eaf3e..068c92d2 100644
--- a/src/librygel-db/meson.build
+++ b/src/librygel-db/meson.build
@@ -6,15 +6,16 @@ db_sources = files(
     'collate.c'
 )
 
-db_lib = library('rygel-db-2.6', db_sources,
+db_lib = library('rygel-db-2.8', db_sources,
         dependencies : db_deps + [rygel_core],
         include_directories: [config_include, include_directories('.')],
-        version: '2.0.4',
+        version: lib_version,
+        darwin_versions: darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelDb"'],
         vala_header : 'rygel-db.h',
         install: true,
         install_dir : [true, rygel_includedir, true])
-install_data('rygel-db-2.6.deps', install_dir : rygel_vapidir)
+install_data('rygel-db-2.8.deps', install_dir : rygel_vapidir)
 
 # need to add to get the current build dir as include dir
 rygel_db = declare_dependency(include_directories: include_directories('.'),
diff --git a/src/librygel-db/rygel-db-2.6.deps b/src/librygel-db/rygel-db-2.8.deps
index eb088138..eb088138 100644
--- a/src/librygel-db/rygel-db-2.6.deps
+++ b/src/librygel-db/rygel-db-2.8.deps
diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build
index ad98a3a7..07b925cc 100644
--- a/src/librygel-renderer-gst/meson.build
+++ b/src/librygel-renderer-gst/meson.build
@@ -3,41 +3,42 @@ renderer_gst_sources = files(
     'rygel-playbin-renderer.vala',
 )
 
-renderer_gst_lib = library('rygel-renderer-gst-2.6', renderer_gst_sources,
+renderer_gst_lib = library('rygel-renderer-gst-2.8', renderer_gst_sources,
         dependencies : renderer_gst_deps + [build_config, rygel_core, rygel_renderer],
-        version: '2.0.4',
+        version: lib_version,
+        darwin_versions : darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelRendererGst"'],
-        vala_gir : 'Rygel-2.6.gir',
+        vala_gir : 'Rygel-2.8.gir',
         vala_header : 'rygel-renderer-gst.h',
         install: true,
         install_dir : [true, rygel_includedir, true, false])
-install_data('rygel-renderer-gst-2.6.deps', install_dir : rygel_vapidir)
+install_data('rygel-renderer-gst-2.8.deps', install_dir : rygel_vapidir)
 
 if g_ir_compiler.found()
 # For details on the GIR/typelib generating process, see
 # librygel-core/meson.build
-renderer_gst_gir = custom_target('RygelRendererGst-2.6.gir',
+renderer_gst_gir = custom_target('RygelRendererGst-2.8.gir',
               command: [sed, '-e', 's,Rygel[.],RygelRendererGst.,g',
                              '-e', 's,RygelRendererGst[.]MediaRenderer,RygelRenderer.MediaRenderer,g',
                              '-e', 's,RygelRendererGst[.]MediaPlayer,RygelRenderer.MediaPlayer,g',
                              '-e', 's,namespace name="Rygel",namespace name="RygelRendererGst",g',
                              '-e', 's,RygelRendererGst[.]Plugin,RygelCore.Plugin,g',
                              '-e', 's,RygelRendererGst[.]DLNAProfile,RygelCore.DLNAProfile,g',
-                             '-e', 's,<package name="rygel-renderer-gst-2.6"/>,<include name="RygelCore" version="2.6"/><include name="RygelRenderer" version="2.6"/><package name="rygel-renderer-gst-2.6"/>,',
-                        join_paths(meson.current_build_dir(), 'Rygel-2.6.gir')],
-              output: 'RygelRendererGst-2.6.gir',
+                             '-e', 's,<package name="rygel-renderer-gst-2.8"/>,<include name="RygelCore" version="2.8"/><include name="RygelRenderer" version="2.8"/><package name="rygel-renderer-gst-2.8"/>,',
+                        join_paths(meson.current_build_dir(), 'Rygel-2.8.gir')],
+              output: 'RygelRendererGst-2.8.gir',
               depends: renderer_gst_lib,
               capture: true,
               install: true,
               install_dir: gir_dir)
 
-custom_target('RygelRendererGst-2.6.typelib',
+custom_target('RygelRendererGst-2.8.typelib',
                command: [g_ir_compiler,
                         '--output', '@OUTPUT@',
                         '--includedir', core_girdir,
                         '--includedir', renderer_girdir,
-                        join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')],
-               output: 'RygelRendererGst-2.6.typelib',
+                        join_paths(meson.current_build_dir(), 'RygelRendererGst-2.8.gir')],
+               output: 'RygelRendererGst-2.8.typelib',
                depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir],
                install: true,
                install_dir: typelib_dir)
diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps
deleted file mode 100644
index 435dca2d..00000000
--- a/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-rygel-renderer-2.6
-gstreamer-1.0
diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.8.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.8.deps
new file mode 100644
index 00000000..3b00a02e
--- /dev/null
+++ b/src/librygel-renderer-gst/rygel-renderer-gst-2.8.deps
@@ -0,0 +1,2 @@
+rygel-renderer-2.8
+gstreamer-1.0
diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
index 5f401527..740ff87e 100644
--- a/src/librygel-renderer/meson.build
+++ b/src/librygel-renderer/meson.build
@@ -12,39 +12,40 @@ renderer_sources = files(
     'rygel-volume.vala'
 )
 
-renderer_lib = library('rygel-renderer-2.6', renderer_sources,
+renderer_lib = library('rygel-renderer-2.8', renderer_sources,
         dependencies : renderer_deps + [build_config, rygel_core],
-        version: '2.0.4',
+        version: lib_version,
+        darwin_versions : darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelRenderer"'],
-        vala_gir : 'Rygel-2.6.gir',
+        vala_gir : 'Rygel-2.8.gir',
         vala_header : 'rygel-renderer.h',
         install: true,
         install_dir : [true, rygel_includedir, true, false])
-install_data('rygel-renderer-2.6.deps', install_dir : rygel_vapidir)
+install_data('rygel-renderer-2.8.deps', install_dir : rygel_vapidir)
 
 if g_ir_compiler.found()
 # For details on the GIR / typelib generation process, see
 # librygel-core/meson.build
-renderer_gir = custom_target('RygelRenderer-2.6.gir',
+renderer_gir = custom_target('RygelRenderer-2.8.gir',
               command: [sed, '-e', 's,Rygel[.],RygelRenderer.,g',
                                           '-e', 's,namespace name="Rygel",namespace name="RygelRenderer",g',
                                           '-e', 's,RygelRenderer[.]Plugin,RygelCore.Plugin,g',
                                           '-e', 's,RygelRenderer[.]MediaDevice,RygelCore.MediaDevice,g',
                                           '-e', 's,RygelRenderer[.]DLNAProfile,RygelCore.DLNAProfile,g',
-                                          '-e', 's|<package name="rygel-renderer-2.6"/>|<include name="RygelCore" version="2.6"/><package name="rygel-renderer-2.6"/>|',
-                        join_paths(meson.current_build_dir(), 'Rygel-2.6.gir')],
-              output: 'RygelRenderer-2.6.gir',
+                                          '-e', 's|<package name="rygel-renderer-2.8"/>|<include name="RygelCore" version="2.8"/><package name="rygel-renderer-2.8"/>|',
+                        join_paths(meson.current_build_dir(), 'Rygel-2.8.gir')],
+              output: 'RygelRenderer-2.8.gir',
               depends: renderer_lib,
               capture: true,
               install: true,
               install_dir: gir_dir)
 
-custom_target('RygelRenderer-2.6.typelib',
+custom_target('RygelRenderer-2.8.typelib',
                command: [g_ir_compiler,
                         '--output', '@OUTPUT@',
                         '--includedir', core_girdir,
-                        join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')],
-               output: 'RygelRenderer-2.6.typelib',
+                        join_paths(meson.current_build_dir(), 'RygelRenderer-2.8.gir')],
+               output: 'RygelRenderer-2.8.typelib',
                depends: [ renderer_lib, renderer_gir, core_gir ],
                install: true,
                install_dir: typelib_dir)
diff --git a/src/librygel-renderer/rygel-renderer-2.6.deps b/src/librygel-renderer/rygel-renderer-2.6.deps
deleted file mode 100644
index 5e5c7d41..00000000
--- a/src/librygel-renderer/rygel-renderer-2.6.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-rygel-core-2.6
-gupnp-av-1.0
diff --git a/src/librygel-renderer/rygel-renderer-2.8.deps b/src/librygel-renderer/rygel-renderer-2.8.deps
new file mode 100644
index 00000000..e0ba4151
--- /dev/null
+++ b/src/librygel-renderer/rygel-renderer-2.8.deps
@@ -0,0 +1,2 @@
+rygel-core-2.8
+gupnp-av-1.0
diff --git a/src/librygel-ruih/meson.build b/src/librygel-ruih/meson.build
index ff50be9f..8724c048 100644
--- a/src/librygel-ruih/meson.build
+++ b/src/librygel-ruih/meson.build
@@ -12,14 +12,15 @@ ruih_sources = [
     'rygel-ruih-wildcard-filter-entry.vala'
 ]
 
-ruih_lib = library('rygel-ruih-2.0', ruih_sources,
+ruih_lib = library('rygel-ruih-2.8', ruih_sources,
         dependencies : ruih_deps + [build_config, rygel_core],
-        version: '1.0.0',
+        version: lib_version,
+        darwin_versions : darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelRuih"'],
         vala_header : 'rygel-ruih.h',
         install: true,
         install_dir : [true, rygel_includedir, true])
-install_data('rygel-ruih-2.0.deps', install_dir : rygel_vapidir)
+install_data('rygel-ruih-2.8.deps', install_dir : rygel_vapidir)
 
 # need to add to get the current build dir as include dir
 rygel_ruih = declare_dependency(include_directories: include_directories('.'),
diff --git a/src/librygel-ruih/rygel-ruih-2.0.deps b/src/librygel-ruih/rygel-ruih-2.8.deps
index 490da8a3..8126e31c 100644
--- a/src/librygel-ruih/rygel-ruih-2.0.deps
+++ b/src/librygel-ruih/rygel-ruih-2.8.deps
@@ -1,5 +1,5 @@
 gee-0.8
-gupnp-1.2
+gupnp-1.6
 gio-2.0
-rygel-core-2.6
+rygel-core-2.8
 gupnp-av-1.0
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index a3bd77d9..f1304529 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -89,20 +89,21 @@ server_sources = files(
     'rygel-dlna-available-seek-request.vala',
     'rygel-dlna-available-seek-response.vala')
 
-server_lib = library('rygel-server-2.6', server_sources,
+server_lib = library('rygel-server-2.8', server_sources,
         dependencies : server_deps + [build_config, rygel_core],
-        version: '2.0.4',
+        version: lib_version,
+        darwin_versions: darwin_versions,
         c_args : ['-DG_LOG_DOMAIN="RygelServer"'],
-        vala_gir : 'Rygel-2.6.gir',
+        vala_gir : 'Rygel-2.8.gir',
         vala_header : 'rygel-server.h',
         install: true,
         install_dir : [true, rygel_includedir, true, false])
-install_data('rygel-server-2.6.deps', install_dir : rygel_vapidir)
+install_data('rygel-server-2.8.deps', install_dir : rygel_vapidir)
 
 if g_ir_compiler.found()
 # For details on the GIR/typelib generation process, see
 # librygel-core/meson.build
-server_gir = custom_target('RygelServer-2.6.gir',
+server_gir = custom_target('RygelServer-2.8.gir',
               command: [sed, '-e', 's,Rygel[.],RygelServer.,g',
                                           '-e', 's,namespace name="Rygel",namespace name="RygelServer",g',
                                           '-e', 's,RygelServer[.]StateMachine,RygelCore.StateMachine,g',
@@ -110,20 +111,20 @@ server_gir = custom_target('RygelServer-2.6.gir',
                                           '-e', 's,RygelServer[.]MediaDevice,RygelCore.MediaDevice,g',
                                           '-e', 's,RygelServer[.]IconInfo,RygelCore.IconInfo,g',
                                           '-e', 's,RygelServer[.]DLNAProfile,RygelCore.DLNAProfile,g',
-                                          '-e', 's|<package name="rygel-server-2.6"/>|<include name="RygelCore" version="2.6"/><package name="rygel-server-2.6"/>|',
-                        join_paths(meson.current_build_dir(), 'Rygel-2.6.gir')],
-              output: 'RygelServer-2.6.gir',
+                                          '-e', 's|<package name="rygel-server-2.8"/>|<include name="RygelCore" version="2.8"/><package name="rygel-server-2.8"/>|',
+                        join_paths(meson.current_build_dir(), 'Rygel-2.8.gir')],
+              output: 'RygelServer-2.8.gir',
               capture: true,
               depends: server_lib,
               install: true,
               install_dir: join_paths(get_option('datadir'),'gir-1.0'))
 
-custom_target('RygelServer-2.6.typelib',
+custom_target('RygelServer-2.8.typelib',
                command: [g_ir_compiler,
                         '--output', '@OUTPUT@',
                         '--includedir', core_girdir,
-                        join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')],
-               output: 'RygelServer-2.6.typelib',
+                        join_paths(meson.current_build_dir(), 'RygelServer-2.8.gir')],
+               output: 'RygelServer-2.8.typelib',
                depends: [ server_lib, server_gir, core_gir ],
                install: true,
                install_dir: typelib_dir)
diff --git a/src/librygel-server/rygel-server-2.6.deps b/src/librygel-server/rygel-server-2.8.deps
index 490da8a3..8126e31c 100644
--- a/src/librygel-server/rygel-server-2.6.deps
+++ b/src/librygel-server/rygel-server-2.8.deps
@@ -1,5 +1,5 @@
 gee-0.8
-gupnp-1.2
+gupnp-1.6
 gio-2.0
-rygel-core-2.6
+rygel-core-2.8
 gupnp-av-1.0