Bug 92894 - xorg-wrapper.c and WITH_LIBDRM dead code
Summary: xorg-wrapper.c and WITH_LIBDRM dead code
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Server/General (show other bugs)
Version: unspecified
Hardware: Other All
: medium normal
Assignee: Xorg Project Team
QA Contact: Xorg Project Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-11-10 19:43 UTC by Arkadiusz Miskiewicz
Modified: 2016-07-29 17:30 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:

Attachments

Description Arkadiusz Miskiewicz 2015-11-10 19:43:00 UTC 
xorg-wrapper.c contains few "#ifdef WITH_LIBDRM" sections that are never activated even if WITH_LIBDRM is defined in xorg-config.h

That's because xorg-wrapper.c doesn't include xorg-config.h (directly or indirectly).

Fix:
--- xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c~       2015-11-10 19:37:11.000000000 +0100
+++ xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c        2015-11-10 19:37:18.640853466 +0100
@@ -24,6 +24,7 @@
  */

 #include "dix-config.h"
+#include "xorg-config.h"

 #include <errno.h>
 #include <fcntl.h>
Comment 1 Timo Aaltonen 2016-02-11 07:03:38 UTC 
the patch got applied and also included in 1.18.1, but there's a new bug on Debian assumed to be caused by this:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=814313
Comment 2 Timo Aaltonen 2016-02-11 07:05:28 UTC 
..though it could be just a pkg dep issue, will follow up later

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.