Skip to content

Commit 04a4891

Browse files
authored
Adds meson option to build static library instead of shared (#508)
The version has been bumped to v2.2.6 Co-authored-by: bjornvolcker <[email protected]>
1 parent 72afa87 commit 04a4891

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

lib/src/sv_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#define DEFAULT_HASH_SIZE (256 / 8)
5151

5252
#define SV_VERSION_BYTES 3
53-
#define SIGNED_VIDEO_VERSION "v2.2.5"
53+
#define SIGNED_VIDEO_VERSION "v2.2.6"
5454
#define SV_VERSION_MAX_STRLEN 19 // Longest possible string including 'ONVIF' prefix
5555

5656
#define DEFAULT_AUTHENTICITY_LEVEL SV_AUTHENTICITY_LEVEL_FRAME

meson.build

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('signed-video-framework', 'c',
2-
version : '2.2.5',
2+
version : '2.2.6',
33
meson_version : '>= 0.53.0',
44
default_options : [ 'warning_level=2',
55
'werror=true',
@@ -74,14 +74,24 @@ install_headers(
7474

7575
signedvideoframework_deps = [ openssl_dep, plugin_deps, mediasigningframework_dep ]
7676

77-
signedvideoframework = shared_library(
78-
'signed-video-framework',
79-
signedvideoframework_sources,
80-
include_directories : [ svsrcinc, omssrcinc ],
81-
version : meson.project_version(),
82-
dependencies : signedvideoframework_deps,
83-
install : true,
84-
)
77+
if get_option('staticlibrary')
78+
signedvideoframework = static_library(
79+
'signed-video-framework',
80+
signedvideoframework_sources,
81+
include_directories : [ svsrcinc, omssrcinc ],
82+
dependencies : signedvideoframework_deps,
83+
install : true,
84+
)
85+
else
86+
signedvideoframework = shared_library(
87+
'signed-video-framework',
88+
signedvideoframework_sources,
89+
include_directories : [ svsrcinc, omssrcinc ],
90+
version : meson.project_version(),
91+
dependencies : signedvideoframework_deps,
92+
install : true,
93+
)
94+
endif
8595

8696
pkgconfig = import('pkgconfig')
8797
pkgconfig.generate(

meson_options.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ option('generatetestkeys',
1414
type : 'boolean',
1515
value : false,
1616
description : 'Generate signing keys for tests')
17+
option('staticlibrary',
18+
type : 'boolean',
19+
value : false,
20+
description : 'Build a static library instead of a shared one')

0 commit comments

Comments
 (0)