diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-24 08:29:34 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-24 08:29:34 +0000 |
| commit | 185354555c5775d2c2f8c901a12d17b37e373edb (patch) | |
| tree | e8bc9ba0631619145683bfe38ff1906861acf91b | |
| parent | 29905d1ce68036d558aa42e886a73070107db5b3 (diff) | |
| parent | cfb0df14cc85bc5ed06cd27414f7d8f1f35bc19b (diff) | |
| download | gtk+-185354555c5775d2c2f8c901a12d17b37e373edb.tar.gz | |
Merge branch 'nirbheek/misc-meson-fixes' into 'master'
Fix broadway backend build and graphene as a subproject
Closes #1197 and #1218
See merge request GNOME/gtk!265
| -rw-r--r-- | gdk/broadway/meson.build | 24 | ||||
| -rw-r--r-- | gdk/x11/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | subprojects/gdk-pixbuf.wrap | 4 | ||||
| -rw-r--r-- | subprojects/pango.wrap | 4 |
5 files changed, 26 insertions, 19 deletions
diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index 0306770f3f..590440ace0 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h', ], ) +broadwayjs_h = custom_target('broadwayjs.h', + input : ['broadway.js'], + output : 'broadwayjs.h', + command : [ + gen_c_array, + '--array-name=broadway_js', + '--output=@OUTPUT@', + '@INPUT0@', + ], +) + libgdk_broadway = static_library('gdk-broadway', - clienthtml_h, + clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: [ @@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway', broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib -broadwayjs_h = custom_target('broadwayjs.h', - input : ['broadway.js'], - output : 'broadwayjs.h', - command : [ - gen_c_array, - '--array-name=broadway_js', - '--output=@OUTPUT@', - '@INPUT0@', - ], -) - executable('gtk4-broadwayd', clienthtml_h, broadwayjs_h, 'broadwayd.c', 'broadway-server.c', 'broadway-output.c', diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index 33e61c114a..03d314feef 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -70,7 +70,7 @@ gdk_x11_deps = [ xinerama_dep, ] -libgdk_x11 = static_library('gdk-x11', +libgdk_x11 = static_library('gdk-x11', gdkmarshal_h, gdk_x11_sources, gdkconfig, gdkenum_h, include_directories: [ confinc, gdkinc, ], c_args: [ diff --git a/meson.build b/meson.build index ede2e155a7..713877808f 100644 --- a/meson.build +++ b/meson.build @@ -640,8 +640,15 @@ if cloudproviders_enabled endif endif -graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1' -graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1' +graphene_dep_type = graphene_dep.type_name() +if graphene_dep_type == 'pkgconfig' + graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1' + graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1' +else + graphene_simd = subproject('graphene').get_variable('graphene_simd') + graphene_has_sse2 = graphene_simd.contains('sse2') + graphene_has_gcc = graphene_simd.contains('gcc') +endif malloc_is_aligned = false diff --git a/subprojects/gdk-pixbuf.wrap b/subprojects/gdk-pixbuf.wrap index 1d251c53ff..e10670d7d1 100644 --- a/subprojects/gdk-pixbuf.wrap +++ b/subprojects/gdk-pixbuf.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=gdk-pixbuf -url=https://git.gnome.org/browse/gdk-pixbuf -push-url=ssh://git.gnome.org/git/gdk-pixbuf +url=https://gitlab.gnome.org/GNOME/gdk-pixbuf.git +push-url=ssh://git@gitlab.gnome.org:GNOME/gdk-pixbuf.git revision=origin/master diff --git a/subprojects/pango.wrap b/subprojects/pango.wrap index e7bc1733e9..8b89b985c0 100644 --- a/subprojects/pango.wrap +++ b/subprojects/pango.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=pango -url=https://git.gnome.org/browse/pango -push-url=ssh://git.gnome.org/git/pango +url=https://gitlab.gnome.org/GNOME/pango.git +push-url=ssh://git@gitlab.gnome.org:GNOME/pango.git revision=origin/master |