diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog --- linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2018-01-23 17:52:14.000000000 +0000 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2020-07-26 18:42:38.000000000 +0000 @@ -1,3 +1,19 @@ +linuxtv-dvb-apps (1.1.1+rev1500-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Add a patch to fix build with gcc 10, caused by multiple definition of the + 'sid' global variable. (Closes: #957492). + + -- Aurelien Jarno Sun, 26 Jul 2020 20:42:38 +0200 + +linuxtv-dvb-apps (1.1.1+rev1500-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Add a patch to replace the obsolete stime function (removed in glibc 2.31) + by clock_settime. (Closes: #964223) + + -- Aurelien Jarno Sun, 19 Jul 2020 19:11:31 +0200 + linuxtv-dvb-apps (1.1.1+rev1500-1.2) unstable; urgency=low * Non-maintainer upload. diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/gcc-10-sid-redefinition.patch linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/gcc-10-sid-redefinition.patch --- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/gcc-10-sid-redefinition.patch 1970-01-01 00:00:00.000000000 +0000 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/gcc-10-sid-redefinition.patch 2020-07-26 18:39:03.000000000 +0000 @@ -0,0 +1,10 @@ +--- linuxtv-dvb-apps-1.1.1+rev1500.orig/util/alevt/vbi.c ++++ linuxtv-dvb-apps-1.1.1+rev1500/util/alevt/vbi.c +@@ -35,7 +35,6 @@ static void dvb_handler(struct vbi *vbi, + + static u8 *rawbuf; // one common buffer for raw vbi data + static int rawbuf_size; // its current size +-u_int16_t sid; + static char *vbi_names[] + = { "/dev/vbi", "/dev/vbi0", "/dev/video0", "/dev/dvb/adapter0/demux0", + NULL }; // default device names if none was given at the command line diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/glibc-stime.patch linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/glibc-stime.patch --- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/glibc-stime.patch 1970-01-01 00:00:00.000000000 +0000 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/glibc-stime.patch 2020-07-19 17:11:31.000000000 +0000 @@ -0,0 +1,16 @@ +The obsolete stime function is no longer available to newly linked binaries +since glibc 2.31. Replace it by clock_settime. + +--- a/util/dvbdate/dvbdate.c ++++ b/util/dvbdate/dvbdate.c +@@ -309,7 +309,9 @@ int atsc_scan_date(time_t *rx_time, unsi + */ + int set_time(time_t * new_time) + { +- if (stime(new_time)) { ++ struct timespec ts = { .tv_sec = new_time }; ++ ++ if (clock_settime(CLOCK_REALTIME, &ts)) { + perror("Unable to set time"); + return -1; + } diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series --- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2018-01-23 17:50:35.000000000 +0000 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2020-07-26 18:38:59.000000000 +0000 @@ -9,3 +9,5 @@ use-ldflags.patch fix-build-libpng16.patch dst_test-no-set-id.patch +glibc-stime.patch +gcc-10-sid-redefinition.patch