diff options
author | Jens Georg <mail@jensge.org> | 2022-06-03 20:33:32 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2022-06-03 21:12:02 +0200 |
commit | 1da56166d10adf74697564aac80d7dd7672a63f2 (patch) | |
tree | 89133a9aaff67a3cc44607dcba410f5a3fe33fe5 /src | |
parent | cd3818c38ae27cd0a8d90ade0264ce811af75c18 (diff) | |
download | rygel-1da56166d10adf74697564aac80d7dd7672a63f2.tar.gz |
all: API bump
Diffstat (limited to 'src')
-rw-r--r-- | src/librygel-core/meson.build | 23 | ||||
-rw-r--r-- | src/librygel-core/rygel-core-2.8.deps (renamed from src/librygel-core/rygel-core-2.6.deps) | 2 | ||||
-rw-r--r-- | src/librygel-db/meson.build | 7 | ||||
-rw-r--r-- | src/librygel-db/rygel-db-2.8.deps (renamed from src/librygel-db/rygel-db-2.6.deps) | 0 | ||||
-rw-r--r-- | src/librygel-renderer-gst/meson.build | 23 | ||||
-rw-r--r-- | src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps | 2 | ||||
-rw-r--r-- | src/librygel-renderer-gst/rygel-renderer-gst-2.8.deps | 2 | ||||
-rw-r--r-- | src/librygel-renderer/meson.build | 23 | ||||
-rw-r--r-- | src/librygel-renderer/rygel-renderer-2.6.deps | 2 | ||||
-rw-r--r-- | src/librygel-renderer/rygel-renderer-2.8.deps | 2 | ||||
-rw-r--r-- | src/librygel-ruih/meson.build | 7 | ||||
-rw-r--r-- | src/librygel-ruih/rygel-ruih-2.8.deps (renamed from src/librygel-ruih/rygel-ruih-2.0.deps) | 4 | ||||
-rw-r--r-- | src/librygel-server/meson.build | 23 | ||||
-rw-r--r-- | src/librygel-server/rygel-server-2.8.deps (renamed from src/librygel-server/rygel-server-2.6.deps) | 4 |
14 files changed, 65 insertions, 59 deletions
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 |