Update for changes in xorg.modules

Some new platform-inappropriate modules to skip
Add revlink for gitlab repos

3 files changed, 7 insertions, 3 deletions

diff --git a/master.cfg b/master.cfg
index b239dc4..abf8d67 100755
--- a/master.cfg
+++ b/master.cfg
@@ -37,8 +37,10 @@ c['mergeRequests'] = False
 ####### REVLINKS
 
 c['revlink'] = RevlinkMultiplexer(
+                 RevlinkMatch([r'(?:git|https)://gitlab.freedesktop.org/(.*)'],
+                              r'https://gitlab.freedesktop.org/\1/commit/%s'),
                  RevlinkMatch([r'(?:git|https)://anongit.freedesktop.org/git/(.*)'],
-                              r'http://cgit.freedesktop.org/\1/commit/?id=%s'),
+                              r'https://cgit.freedesktop.org/\1/commit/?id=%s'),
                  RevlinkMatch([r'git://github.com/(.*)'],
                               r'https://github.com/\1/commit/%s'),
                  RevlinkMatch([r'https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/(.*)'],
diff --git a/modulesetparser.py b/modulesetparser.py
index 9144a55..458a288 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -50,6 +50,7 @@ skip = [ 'applewmproto',
          'libevdev',
          'libpciaccess',
          'mesa-drm',
+         'mtdev',
          'app-xdriinfo',
          'app-xgamma',
          'app-xfs',
@@ -64,6 +65,7 @@ skip += [
          'xf86-input-evdev',
          'xf86-input-joystick',
          'xf86-input-keyboard',
+         'xf86-input-libinput',
          'xf86-input-mouse',
          'xf86-input-synaptics',
          'xf86-input-vmmouse',
diff --git a/xorg.modules b/xorg.modules
index 8cc0227..86af063 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -5,7 +5,7 @@
 <moduleset>
   <include href="xorg.modules.upstream"/>
 
-  <repository type="git" name="git.fd.o" href="https://gitlab.freedesktop.org/"/>
+  <repository type="git" name="git.freedesktop.org" href="git://anongit.freedesktop.org/git/"/>
   <repository type="svn" name="khronos" href="https://cvs.khronos.org/svn/repos/" trunk-template="ogl/trunk/doc/registry/public/api/"/>
 
   <autotools id="khronos-opengl-registry" supports-non-srcdir-builds="no" skip-autogen="true" check-target="false">
@@ -13,7 +13,7 @@
   </autotools>
 
   <meson id="xserver-meson">
-    <branch repo="git.fd.o" module="xorg/xserver" checkoutdir="xorg/xserver-meson"/>
+    <branch repo="git.freedesktop.org" module="xorg/xserver" checkoutdir="xorg/xserver-meson"/>
   </meson>
 
 </moduleset>