Control: tags -1 patch fixed-upstream pending Hi,
thanks much for your work. I've noticed that upstream has already merged a patch for compatibility with xserver 1.19 [1]. I've gone ahead and cherry-picked that patch from upstream (the diff is identical, but it has proper authorship). Furthermore I've cleaned up the package a little bit and included your second patch to fix #745173. We'll upload the fixed package soon. Thanks, Andreas [1] https://cgit.freedesktop.org/xorg/driver/xf86-video-sisusb/commit/?id=6d44eb7a6075b9cc359b44282a7095a8b46c8a38 On Thu, Dec 15, 2016 at 04:41:29PM +0100, Mateusz Łukasik wrote: > Tags: control + patch > > Hi, > > My NMU debdiff to fix that. Patch is take over from PLD Linux. > > > -- > .''`. Mateusz Łukasik > : :' : http://mati75.eu > `. `' Debian Member - mat...@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 <mat...@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
signature.asc
Description: Digital signature
