[gssdp] Bump API version
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gssdp] Bump API version
- Date: Fri, 29 Oct 2021 16:38:38 +0000 (UTC)
commit a958026be309cfd29358fc8419fe5e1b116312b6
Author: Jens Georg <mail jensge org>
Date: Wed Oct 27 10:35:09 2021 +0200
Bump API version
doc/meson.build | 2 +-
examples/publish.py | 2 +-
libgssdp/meson.build | 20 +++++++++++---------
meson.build | 5 ++++-
vala/{gssdp-1.2.deps => gssdp-1.4.deps} | 0
vala/meson.build | 2 +-
6 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 7cc43a9..2ef2f9f 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -9,7 +9,7 @@ gssdp_toml = configure_file (
configuration: entities
)
-docs_dir = join_paths(get_option('prefix'), get_option('datadir')) / 'doc/gssdp-1.2/reference'
+docs_dir = join_paths(get_option('prefix'), get_option('datadir'), 'doc', GSSDP_API_NAME, 'reference')
custom_target(
'gssdp-doc',
diff --git a/examples/publish.py b/examples/publish.py
index eab0f5e..665c126 100644
--- a/examples/publish.py
+++ b/examples/publish.py
@@ -27,7 +27,7 @@
# DAMAGE.
import gi
-gi.require_version('GSSDP', '1.2')
+gi.require_version('GSSDP', '1.6')
from gi.repository import GSSDP
from gi.repository import GLib
import time
diff --git a/libgssdp/meson.build b/libgssdp/meson.build
index 074f551..879d685 100644
--- a/libgssdp/meson.build
+++ b/libgssdp/meson.build
@@ -9,7 +9,7 @@ enums = gnome.mkenums(
c_template : 'gssdp-enums.c.template',
h_template : 'gssdp-enums.h.template',
install_header : true,
- install_dir : join_paths(get_option('includedir'), 'gssdp-1.2/libgssdp')
+ install_dir : join_paths(get_option('includedir'), GSSDP_API_NAME, 'libgssdp')
)
headers = files(
@@ -20,7 +20,7 @@ headers = files(
'gssdp.h',
)
-install_headers(headers, subdir : 'gssdp-1.2/libgssdp')
+install_headers(headers, subdir : GSSDP_API_NAME / 'libgssdp')
sources = files(
'gssdp-client.c',
@@ -62,7 +62,9 @@ current = major_version + minor_version + 1
interface_age = micro_version
darwin_versions = [current, '@0@.@1@'.format(current, interface_age)]
-libgssdp = library('gssdp-1.2', sources + enums,
+libgssdp = library(
+ GSSDP_API_NAME,
+ sources + enums,
version : version,
darwin_versions : darwin_versions,
dependencies : dependencies + system_deps,
@@ -74,14 +76,14 @@ gssdp = declare_dependency(link_with : libgssdp,
dependencies : dependencies
)
-meson.override_dependency('gssdp-1.2', gssdp)
+meson.override_dependency(GSSDP_API_NAME, gssdp)
pkg.generate(libgssdp,
- subdirs: 'gssdp-1.2',
+ subdirs: GSSDP_API_NAME,
version: meson.project_version(),
- name: 'gssdp-1.2',
+ name: GSSDP_API_NAME,
requires: ['gio-2.0', 'glib-2.0', 'gobject-2.0'],
- filebase : 'gssdp-1.2',
+ filebase : GSSDP_API_NAME,
description: 'GObject-based SSDP library',
requires_private: ['gobject-2.0', 'gio-2.0'])
@@ -90,11 +92,11 @@ if get_option('introspection')
gir = gnome.generate_gir(libgssdp,
sources : headers + sources + enums,
namespace : 'GSSDP',
- nsversion : '1.2',
+ nsversion : GSSDP_API_VERSION,
header : 'libgssdp/gssdp.h',
symbol_prefix : 'gssdp',
identifier_prefix : 'GSSDP',
- export_packages : 'gssdp-1.2',
+ export_packages : GSSDP_API_NAME,
includes : ['GObject-2.0', 'Gio-2.0', 'Soup-2.4'],
install: true)
endif
diff --git a/meson.build b/meson.build
index a3fecbb..e58a940 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gssdp', 'c', version: '1.4.0', meson_version : '>= 0.54.0')
+project('gssdp', 'c', version: '1.5.0', meson_version : '>= 0.54.0')
gnome = import('gnome')
pkg = import('pkgconfig')
@@ -7,6 +7,9 @@ cc = meson.get_compiler('c')
conf = configuration_data()
conf.set_quoted('VERSION', meson.project_version())
+GSSDP_API_VERSION='1.6'
+GSSDP_API_NAME='gssdp-@0@'.format(GSSDP_API_VERSION)
+
# Check for struct in_pktinfo
pktinfo_test = '''#define _GNU_SOURCE
#ifdef __APPLE__
diff --git a/vala/gssdp-1.2.deps b/vala/gssdp-1.4.deps
similarity index 100%
rename from vala/gssdp-1.2.deps
rename to vala/gssdp-1.4.deps
diff --git a/vala/meson.build b/vala/meson.build
index c26aca4..2e544cf 100644
--- a/vala/meson.build
+++ b/vala/meson.build
@@ -1,4 +1,4 @@
-vapi = gnome.generate_vapi('gssdp-1.2',
+vapi = gnome.generate_vapi(GSSDP_API_NAME,
sources : gir.get(0),
packages : ['gio-2.0', 'libsoup-2.4'],
install : true)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]