From 4c6189c0fd991ef0bceabe83013ee1ed9e52a556 Mon Sep 17 00:00:00 2001 From: Luis Leon Date: Wed, 24 May 2023 20:25:56 +0200 Subject: [PATCH 1/5] Add includes to the declaration of the dependency This will allow projects using Gstd as a subproject to find the includes --- libgstc/c/meson.build | 3 ++- libgstd/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libgstc/c/meson.build b/libgstc/c/meson.build index e4414b19..f4a6839d 100644 --- a/libgstc/c/meson.build +++ b/libgstc/c/meson.build @@ -33,7 +33,8 @@ install_headers('libgstc.h') pkgconfig.generate(gstc_lib, description : 'GStreamer Client library to control Gstd') # Define the library as an internal dependency to the current build +lib_gstc_inc = include_directories('.') lib_gstc_dep = declare_dependency(link_with: gstc_lib, - dependencies : [libgstc_deps]) + dependencies : [libgstc_deps], include_directories : [lib_gstc_inc]) lib_gstc_dir = meson.current_source_dir() diff --git a/libgstd/meson.build b/libgstd/meson.build index 95a1de83..eed0c314 100644 --- a/libgstd/meson.build +++ b/libgstd/meson.build @@ -81,5 +81,6 @@ install_headers(gstd_headers) pkgconfig.generate(gstd_lib_manager, description : 'GStreamer Manager library to control Gstd') # Define the library as an internal dependency to the current build +lib_gstd_inc = include_directories('.') lib_gstd_dep = declare_dependency(link_with: gstd_lib_manager, - dependencies : [libgstd_deps]) + dependencies : [libgstd_deps], include_directories : [lib_gstd_inc]) From 37cb7c07aeffa5933b37c82b5ce8259748faffae Mon Sep 17 00:00:00 2001 From: Luis Leon Date: Wed, 24 May 2023 20:27:57 +0200 Subject: [PATCH 2/5] Bump patch number --- configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ccc5dd0d..ef171801 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl required version of autoconf AC_PREREQ([2.53]) dnl Gstreamer's daemon package name and version -AC_INIT([gstd],[0.15.0]) +AC_INIT([gstd],[0.15.1]) dnl required version of gstreamer and gst-plugins-base GST_REQUIRED=1.0.0 diff --git a/meson.build b/meson.build index 078cd556..43addf9a 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstd', 'c', - version : '0.15.0', + version : '0.15.1', meson_version : '>= 0.50', default_options : [ 'c_std=c11', From 73a0105415899eddd5649631b26bf9b7cbd57566 Mon Sep 17 00:00:00 2001 From: Luis Leon Date: Wed, 24 May 2023 20:29:46 +0200 Subject: [PATCH 3/5] Add changelog for Debian --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a2848e5..219b1b9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gstd (0.15.1-1) unstable; urgency=medium + + * Add includes to the declaration of the dependency + + -- RidgeRun Engineering Wed, 24 May 2022 20:28:00 +0200 + gstd (0.15.0-1) unstable; urgency=medium * Change project license to LGPL2+ From bf90b61ef914db891b9a0636ef76cbb212c8b461 Mon Sep 17 00:00:00 2001 From: Luis Leon Date: Wed, 24 May 2023 21:07:40 +0200 Subject: [PATCH 4/5] Fix style of the dependency declaration --- libgstc/c/meson.build | 7 +++++-- libgstd/meson.build | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libgstc/c/meson.build b/libgstc/c/meson.build index f4a6839d..ae77735c 100644 --- a/libgstc/c/meson.build +++ b/libgstc/c/meson.build @@ -34,7 +34,10 @@ pkgconfig.generate(gstc_lib, description : 'GStreamer Client library to control # Define the library as an internal dependency to the current build lib_gstc_inc = include_directories('.') -lib_gstc_dep = declare_dependency(link_with: gstc_lib, - dependencies : [libgstc_deps], include_directories : [lib_gstc_inc]) +lib_gstc_dep = declare_dependency( + link_with: gstc_lib, + dependencies : [libgstc_deps], + include_directories : [lib_gstc_inc] +) lib_gstc_dir = meson.current_source_dir() diff --git a/libgstd/meson.build b/libgstd/meson.build index eed0c314..214c8f71 100644 --- a/libgstd/meson.build +++ b/libgstd/meson.build @@ -82,5 +82,8 @@ pkgconfig.generate(gstd_lib_manager, description : 'GStreamer Manager library to # Define the library as an internal dependency to the current build lib_gstd_inc = include_directories('.') -lib_gstd_dep = declare_dependency(link_with: gstd_lib_manager, - dependencies : [libgstd_deps], include_directories : [lib_gstd_inc]) +lib_gstd_dep = declare_dependency( + link_with: gstd_lib_manager, + dependencies : [libgstd_deps], + include_directories : [lib_gstd_inc] +) From 28deb0f3757c27e14101f19dc504ff28fe6bc8fb Mon Sep 17 00:00:00 2001 From: Luis Leon Date: Wed, 24 May 2023 22:14:55 +0200 Subject: [PATCH 5/5] Fix timestamp in debian log --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 219b1b9e..613d502e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ gstd (0.15.1-1) unstable; urgency=medium * Add includes to the declaration of the dependency - -- RidgeRun Engineering Wed, 24 May 2022 20:28:00 +0200 + -- RidgeRun Engineering Wed, 24 May 2023 20:28:00 +0200 gstd (0.15.0-1) unstable; urgency=medium