Hi Sudip, Well done, thank you!
Regards, Roberto On Mon, Aug 3, 2020 at 5:45 PM Sudip Mukherjee <sudipm.mukher...@gmail.com> wrote: > Control: tags 957620 + patch > Control: tags 957620 + pending > > Dear maintainer, > > I've prepared an NMU for nvtv (versioned as 0.4.7-8.1) and > uploaded it to DELAYED/2. Please feel free to tell me if I > should cancel it. > > -- > Regards > Sudip > > diff -Nru nvtv-0.4.7/debian/changelog nvtv-0.4.7/debian/changelog > --- nvtv-0.4.7/debian/changelog 2012-09-02 02:46:52.000000000 +0100 > +++ nvtv-0.4.7/debian/changelog 2020-08-03 16:30:37.000000000 +0100 > @@ -1,3 +1,10 @@ > +nvtv (0.4.7-8.1) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Fix ftbfs with GCC-10. (Closes: #957620) > + > + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Mon, 03 Aug 2020 > 16:30:37 +0100 > + > nvtv (0.4.7-8) unstable; urgency=low > > * Updated standards. > diff -Nru nvtv-0.4.7/debian/patches/fix_ftbfs.patch > nvtv-0.4.7/debian/patches/fix_ftbfs.patch > --- nvtv-0.4.7/debian/patches/fix_ftbfs.patch 1970-01-01 > 01:00:00.000000000 +0100 > +++ nvtv-0.4.7/debian/patches/fix_ftbfs.patch 2020-08-03 > 16:30:14.000000000 +0100 > @@ -0,0 +1,80 @@ > +Description: Fix ftbfs with GCC-10. > + > +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> > +Bug-Debian: https://bugs.debian.org/957620 > +Forwarded: no > + > +--- > + > +--- nvtv-0.4.7.orig/src/data_cx.c > ++++ nvtv-0.4.7/src/data_cx.c > +@@ -33,6 +33,19 @@ > + #include "data_cx.h" > + #include "data_nv.h" > + > ++TVCxRegs cx_ntsc_xbox; /* XBox BIOS */ > ++ > ++TVCxRegs cx_ntsc_small_a; /* Mode 10, hoc=15.11 voc=14.81 */ > ++TVCxRegs cx_ntsc_normal_a; /* Mode 26, hoc=11.97 voc=11.93 */ > ++TVCxRegs cx_ntsc_tiny_a; /* Mode 42, hoc=18.04 voc=18.11 */ > ++TVCxRegs cx_ntsc_small_b; /* Mode 18, hoc=13.79 voc=13.58 */ > ++TVCxRegs cx_ntsc_tiny_b; /* Mode 34, hoc=19.26 voc=19.34 */ > ++TVCxRegs cx_ntsc_mini_b; /* Mode 40, hoc=15.59 voc=15.64 */ > ++ > ++TVCxRegs cx_pal_small_a; /* Mode 11, hoc=13.44 voc=14.24 */ > ++TVCxRegs cx_pal_mini_a; /* Mode 43, hoc=16.20 voc=16.67 */ > ++ > ++ > + /* -------- CX -------- NTSC -------- */ > + > + /* FIXME I do not know if all XBoxes have the CX encoder. For now, we > +--- nvtv-0.4.7.orig/src/data_cx.h > ++++ nvtv-0.4.7/src/data_cx.h > +@@ -37,16 +37,16 @@ void data_setup_cx (TVSettings *s, TVReg > + > + void data_secam_cx (TVCxRegs *r); > + > +-TVCxRegs cx_ntsc_xbox; /* XBox BIOS */ > ++extern TVCxRegs cx_ntsc_xbox; /* XBox BIOS */ > + > +-TVCxRegs cx_ntsc_small_a; /* Mode 10, hoc=15.11 voc=14.81 */ > +-TVCxRegs cx_ntsc_normal_a; /* Mode 26, hoc=11.97 voc=11.93 */ > +-TVCxRegs cx_ntsc_tiny_a; /* Mode 42, hoc=18.04 voc=18.11 */ > +-TVCxRegs cx_ntsc_small_b; /* Mode 18, hoc=13.79 voc=13.58 */ > +-TVCxRegs cx_ntsc_tiny_b; /* Mode 34, hoc=19.26 voc=19.34 */ > +-TVCxRegs cx_ntsc_mini_b; /* Mode 40, hoc=15.59 voc=15.64 */ > ++extern TVCxRegs cx_ntsc_small_a; /* Mode 10, hoc=15.11 voc=14.81 */ > ++extern TVCxRegs cx_ntsc_normal_a; /* Mode 26, hoc=11.97 voc=11.93 */ > ++extern TVCxRegs cx_ntsc_tiny_a; /* Mode 42, hoc=18.04 voc=18.11 */ > ++extern TVCxRegs cx_ntsc_small_b; /* Mode 18, hoc=13.79 voc=13.58 */ > ++extern TVCxRegs cx_ntsc_tiny_b; /* Mode 34, hoc=19.26 voc=19.34 */ > ++extern TVCxRegs cx_ntsc_mini_b; /* Mode 40, hoc=15.59 voc=15.64 */ > + > +-TVCxRegs cx_pal_small_a; /* Mode 11, hoc=13.44 voc=14.24 */ > +-TVCxRegs cx_pal_mini_a; /* Mode 43, hoc=16.20 voc=16.67 */ > ++extern TVCxRegs cx_pal_small_a; /* Mode 11, hoc=13.44 voc=14.24 */ > ++extern TVCxRegs cx_pal_mini_a; /* Mode 43, hoc=16.20 voc=16.67 */ > + > + #endif /* _DATA_CX_H */ > +--- nvtv-0.4.7.orig/src/nvtv.c > ++++ nvtv-0.4.7/src/nvtv.c > +@@ -117,6 +117,8 @@ int opt_pci_func = -1; > + > + TVSettings opt_set; > + > ++int opt_tv_bus, opt_tv_addr; > ++ > + static const char *short_options = > "?12bcdf:ghlmno:pqr:s:tw:A:C:FNPS:T:W:X"; > + > + static struct option long_options[] = > +--- nvtv-0.4.7.orig/src/nvtv.h > ++++ nvtv-0.4.7/src/nvtv.h > +@@ -58,7 +58,7 @@ extern TVConnect opt_connect; /* use > + extern TVSettings opt_set; > + > + extern TVChip opt_tv_chip; /* use if != TV_NO_CHIP */ > +-int opt_tv_bus, opt_tv_addr; /* use if == TV_CHIP_BY_ADDR */ > ++extern int opt_tv_bus, opt_tv_addr; /* use if == TV_CHIP_BY_ADDR */ > + > + #if HAVE_X > + extern Window opt_window; /* use if != None */ > diff -Nru nvtv-0.4.7/debian/patches/series nvtv-0.4.7/debian/patches/series > --- nvtv-0.4.7/debian/patches/series 2012-09-01 18:30:48.000000000 +0100 > +++ nvtv-0.4.7/debian/patches/series 2020-08-03 16:24:25.000000000 +0100 > @@ -3,3 +3,4 @@ > 003_Gnu.patch > 004_makefile > 005_autotools.patch > +fix_ftbfs.patch >
