csharp: update gtk-sharp subproject

bindinator is now part of gtk-sharp and the submodule is no longer
needed.
This commit is contained in:
Andoni Morales Alastruey 2023-10-25 16:19:22 +02:00
parent dd8b07fb3f
commit 1b98ec70f4
5 changed files with 11 additions and 14 deletions

View file

@ -1,4 +0,0 @@
[wrap-git]
directory=bindinator
url=https://github.com/GLibSharp/bindinator.git
revision=c29b965e5ee4a9bd7fcf6b8f4d78dba6c9cbe6ac

View file

@ -158,9 +158,8 @@ custom_target('GstSharp-nuget',
subdir('samples') subdir('samples')
subdir('Tests') subdir('Tests')
bindinator = subproject('bindinator', default_options: ['gapi_fixup=@0@'.format(gapi_fixup)]) bindinate = find_program('bindinate', required: false)
if bindinator.get_variable('found') if bindinate.found()
bindinate = bindinator.get_variable('bindinate')
env = environment() env = environment()
env.set('GI_TYPELIB_PATH', join_paths(meson.global_source_root(), 'girs')) env.set('GI_TYPELIB_PATH', join_paths(meson.global_source_root(), 'girs'))
merge_with = '--merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstNet-1.0,GstPbutils-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0,GstWebRTC-1.0' merge_with = '--merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstNet-1.0,GstPbutils-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0,GstWebRTC-1.0'

View file

@ -1,4 +0,0 @@
[wrap-git]
directory=bindinator
url=https://github.com/GLibSharp/bindinator.git
revision=master

View file

@ -1,4 +1,7 @@
[wrap-git] [wrap-git]
directory=gtk-sharp directory=gtk-sharp
url=https://github.com/GLibSharp/GtkSharp.git url=https://github.com/GLibSharp/GtkSharp.git
revision=4c85f1479cf2e0dc056c0d288785e5a1d7251cb1 revision=4a7912d43de52e91795a06cba145386b26f113bd
[provide]
program_names = bindinate

View file

@ -1,4 +1,7 @@
[wrap-git] [wrap-git]
directory=gtk-sharp directory=gtk-sharp
url=https://github.com/gtk-sharp/gtk-sharp.git url=https://github.com/GLibSharp/GtkSharp.git
revision=3.22.2 revision=786f531be6c2285c8fe5d00163a4aa28e912f528
[provide]
program_names = bindinate