Bug#846698: xserver-xorg-video-sisusb: FTBFS: ../../src/sisusb_driver.c:1670:6: error: too many arguments to function 'pScreen->BlockHandler'
Tags: control + patch
On Sat, 3 Dec 2016 08:23:02 +0100 Lucas Nussbaum <lucas@debian.org> wrote:
> Hi,
>
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
>
> Relevant part (hopefully):
> > /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H
-I. -I../../src -I.. -fvisibility=hidden -I/usr/include/pixman-1
-I/usr/include/libdrm -I/usr/include/xorg -I/usr/include/X11/dri -g -O2
-c -o sisusb_driver.lo ../../src/sisusb_driver.c
> > libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../src -I..
-fvisibility=hidden -I/usr/include/pixman-1 -I/usr/include/libdrm
-I/usr/include/xorg -I/usr/include/X11/dri -g -O2 -c
../../src/sisusb_driver.c -fPIC -DPIC -o .libs/sisusb_driver.o
> > ../../src/sisusb_driver.c: In function 'SISUSBFreeRec':
> > ../../src/sisusb_driver.c:201:13: warning: passing argument 1 of
'free' discards 'const' qualifier from pointer target type
[-Wdiscarded-qualifiers]
> > free(pScrn->chipset);
> > ^~~~~
> > In file included from /usr/include/xorg/misc.h:154:0,
> > from /usr/include/xorg/xf86str.h:37,
> > from /usr/include/xorg/xf86Privstr.h:37,
> > from /usr/include/xorg/xf86Priv.h:38,
> > from ../../src/sisusb.h:84,
> > from ../../src/sisusb_driver.c:36:
> > /usr/include/stdlib.h:444:13: note: expected 'void *' but argument
is of type 'const char *'
> > extern void free (void *__ptr) __THROW;
> > ^~~~
> > ../../src/sisusb_driver.c: In function 'SiSUSBFindUSBDongle':
> > ../../src/sisusb_driver.c:302:11: warning: assignment discards
'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
> > else p = dev->busID;
> > ^
> > ../../src/sisusb_driver.c:304:13: warning: assignment discards
'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
> > p = dev->busID;
> > ^
> > ../../src/sisusb_driver.c: In function 'SISUSBPreInit':
> > ../../src/sisusb_driver.c:836:32: warning: passing argument 1 of
'SiSUSBCheckForUSBDongle' discards 'const' qualifier from pointer target
type [-Wdiscarded-qualifiers]
> > if(SiSUSBCheckForUSBDongle(pScrn->chipset, pSiSUSB,
&pSiSUSB->sisusbdev) < 0) {
> > ^~~~~
> > ../../src/sisusb_driver.c:240:1: note: expected 'char *' but
argument is of type 'const char *'
> > SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int
*filehandle)
> > ^~~~~~~~~~~~~~~~~~~~~~~
> > ../../src/sisusb_driver.c: In function 'SISUSBBlockHandler':
> > ../../src/sisusb_driver.c:1648:31: warning: passing argument 1 of
'SiSUSBCheckForUSBDongle' discards 'const' qualifier from pointer target
type [-Wdiscarded-qualifiers]
> > if(SiSUSBCheckForUSBDongle(pScrn->chipset, pSiSUSB,
&pSiSUSB->sisusbdev) >= 0) {
> > ^~~~~
> > ../../src/sisusb_driver.c:240:1: note: expected 'char *' but
argument is of type 'const char *'
> > SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int
*filehandle)
> > ^~~~~~~~~~~~~~~~~~~~~~~
> > ../../src/sisusb_driver.c:1670:6: error: too many arguments to
function 'pScreen->BlockHandler'
> > (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
> > ~^~~~~~~~~~~~~~~~~~~~~~~
> > ../../src/sisusb_driver.c:1671:27: warning: assignment from
incompatible pointer type [-Wincompatible-pointer-types]
> > pScreen->BlockHandler = SISUSBBlockHandler;
> > ^
> > ../../src/sisusb_driver.c: In function 'SISUSBScreenInit':
> > ../../src/sisusb_driver.c:1988:27: warning: assignment from
incompatible pointer type [-Wincompatible-pointer-types]
> > pScreen->BlockHandler = SISUSBBlockHandler;
> > ^
Hi,
My NMU debdiff to fix that. Patch is take over from PLD Linux.
--
.''`. Mateusz Łukasik
: :' : http://mati75.eu
`. `' Debian Member - mati75@linuxmint.pl
`- GPG: D93B 0C12 C8D0 4D7A AFBC FA27 CCD9 1D61 11A0 6851
diff -u xserver-xorg-video-sisusb-0.9.6/debian/changelog xserver-xorg-video-sisusb-0.9.6/debian/changelog
--- xserver-xorg-video-sisusb-0.9.6/debian/changelog
+++ xserver-xorg-video-sisusb-0.9.6/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-sisusb (1:0.9.6-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with xserver 1.19. (Closes: #846698)
+ * Use arch:linux-any. (Closes: #745173)
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl> Mon, 12 Dec 2016 09:58:58 +0100
+
xserver-xorg-video-sisusb (1:0.9.6-2) unstable; urgency=low
* Release to unstable.
diff -u xserver-xorg-video-sisusb-0.9.6/debian/control xserver-xorg-video-sisusb-0.9.6/debian/control
--- xserver-xorg-video-sisusb-0.9.6/debian/control
+++ xserver-xorg-video-sisusb-0.9.6/debian/control
@@ -22,7 +22,7 @@
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git
Package: xserver-xorg-video-sisusb
-Architecture: any
+Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
diff -u xserver-xorg-video-sisusb-0.9.6/debian/patches/series xserver-xorg-video-sisusb-0.9.6/debian/patches/series
--- xserver-xorg-video-sisusb-0.9.6/debian/patches/series
+++ xserver-xorg-video-sisusb-0.9.6/debian/patches/series
@@ -1,0 +2 @@
+xserver-1.19.patch
only in patch2:
unchanged:
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/patches/xserver-1.19.patch
+++ xserver-xorg-video-sisusb-0.9.6/debian/patches/xserver-1.19.patch
@@ -0,0 +1,16 @@
+--- xf86-video-chips-1.2.6/src/compat-api.h~ 2015-09-26 18:28:01.000000000 +0200
++++ xf86-video-chips-1.2.6/src/compat-api.h 2016-11-28 09:12:37.337570460 +0100
+@@ -75,8 +75,13 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
Reply to: