Bug#672546: xserver-xorg-video-openchrome: FTBFS on hurd-i386: unconditional libdrm requirement
On Mon, May 05, 2014 at 04:57:53PM +0200, Samuel Thibault wrote:
> > + pitch = ALIGN_TO(pitch, alignment);
>
> Err, this can not work: "pitch" becomes completely undefined...
Only said it would have built, not also worked ;)
Attached new workaround.
--
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,33 @@
+--- 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.c
++++ b/src/via_driver.c
+@@ -49,6 +49,8 @@
+
+ #ifdef HAVE_DRI
+ #include "dri.h"
++#else
++#include "drm_fourcc.h"
+ #endif
+
+ /* RandR support */
+--- a/src/via_memmgr.c
++++ b/src/via_memmgr.c
+@@ -37,6 +37,8 @@
+ #include "via_driver.h"
+ #ifdef HAVE_DRI
+ #include "via_drm.h"
++#else
++#include "drm_fourcc.h"
+ #endif
+
+ /*
Reply to: