From e70e0a02891c0f66847ce48335cf6d1d1070972b Mon Sep 17 00:00:00 2001 From: bjornvolcker Date: Wed, 13 Aug 2025 09:34:30 +0200 Subject: [PATCH 1/2] Adds meson option to build static library instead of shared The version has been bumped to v2.2.6 --- lib/src/sv_internal.h | 2 +- meson.build | 28 +++++++++++++++++++--------- meson_options.txt | 4 ++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/src/sv_internal.h b/lib/src/sv_internal.h index ba691d3b..f91dd703 100644 --- a/lib/src/sv_internal.h +++ b/lib/src/sv_internal.h @@ -50,7 +50,7 @@ #define DEFAULT_HASH_SIZE (256 / 8) #define SV_VERSION_BYTES 3 -#define SIGNED_VIDEO_VERSION "v2.2.5" +#define SIGNED_VIDEO_VERSION "v2.2.6" #define SV_VERSION_MAX_STRLEN 19 // Longest possible string including 'ONVIF' prefix #define DEFAULT_AUTHENTICITY_LEVEL SV_AUTHENTICITY_LEVEL_FRAME diff --git a/meson.build b/meson.build index cd47f492..89fb2296 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('signed-video-framework', 'c', - version : '2.2.5', + version : '2.2.6', meson_version : '>= 0.53.0', default_options : [ 'warning_level=2', 'werror=true', @@ -74,14 +74,24 @@ install_headers( signedvideoframework_deps = [ openssl_dep, plugin_deps, mediasigningframework_dep ] -signedvideoframework = shared_library( - 'signed-video-framework', - signedvideoframework_sources, - include_directories : [ svsrcinc, omssrcinc ], - version : meson.project_version(), - dependencies : signedvideoframework_deps, - install : true, -) +if get_option('staticlibrary') + signedvideoframework = static_library( + 'signed-video-framework', + signedvideoframework_sources, + include_directories : [ svsrcinc, omssrcinc ], + version : meson.project_version(), + dependencies : signedvideoframework_deps, + install : true, + ) +else + signedvideoframework = shared_library( + 'signed-video-framework', + signedvideoframework_sources, + include_directories : [ svsrcinc, omssrcinc ], + dependencies : signedvideoframework_deps, + install : true, + ) +endif pkgconfig = import('pkgconfig') pkgconfig.generate( diff --git a/meson_options.txt b/meson_options.txt index 1aee7bea..d4ce22cf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,3 +14,7 @@ option('generatetestkeys', type : 'boolean', value : false, description : 'Generate signing keys for tests') +option('staticlibrary', + type : 'boolean', + value : false, + description : 'Build a static library instead of a shared one') From e4e183e7bf595e4b38ef198e5c7abc3cd2b566ac Mon Sep 17 00:00:00 2001 From: bjornvolcker Date: Wed, 13 Aug 2025 09:50:14 +0200 Subject: [PATCH 2/2] Version now in shared instead of static --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 89fb2296..70463a2d 100644 --- a/meson.build +++ b/meson.build @@ -79,7 +79,6 @@ if get_option('staticlibrary') 'signed-video-framework', signedvideoframework_sources, include_directories : [ svsrcinc, omssrcinc ], - version : meson.project_version(), dependencies : signedvideoframework_deps, install : true, ) @@ -88,6 +87,7 @@ else 'signed-video-framework', signedvideoframework_sources, include_directories : [ svsrcinc, omssrcinc ], + version : meson.project_version(), dependencies : signedvideoframework_deps, install : true, )