diff --git a/installer/macos/brew_setup.sh b/installer/macos/brew_setup.sh index 16dfea3..0ce0d20 100755 --- a/installer/macos/brew_setup.sh +++ b/installer/macos/brew_setup.sh @@ -4,7 +4,11 @@ HOMEBREW_NO_INSTALL_CLEANUP=1 /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 diff --git a/meson.build b/meson.build index 1861d4a..52756c0 100644 --- a/meson.build +++ b/meson.build @@ -14,13 +14,12 @@ current_date = run_command(python3, '-c', 'import datetime; print(datetime.datet i18n = import('i18n') host_system = host_machine.system() - 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-video-1.0', version: '>= 1.12', fallback: ['gstreamer-1.0']) dependency('glib-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('glib-compile-resources', required: true) diff --git a/subprojects/gstreamer-1.0.wrap b/subprojects/gstreamer-1.0.wrap index 4821cbe..f493ae5 100644 --- a/subprojects/gstreamer-1.0.wrap +++ b/subprojects/gstreamer-1.0.wrap @@ -5,4 +5,4 @@ push-url=git@gitlab.freedesktop.org:gstreamer/gstreamer.git revision=main [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 diff --git a/subprojects/gtk.wrap b/subprojects/gtk.wrap new file mode 100644 index 0000000..ed99789 --- /dev/null +++ b/subprojects/gtk.wrap @@ -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 \ No newline at end of file