Skip to content

Commit

Permalink
meson: Maintain macOS ABI through dylib versioning
Browse files Browse the repository at this point in the history
Requires Meson 0.48, but the feature will be ignored on older versions
so it's safe to add it without bumping the requirement.

Documentation:
https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-manual.md#shared_library
  • Loading branch information
nirbheek committed Aug 31, 2018
1 parent 0c85af5 commit a9cab42
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 2 deletions.
1 change: 1 addition & 0 deletions gst-libs/gst/allocators/meson.build
Expand Up @@ -14,6 +14,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : [gst_dep],
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/app/meson.build
Expand Up @@ -24,6 +24,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : [gst_base_dep],
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/audio/meson.build
Expand Up @@ -145,6 +145,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
link_with : simd_dependencies,
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : gstaudio_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/fft/meson.build
Expand Up @@ -31,6 +31,7 @@ gstfft = library('gstfft-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : [gst_dep, libm],
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/gl/meson.build
Expand Up @@ -872,6 +872,7 @@ if build_gstgl
include_directories : [configinc, libsinc, gl_includes],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : [gst_base_dep, video_dep, allocators_dep, gmodule_dep,
gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps])
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/pbutils/meson.build
Expand Up @@ -54,6 +54,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : gstpbutils_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/riff/meson.build
Expand Up @@ -20,6 +20,7 @@ gstriff = library('gstriff-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : riff_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/rtp/meson.build
Expand Up @@ -38,6 +38,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : gstrtp_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/rtsp/meson.build
Expand Up @@ -45,6 +45,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : gstrtsp_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/sdp/meson.build
Expand Up @@ -15,6 +15,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : rtsp_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/tag/meson.build
Expand Up @@ -79,6 +79,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : tag_deps,
)
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/video/meson.build
Expand Up @@ -124,6 +124,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
include_directories: [configinc, libsinc],
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
install : true,
dependencies : gstvideo_deps,
)
Expand Down
5 changes: 3 additions & 2 deletions meson.build
Expand Up @@ -27,8 +27,9 @@ api_version = '1.0'
soversion = 0
# maintaining compatibility with the previous libtool versioning
# current = minor * 100 + micro
# FIXME: should be able to convert string to int somehow so we can just do maths
libversion = '@0@.@1@.0'.format(soversion, gst_version_minor * 100 + gst_version_micro)
curversion = gst_version_minor * 100 + gst_version_micro
libversion = '@0@.@1@.0'.format(soversion, curversion)
osxversion = curversion + 1

plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))

Expand Down

0 comments on commit a9cab42

Please sign in to comment.