Skip to content

Commit

Permalink
Merge branch 'hotfix/fix-subproject-support' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lleoncr committed May 25, 2023
2 parents 404ebfa + 28deb0f commit 9ad6f01
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
gstd (0.15.1-1) unstable; urgency=medium

* Add includes to the declaration of the dependency

-- RidgeRun Engineering <[email protected]> Wed, 24 May 2023 20:28:00 +0200

gstd (0.15.0-1) unstable; urgency=medium

* Change project license to LGPL2+
Expand Down
8 changes: 6 additions & 2 deletions libgstc/c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ 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_dep = declare_dependency(link_with: gstc_lib,
dependencies : [libgstc_deps])
lib_gstc_inc = include_directories('.')
lib_gstc_dep = declare_dependency(
link_with: gstc_lib,
dependencies : [libgstc_deps],
include_directories : [lib_gstc_inc]
)

lib_gstc_dir = meson.current_source_dir()
8 changes: 6 additions & 2 deletions libgstd/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,9 @@ 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_dep = declare_dependency(link_with: gstd_lib_manager,
dependencies : [libgstd_deps])
lib_gstd_inc = include_directories('.')
lib_gstd_dep = declare_dependency(
link_with: gstd_lib_manager,
dependencies : [libgstd_deps],
include_directories : [lib_gstd_inc]
)
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('gstd', 'c',
version : '0.15.0',
version : '0.15.1',
meson_version : '>= 0.50',
default_options : [
'c_std=c11',
Expand Down

0 comments on commit 9ad6f01

Please sign in to comment.