meson: add gtk4 as a subproject

Add gtk.wrap to subprojects

Remove gtk4 from brew_setup.sh
This commit is contained in:
Stéphane Cerveau 2023-06-13 16:30:43 +02:00 committed by Stéphane Cerveau
parent 21962866c5
commit 5de51d5565
4 changed files with 16 additions and 4 deletions

View file

@ -4,7 +4,11 @@ HOMEBREW_NO_INSTALL_CLEANUP=1
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
brew install pkg-config gtk4 brew install pkg-config
# GTK4 support
brew install gtk4
# brew install cairo libxrandr libxi libxcursor libxdamage libxinerama
brew install npm brew install npm

View file

@ -14,13 +14,12 @@ current_date = run_command(python3, '-c', 'import datetime; print(datetime.datet
i18n = import('i18n') i18n = import('i18n')
host_system = host_machine.system() host_system = host_machine.system()
dependency('gstreamer-1.0', version: '>= 1.22', fallback: ['gstreamer-1.0']) dependency('gstreamer-1.0', version: '>= 1.22', fallback: ['gstreamer-1.0'])
dependency('gstreamer-base-1.0', version: '>= 1.22', fallback: ['gstreamer-1.0']) dependency('gstreamer-base-1.0', version: '>= 1.22', fallback: ['gstreamer-1.0'])
dependency('gstreamer-video-1.0', version: '>= 1.12', fallback: ['gstreamer-1.0']) dependency('gstreamer-video-1.0', version: '>= 1.12', fallback: ['gstreamer-1.0'])
dependency('glib-2.0', version: '>= 2.66') dependency('glib-2.0', version: '>= 2.66')
dependency('gio-2.0', version: '>= 2.66') dependency('gio-2.0', version: '>= 2.66')
dependency('gtk4', version: '>= 4.0.0') dependency('gtk4', version: '>= 4.0.0', fallback: ['gtk'])
find_program('cargo', required: true) find_program('cargo', required: true)
find_program('glib-compile-resources', required: true) find_program('glib-compile-resources', required: true)

View file

@ -5,4 +5,4 @@ push-url=git@gitlab.freedesktop.org:gstreamer/gstreamer.git
revision=main revision=main
[provide] [provide]
dependency_names = gstreamer-1.0, gstreamer-base-1.0, gstreamer-sys-1.0, gstreamer-plugins-bad-1.0, gstreamer-video-1.0 dependency_names = gstreamer-1.0, gstreamer-base-1.0, gstreamer-sys-1.0, gstreamer-plugins-bad-1.0, gstreamer-video-1.0, gstreamer-player-1.0

9
subprojects/gtk.wrap Normal file
View file

@ -0,0 +1,9 @@
[wrap-git]
directory=gtk
url=https://gitlab.gnome.org/GNOME/gtk.git
push-url=ssh://git@gitlab.gnome.org:GNOME/gtk.git
revision=4.8.2
depth=1
[provide]
dependency_names=gtk4