Bug#672546: xserver-xorg-video-openchrome: FTBFS on hurd-i386: unconditional libdrm requirement
Attached another version with needed #defines instead of including
embedded drm header. Cleaner?
I'd update upstream bug as well.
Or do we want simply not to build it on hurd anymore?
--
G..e
diff -u xserver-xorg-video-openchrome-0.3.3/debian/changelog xserver-xorg-video-openchrome-0.3.3/debian/changelog
--- xserver-xorg-video-openchrome-0.3.3/debian/changelog
+++ xserver-xorg-video-openchrome-0.3.3/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-openchrome (1:0.3.3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ -- Gabriele Giacone <1o5g4r8o@gmail.com> Mon, 05 May 2014 16:02:22 +0200
+
xserver-xorg-video-openchrome (1:0.3.3-1) unstable; urgency=low
[ Maarten Lankhorst ]
diff -u xserver-xorg-video-openchrome-0.3.3/debian/control xserver-xorg-video-openchrome-0.3.3/debian/control
--- xserver-xorg-video-openchrome-0.3.3/debian/control
+++ xserver-xorg-video-openchrome-0.3.3/debian/control
@@ -18,7 +18,7 @@
x11proto-xf86dri-dev,
x11proto-video-dev,
x11proto-gl-dev,
- libdrm-dev (>> 2.0),
+ libdrm-dev (>> 2.0) [!hurd-any],
libx11-dev,
libgl1-mesa-dev | libgl1-dev,
libxvmc-dev,
diff -u xserver-xorg-video-openchrome-0.3.3/debian/patches/series xserver-xorg-video-openchrome-0.3.3/debian/patches/series
--- xserver-xorg-video-openchrome-0.3.3/debian/patches/series
+++ xserver-xorg-video-openchrome-0.3.3/debian/patches/series
@@ -1,0 +2 @@
+hurd.patch
only in patch2:
unchanged:
--- xserver-xorg-video-openchrome-0.3.3.orig/debian/patches/hurd.patch
+++ xserver-xorg-video-openchrome-0.3.3/debian/patches/hurd.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,7 +80,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm glproto $REQUIRED_MODULES])
++PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto glproto $REQUIRED_MODULES])
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+--- a/src/via_driver.h
++++ b/src/via_driver.h
+@@ -519,4 +519,15 @@ Bool VIADRIBufferInit(ScrnInfoPtr pScrn)
+
+ #endif /* HAVE_DRI */
+
++#ifndef HAVE_DRI
++#define fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
++ ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
++#define DRM_FORMAT_XRGB8888 fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */
++#define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */
++#define DRM_FORMAT_XRGB1555 fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */
++#define DRM_FORMAT_RGB565 fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */
++#define DRM_FORMAT_RGB888 fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */
++#define DRM_FORMAT_XRGB2101010 fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */
++#endif
++
+ #endif /* _VIA_DRIVER_H_ */
Reply to: