[jhbuild] 3.28: Enable wayland and udev condition on FreeBSD

[Ting-Wei Lan <lantw src gnome org>]

commit 065837d38ca5197d0a7f4efcae6e6e98500a039e
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Jan 9 12:04:14 2018 +0800

    3.28: Enable wayland and udev condition on FreeBSD
    
    FreeBSD has wayland in ports since a year ago although most packages are
    still not built with wayland enabled by default. I think it is time to
    test GNOME with wayland on FreeBSD.
    
    FreeBSD also has a new port called 'libudev-devd', which is intended to
    be a API-compatible libudev implementation on the top of FreeBSD devd.
    Although there are only a few packages using it, it is already good
    enough to allow building libgudev successfully without patches.
    
    However, since downstream patches are still required to build wayland on
    FreeBSD, we have to rely on the version installed in the system. To get
    modulesets work with FreeBSD, all <dep package="wayland"/> are moved to
    nested <if condition-set="linux"/> blocks because we are unable to build
    wayland in JHBuild on FreeBSD.
    
    libudev-devd on FreeBSD doesn't implement udev hwdb API. A new condition
    'udev-hwdb' is added to Linux to indicate that its udev implementation
    supports hwdb because there are a few modules depending on hwdb.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792379

 jhbuild/utils/sysid.py                         |    6 ++++--
 modulesets/gnome-suites-core-3.28.modules      |   12 +++++++-----
 modulesets/gnome-suites-core-deps-3.28.modules |   24 ++++++++++++++++++------
 3 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/jhbuild/utils/sysid.py b/jhbuild/utils/sysid.py
index 9146942..eafdb98 100644
--- a/jhbuild/utils/sysid.py
+++ b/jhbuild/utils/sysid.py
@@ -129,8 +129,10 @@ def ensure_loaded():
     # of 'freebsd') then we just need to make sure the more-specific one
     # comes first in the list
     conditions_sets = [
-            ('linux', ['linux', 'wayland', 'udev', 'evdev', 'x11', 'systemd', 'gnu-elf']),
-            ('freebsd', ['freebsd', 'x11', 'bsd', 'gnu-elf', 'gmake']),
+            ('linux', ['linux', 'wayland', 'udev', 'udev-hwdb', 'evdev', 'x11',
+             'systemd', 'gnu-elf']),
+            ('freebsd', ['freebsd', 'wayland', 'udev', 'x11', 'bsd', 'gnu-elf',
+             'gmake']),
             ('darwin', ['darwin', 'macos', 'quartz']),
 
             # this must be left here so that at least one will be found
diff --git a/modulesets/gnome-suites-core-3.28.modules b/modulesets/gnome-suites-core-3.28.modules
index e771b3e..4b8b3a4 100644
--- a/modulesets/gnome-suites-core-3.28.modules
+++ b/modulesets/gnome-suites-core-3.28.modules
@@ -226,7 +226,7 @@
   </meson>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <if condition-unset="udev">
+    <if condition-unset="udev-hwdb">
       <autogenargs value="--disable-udev"/>
     </if>
     <branch/>
@@ -241,7 +241,7 @@
       <dep package="iso-codes"/>
       <dep package="yelp-tools"/> <!-- for the docs -->
       <dep package="xkeyboard-config"/>
-      <if condition-set="udev">
+      <if condition-set="udev-hwdb">
         <dep package="libudev"/>
       </if>
     </dependencies>
@@ -560,10 +560,12 @@
         <dep package="libgudev"/>
         <dep package="gbm"/>
         <dep package="libdrm"/>
-        <dep package="libinput"/>
-        <dep package="libsystemd"/>
-        <dep package="wayland"/>
         <dep package="xwayland"/>
+        <if condition-set="linux">
+          <dep package="libinput"/>
+          <dep package="libsystemd"/>
+          <dep package="wayland"/>
+        </if>
       </if>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index 75ded24..045db87 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -185,7 +185,9 @@ the module and we will just change it to use a tarball anyway.
         <dep package="libxkbcommon"/>
       </if>
       <if condition-set="wayland">
-        <dep package="wayland"/>
+        <if condition-set="linux">
+          <dep package="wayland"/>
+        </if>
         <dep package="libxkbcommon"/>
       </if>
     </dependencies>
@@ -244,7 +246,9 @@ the module and we will just change it to use a tarball anyway.
         <dep package="xcb-dri2" />
       </if>
       <if condition-set="wayland">
-        <dep package="wayland"/>
+        <if condition-set="linux">
+          <dep package="wayland"/>
+        </if>
         <dep package="wayland-egl"/>
         <dep package="gbm"/>
       </if>
@@ -821,7 +825,9 @@ the module and we will just change it to use a tarball anyway.
       </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
-        <dep package="wayland"/>
+        <if condition-set="linux">
+          <dep package="wayland"/>
+        </if>
         <dep package="wayland-egl"/>
         <dep package="wayland-protocols"/>
       </if>
@@ -864,7 +870,9 @@ the module and we will just change it to use a tarball anyway.
       </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
-        <dep package="wayland"/>
+        <if condition-set="linux">
+          <dep package="wayland"/>
+        </if>
         <dep package="wayland-egl"/>
         <dep package="wayland-protocols"/>
       </if>
@@ -1839,7 +1847,9 @@ the module and we will just change it to use a tarball anyway.
     <branch repo="git.freedesktop.org"
             module="wayland/wayland-protocols"/>
     <dependencies>
-      <dep package="wayland"/>
+      <if condition-set="linux">
+        <dep package="wayland"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1907,7 +1917,9 @@ the module and we will just change it to use a tarball anyway.
         <dep package="libXt"/>
       </if>
       <if condition-set="wayland">
-        <dep package="wayland"/>
+        <if condition-set="linux">
+          <dep package="wayland"/>
+        </if>
       </if>
     </dependencies>
     <suggests>