diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -264,8 +264,6 @@ libavdevice.so.58:avdevice_register_all libavdevice.so.58:avdevice_version libavfilter.so.7:LIBAVFILTER_7 -libavfilter.so.7:_ZNKSt5ctypeIcE8do_widenEc -libavfilter.so.7:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag libavfilter.so.7:av_abuffersink_params_alloc libavfilter.so.7:av_buffersink_get_channel_layout libavfilter.so.7:av_buffersink_get_channels diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,4 +1,3 @@ -UNKNOWN libGL.so.1 libSDL2-2.0.so.0 libX11.so.6 @@ -10,7 +9,6 @@ libbluray.so.2 libbz2.so.1.0 libc.so.6 -libcaca.so.0 libcdio_cdda.so.2 libcdio_paranoia.so.2 libdav1d.so.5 @@ -31,6 +29,7 @@ libpthread.so.0 libpulse.so.0 librav1e.so.0 +librubberband.so.2 libsmbclient.so.0 libsnappy.so.1 libsoxr.so.0 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -1,57 +1,3 @@ -UNKNOWN:compress -UNKNOWN:compress2 -UNKNOWN:deflate -UNKNOWN:deflateEnd -UNKNOWN:deflateInit2_ -UNKNOWN:deflateInit_ -UNKNOWN:deflateReset -UNKNOWN:inflate -UNKNOWN:inflateEnd -UNKNOWN:inflateInit2_ -UNKNOWN:inflateInit_ -UNKNOWN:inflateReset -UNKNOWN:inflateSync -UNKNOWN:uncompress -UNKNOWN:vaAcquireBufferHandle -UNKNOWN:vaBeginPicture -UNKNOWN:vaCreateBuffer -UNKNOWN:vaCreateConfig -UNKNOWN:vaCreateContext -UNKNOWN:vaCreateImage -UNKNOWN:vaDeriveImage -UNKNOWN:vaDestroyBuffer -UNKNOWN:vaDestroyConfig -UNKNOWN:vaDestroyContext -UNKNOWN:vaDestroyImage -UNKNOWN:vaDestroySurfaces -UNKNOWN:vaEndPicture -UNKNOWN:vaEntrypointStr -UNKNOWN:vaErrorStr -UNKNOWN:vaExportSurfaceHandle -UNKNOWN:vaGetConfigAttributes -UNKNOWN:vaGetImage -UNKNOWN:vaInitialize -UNKNOWN:vaMapBuffer -UNKNOWN:vaMaxNumEntrypoints -UNKNOWN:vaMaxNumImageFormats -UNKNOWN:vaMaxNumProfiles -UNKNOWN:vaProfileStr -UNKNOWN:vaPutImage -UNKNOWN:vaQueryConfigEntrypoints -UNKNOWN:vaQueryConfigProfiles -UNKNOWN:vaQueryImageFormats -UNKNOWN:vaQuerySurfaceAttributes -UNKNOWN:vaQueryVendorString -UNKNOWN:vaQueryVideoProcFilterCaps -UNKNOWN:vaQueryVideoProcPipelineCaps -UNKNOWN:vaReleaseBufferHandle -UNKNOWN:vaRenderPicture -UNKNOWN:vaSetDriverName -UNKNOWN:vaSetErrorCallback -UNKNOWN:vaSetInfoCallback -UNKNOWN:vaSyncSurface -UNKNOWN:vaTerminate -UNKNOWN:vaUnmapBuffer libGL.so.1:glBindTexture libGL.so.1:glBlendFunc libGL.so.1:glClear @@ -372,27 +318,6 @@ libc.so.6:toupper libc.so.6:unlink libc.so.6:vsnprintf -libcaca.so.0:caca_create_canvas -libcaca.so.0:caca_create_display_with_driver -libcaca.so.0:caca_create_dither -libcaca.so.0:caca_dither_bitmap -libcaca.so.0:caca_free_canvas -libcaca.so.0:caca_free_display -libcaca.so.0:caca_free_dither -libcaca.so.0:caca_get_canvas_height -libcaca.so.0:caca_get_canvas_width -libcaca.so.0:caca_get_display_driver_list -libcaca.so.0:caca_get_dither_algorithm_list -libcaca.so.0:caca_get_dither_antialias_list -libcaca.so.0:caca_get_dither_charset_list -libcaca.so.0:caca_get_dither_color_list -libcaca.so.0:caca_refresh_display -libcaca.so.0:caca_set_display_time -libcaca.so.0:caca_set_display_title -libcaca.so.0:caca_set_dither_algorithm -libcaca.so.0:caca_set_dither_antialias -libcaca.so.0:caca_set_dither_charset -libcaca.so.0:caca_set_dither_color libcdio_cdda.so.2:cdio_cddap_close libcdio_cdda.so.2:cdio_cddap_disc_lastsector libcdio_cdda.so.2:cdio_cddap_errors @@ -767,6 +692,14 @@ librav1e.so.0:rav1e_status_to_str librav1e.so.0:rav1e_twopass_in librav1e.so.0:rav1e_twopass_out +librubberband.so.2:rubberband_available +librubberband.so.2:rubberband_delete +librubberband.so.2:rubberband_get_samples_required +librubberband.so.2:rubberband_new +librubberband.so.2:rubberband_process +librubberband.so.2:rubberband_retrieve +librubberband.so.2:rubberband_set_pitch_scale +librubberband.so.2:rubberband_set_time_ratio libsmbclient.so.0:smbc_close libsmbclient.so.0:smbc_closedir libsmbclient.so.0:smbc_free_context @@ -992,7 +925,47 @@ libv4l2.so.0:v4l2_read libva-drm.so.2:vaGetDisplayDRM libva-x11.so.2:vaGetDisplay +libva.so.2:vaAcquireBufferHandle +libva.so.2:vaBeginPicture +libva.so.2:vaCreateBuffer +libva.so.2:vaCreateConfig +libva.so.2:vaCreateContext +libva.so.2:vaCreateImage libva.so.2:vaCreateSurfaces +libva.so.2:vaDeriveImage +libva.so.2:vaDestroyBuffer +libva.so.2:vaDestroyConfig +libva.so.2:vaDestroyContext +libva.so.2:vaDestroyImage +libva.so.2:vaDestroySurfaces +libva.so.2:vaEndPicture +libva.so.2:vaEntrypointStr +libva.so.2:vaErrorStr +libva.so.2:vaExportSurfaceHandle +libva.so.2:vaGetConfigAttributes +libva.so.2:vaGetImage +libva.so.2:vaInitialize +libva.so.2:vaMapBuffer +libva.so.2:vaMaxNumEntrypoints +libva.so.2:vaMaxNumImageFormats +libva.so.2:vaMaxNumProfiles +libva.so.2:vaProfileStr +libva.so.2:vaPutImage +libva.so.2:vaQueryConfigEntrypoints +libva.so.2:vaQueryConfigProfiles +libva.so.2:vaQueryImageFormats +libva.so.2:vaQuerySurfaceAttributes +libva.so.2:vaQueryVendorString +libva.so.2:vaQueryVideoProcFilterCaps +libva.so.2:vaQueryVideoProcPipelineCaps +libva.so.2:vaReleaseBufferHandle +libva.so.2:vaRenderPicture +libva.so.2:vaSetDriverName +libva.so.2:vaSetErrorCallback +libva.so.2:vaSetInfoCallback +libva.so.2:vaSyncSurface +libva.so.2:vaTerminate +libva.so.2:vaUnmapBuffer libvdpau.so.1:vdp_device_create_x11 libvorbis.so.0:vorbis_analysis libvorbis.so.0:vorbis_analysis_blockout @@ -1180,7 +1153,21 @@ libxvidcore.so.4:xvid_plugin_lumimasking libxvidcore.so.4:xvid_plugin_single libxvidcore.so.4:xvid_plugin_ssim +libz.so.1:compress +libz.so.1:compress2 +libz.so.1:deflate libz.so.1:deflateBound +libz.so.1:deflateEnd +libz.so.1:deflateInit2_ +libz.so.1:deflateInit_ +libz.so.1:deflateReset +libz.so.1:inflate +libz.so.1:inflateEnd +libz.so.1:inflateInit2_ +libz.so.1:inflateInit_ +libz.so.1:inflateReset +libz.so.1:inflateSync +libz.so.1:uncompress libz.so.1:zlibCompileFlags libzimg.so.2:zimg_filter_graph_build libzimg.so.2:zimg_filter_graph_free diff --git a/files/lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch b/files/lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch deleted file mode 100644 --- a/files/lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315 Mon Sep 17 00:00:00 2001 -From: Jun Zhao -Date: Sun, 12 Jul 2020 13:48:48 +0800 -Subject: [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1 - -libsrt changed the: -SRTO_SMOOTHER -> SRTO_CONGESTION -SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION -and removed the front of deprecated options (SRTO_SMOOTHER/SRTO_STRICTENC) -in the header, it's lead to build fail - -fix #8760 - -Signed-off-by: Jun Zhao ---- - libavformat/libsrt.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c -index 4de575b..4719ce0 100644 ---- a/libavformat/libsrt.c -+++ b/libavformat/libsrt.c -@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd) - (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) || - (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) || - #if SRT_VERSION_VALUE >= 0x010302 -+#if SRT_VERSION_VALUE >= 0x010401 -+ (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || -+#else - /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */ - (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || -+#endif - (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) || - (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) || - #endif -@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd) - (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) || - (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) || - (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) || -+#if SRT_VERSION_VALUE >= 0x010401 -+ (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) || -+#else - (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) || -+#endif - (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) || - (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) || - ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) { --- -2.7.4 - diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,3 +1,2 @@ libavfilter-glslang-remove-unused-header.patch configure-Add-additional-glslang-libraries-to-make-linking-work.patch -lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : ffmpeg homepage : https://www.ffmpeg.org/ -version : 4.3.1 -release : 99 +version : 4.3.2 +release : 100 source : - - https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.xz : ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb + - https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.xz : 46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb license : - GPL-3.0-or-later - LGPL-3.0-or-later @@ -16,7 +16,6 @@ - pkgconfig(SPIRV-Tools) - pkgconfig(alsa) - pkgconfig(aom) - - pkgconfig(caca) - pkgconfig(dav1d) - pkgconfig(ffnvcodec) - pkgconfig(gl) @@ -35,6 +34,7 @@ - pkgconfig(openal) - pkgconfig(opus) - pkgconfig(rav1e) + - pkgconfig(rubberband) - pkgconfig(sdl2) - pkgconfig(smbclient) - pkgconfig(soxr) @@ -68,7 +68,6 @@ --enable-libaom \ --enable-libass \ --enable-libbluray \ - --enable-libcaca \ --enable-libcdio \ --enable-libdav1d \ --enable-libdrm \ @@ -81,6 +80,7 @@ --enable-libopus \ --enable-libpulse \ --enable-librav1e \ + --enable-librubberband \ --enable-libsmbclient \ --enable-libsnappy \ --enable-libsoxr \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ ffmpeg https://www.ffmpeg.org/ - Rune Morling - ermo.solus-project.com@spammesenseless.net + Alexander Vorobyev + avorobyev@protonmail.com GPL-3.0-or-later LGPL-3.0-or-later @@ -136,7 +136,7 @@ programming.devel - ffmpeg + ffmpeg /usr/include/libavcodec/ac3_parser.h @@ -285,12 +285,12 @@ - - 2021-02-01 - 4.3.1 + + 2021-02-21 + 4.3.2 Packaging update - Rune Morling - ermo.solus-project.com@spammesenseless.net + Alexander Vorobyev + avorobyev@protonmail.com \ No newline at end of file