Date: Friday, August 28, 2020 @ 08:53:26 Author: arojas Revision: 690297
Fix build with GCC 10 and glibc 2.32 (FS#67576) Added: transcode/trunk/transcode-glibc-2.32.patch Modified: transcode/trunk/PKGBUILD ----------------------------+ PKGBUILD | 12 ++++++++-- transcode-glibc-2.32.patch | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-28 08:53:15 UTC (rev 690296) +++ PKGBUILD 2020-08-28 08:53:26 UTC (rev 690297) @@ -5,7 +5,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=33 +pkgrel=34 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=(x86_64) url="http://www.transcoding.org/" @@ -18,12 +18,16 @@ transcode-imagemagick7.patch transcode-ffmpeg3.patch transcode-ffmpeg4.patch - transcode-swresample.patch) + transcode-swresample.patch + transcode-gcc10.patch + transcode-glibc-2.32.patch) sha256sums=('1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92' '4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51' '728ec3101039d98116275e36ea5cf0434a23a0bb82aca830ea9612fb9d16b062' '2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721' - '6b4e91085742535174015be5da103fe3337b4cb14537634ae378c9050088280e') + '6b4e91085742535174015be5da103fe3337b4cb14537634ae378c9050088280e' + '13ad4d06ca5b98ef66c4e0699d92023727cd7936ef1c4bf7691e3a611c6bb786' + '8f7aa89be3bc38a42fe664e8f2c0e519158cb4e55b7f99f176f1622c2718b641') prepare() { cd $pkgname-$pkgver @@ -32,6 +36,8 @@ patch -p1 -i ../transcode-imagemagick7.patch # Gentoo patch sed -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' -i filter/subtitler/load_font.c patch -p1 -i ../transcode-swresample.patch # port away from avresample + patch -p1 -i ../transcode-gcc10.patch # Fix build with GCC 10 + patch -p1 -i ../transcode-glibc-2.32.patch # Fix build with glibc 2.32 autoreconf -vi } Added: transcode-glibc-2.32.patch =================================================================== --- transcode-glibc-2.32.patch (rev 0) +++ transcode-glibc-2.32.patch 2020-08-28 08:53:26 UTC (rev 690297) @@ -0,0 +1,47 @@ +--- transcode-1.1.7/import/v4l/import_v4l2.c.orig 2020-08-28 08:28:44.311434934 +0000 ++++ transcode-1.1.7/import/v4l/import_v4l2.c 2020-08-28 08:41:19.279323984 +0000 +@@ -455,7 +455,7 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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)); + } +
