From ca54da3228ddc925ae804a8b9bcf8037767e13bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 18 Oct 2020 12:26:11 +0200 Subject: [PATCH] DEB transcode: Fix FTBFS due to deprecated symbols sys_nerr and sys_errlist in glibc >= 2.32. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../transcode-1.1.7/debian/changelog | 6 ++ .../debian/patches/16-glic-2.32-sys_err.diff | 62 +++++++++++++++++++ .../transcode-1.1.7/debian/patches/series | 1 + 3 files changed, 69 insertions(+) create mode 100644 debian/transcode/transcode-1.1.7/debian/patches/16-glic-2.32-sys_err.diff diff --git a/debian/transcode/transcode-1.1.7/debian/changelog b/debian/transcode/transcode-1.1.7/debian/changelog index 6d7f3472..05683e1c 100644 --- a/debian/transcode/transcode-1.1.7/debian/changelog +++ b/debian/transcode/transcode-1.1.7/debian/changelog @@ -1,3 +1,9 @@ +transcode (3:1.1.7-10~0ubuntu20.10.0+2) groovy; urgency=medium + + * Fix FTBFS due to deprecated symbols sys_nerr and sys_errlist in glibc >= 2.32. + + -- Slávek Banko Sun, 18 Oct 2020 10:56:56 +0200 + transcode (3:1.1.7-10~0debian11.0.0+1~a) bullseye; urgency=medium * Fix multiple variable definitions that cause FTBFS. diff --git a/debian/transcode/transcode-1.1.7/debian/patches/16-glic-2.32-sys_err.diff b/debian/transcode/transcode-1.1.7/debian/patches/16-glic-2.32-sys_err.diff new file mode 100644 index 00000000..5859d066 --- /dev/null +++ b/debian/transcode/transcode-1.1.7/debian/patches/16-glic-2.32-sys_err.diff @@ -0,0 +1,62 @@ +Index: transcode-1.1.7/import/v4l/import_v4l2.c +=================================================================== +--- transcode-1.1.7.orig/import/v4l/import_v4l2.c ++++ transcode-1.1.7/import/v4l/import_v4l2.c +@@ -455,7 +455,7 @@ static int tc_v4l2_video_setup_cropping( + tc_log_warn(MOD_NAME, + "driver does not support cropping" + "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return TC_ERROR; + } + if (verbose_flag > TC_INFO) { +@@ -485,7 +485,7 @@ static int tc_v4l2_video_setup_cropping( + tc_log_warn(MOD_NAME, + "driver does not support inquiring cropping" + " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return -1; + } + +@@ -513,7 +513,7 @@ static int tc_v4l2_video_setup_cropping( + tc_log_warn(MOD_NAME, + "driver does not support inquering cropping" + " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + return -1; + } + if (verbose_flag > TC_INFO) { +@@ -613,7 +613,7 @@ static int tc_v4l2_video_setup_stream_pa + if (err < 0) { + if (verbose_flag) { + tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + } + } + return TC_OK; +@@ -628,7 +628,7 @@ static int tc_v4l2_video_get_TV_standard + err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid); + if (err < 0) { + tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + memset(&stdid, 0, sizeof(v4l2_std_id)); + } + +Index: transcode-1.1.7/import/v4l/import_v4lcam.c +=================================================================== +--- transcode-1.1.7.orig/import/v4l/import_v4lcam.c ++++ transcode-1.1.7/import/v4l/import_v4lcam.c +@@ -368,7 +368,7 @@ static int tc_v4l2_video_setup_stream_pa + if (err < 0) { + tc_log_warn(MOD_NAME, "driver does not support setting parameters" + " (ioctl(VIDIOC_S_PARM) returns \"%s\")", +- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); ++ strerror(errno)); + } + return TC_OK; + } diff --git a/debian/transcode/transcode-1.1.7/debian/patches/series b/debian/transcode/transcode-1.1.7/debian/patches/series index 4f156e3c..85b92ee0 100644 --- a/debian/transcode/transcode-1.1.7/debian/patches/series +++ b/debian/transcode/transcode-1.1.7/debian/patches/series @@ -13,3 +13,4 @@ ac3-audio-track-number.patch 13-ffmpeg4.patch 14-av-pix-fmt.diff 15-multiple-definitions.diff +16-glic-2.32-sys_err.diff