From 4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 8 Nov 2016 09:33:45 +0100
Subject: x11-driver-video-modesetting was merged in xserver

so do not try uselessly to install it...
---
 NEWS                | 1 +
 lib/Xconfig/card.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 300393e..f2dbd85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - XFdrake
+  o do not try uselessly to install x11-driver-video-modesetting
   o when testing X:
     * fix displaying test background (as well as running)
 
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 92d0457..b87dce8 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -331,7 +331,7 @@ Do you wish to use it?")), 1))) {
     Xconfig::proprietary::handle_FIRMWARE($do_pkgs, $card, $o_in);
 
     # handle_FIRMWARE could've changed $card->{Driver}
-    my @must_have = "x11-driver-video-$card->{Driver}";
+    my @must_have = if_($card->{Driver} ne 'modesetting', "x11-driver-video-$card->{Driver}");
 
     $do_pkgs->ensure_are_installed([ @must_have, @packages ], 1) or
       @must_have == listlength($do_pkgs->are_installed(@must_have))
-- 
cgit v1.2.1