diff --git a/.gitignore b/.gitignore index 050320de0eda6d21b7049b2698ae7496db1575d2..b3db515eab884d0754f1388653ef914069b8203d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /subprojects/*/ .flatpak-builder/ +.vscode/ +subprojects/*.wrap diff --git a/.gitlab-ci/.lock b/.gitlab-ci/.lock deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index ff6b0853665bac21574009ec2061d447f2c5a0cb..4d54a0881a580fee766bd2490459fe1c124cebff 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar @echo on :: FIXME: make warnings fatal -pip3 install --upgrade --user meson~=0.64 || goto :error +pip3 install --upgrade --user meson~=1.2 || goto :error meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled _build || goto :error ninja -C _build || goto :error diff --git a/meson.build b/meson.build index 4ff564f59887b17a1c1938b0f396f393f76154e1..cc7bb83718eb3b913e6cd53452744ff1ee793d5c 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('gtk', 'c', # https://github.com/mesonbuild/meson/issues/2289 'c_std=gnu99', ], - meson_version : '>= 0.63.0', + meson_version : '>= 1.2.0', license: 'LGPL-2.1-or-later') # keep these numbers in sync with wrap files where there exist @@ -428,7 +428,10 @@ gi_dep = dependency('gobject-introspection-1.0', version: introspecti required: get_option('introspection').enabled() and get_option('build-tests')) gstplayer_dep = dependency('gstreamer-player-1.0', version: gstreamer_req, - required: get_option('media-gstreamer')) + required: get_option('media-gstreamer'), + default_options: [ + 'python=disabled', + ]) gstgl_dep = dependency('gstreamer-gl-1.0', version: gstreamer_req, required: get_option('media-gstreamer')) gstallocators_dep = dependency('gstreamer-allocators-1.0', version: gstreamer_req, @@ -923,6 +926,10 @@ subdir('po') subdir('docs/reference') +devenv = environment() +devenv.set('GTK_PATH', meson.current_build_dir() / 'modules') +meson.add_devenv(devenv) + if not meson.is_cross_build() gnome.post_install( glib_compile_schemas: true, diff --git a/subprojects/gstreamer-full.wrap b/subprojects/gstreamer-full.wrap new file mode 100644 index 0000000000000000000000000000000000000000..1ca3757900686ea9adbaf01627c9a1c2e3ec0fbb --- /dev/null +++ b/subprojects/gstreamer-full.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory=gstreamer +url=https://gitlab.freedesktop.org/gstreamer/gstreamer.git +revision=1.24 +depth=1 + +[provide] +dependency_names = gstreamer-1.0, gstreamer-player-1.0, gstreamer-gl-1.0 \ No newline at end of file