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

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',

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: [

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
 

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

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