From 1b289af13b24d108c3e30cf5f3ac70cda202aaa8 Mon Sep 17 00:00:00 2001 From: Felix Kleinschmidt Date: Thu, 5 Jan 2023 09:25:23 -0300 Subject: [PATCH] update: ffmpeg to 5.1.2 --- common/shlibs | 17 ++++++++--------- srcpkgs/ffmpeg/template | 17 +++++------------ srcpkgs/libavresample | 1 - srcpkgs/moc/template | 2 +- srcpkgs/mpd/template | 2 +- srcpkgs/mpv/template | 2 +- 6 files changed, 16 insertions(+), 25 deletions(-) delete mode 120000 srcpkgs/libavresample diff --git a/common/shlibs b/common/shlibs index 52a6d3e6d5fb..016ddc5bfd5b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -391,15 +391,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1 libgif.so.7 giflib-5.1.0_1 libImlib2.so.1 imlib2-1.4.2_1 libmp3lame.so.0 lame-3.98.2_1 -libavdevice.so.58 libavdevice-4.0_1 -libavformat.so.58 libavformat-4.0_1 -libswscale.so.5 libswscale-4.0_1 -libswresample.so.3 libswresample-4.0_1 -libavresample.so.4 libavresample-4.0_1 -libpostproc.so.55 libpostproc-4.0_1 -libavcodec.so.58 libavcodec-4.0_1 -libavutil.so.56 libavutil-4.0_1 -libavfilter.so.7 libavfilter-4.0_1 +libavdevice.so.59 libavdevice-5.1.2_1 +libavformat.so.59 libavformat-5.1.2_1 +libswscale.so.6 libswscale-5.1.2_1 +libswresample.so.4 libswresample-5.1.2_1 +libpostproc.so.56 libpostproc-5.1.2_1 +libavcodec.so.59 libavcodec-5.1.2_1 +libavutil.so.57 libavutil-5.1.2_1 +libavfilter.so.8 libavfilter-5.1.2_1 libSDL-1.2.so.0 SDL-1.2.14_1 libSDL_image-1.2.so.0 SDL_image-1.2.10_1 libx264.so.157 x264-20190507.2245_1 diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 23a3d5c9967b..8a2653d7953a 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,15 +1,15 @@ # Template file for 'ffmpeg' # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg -version=4.4.3 -revision=2 +version=5.1.2 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz" -checksum=6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e +checksum=619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -114,7 +114,7 @@ do_configure() { $(vopt_enable x265 libx265) \ $(vopt_enable v4l2 libv4l2) \ $(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \ - --enable-libbs2b --enable-avresample --enable-libvidstab \ + --enable-libbs2b --enable-libvidstab \ $(vopt_enable dav1d libdav1d) \ $(vopt_enable zimg libzimg) \ $(vopt_enable webp libwebp) \ @@ -147,12 +147,6 @@ libavdevice_package() { vmove "usr/lib/libavdevice.so.*" } } -libavresample_package() { - short_desc="FFmpeg audio resampling library" - pkg_install() { - vmove "usr/lib/libavresample.so.*" - } -} libavformat_package() { short_desc="FFmpeg file format library" pkg_install() { @@ -198,8 +192,7 @@ ffmpeg-devel_package() { libavfilter>=${version}_${revision} libpostproc>=${version}_${revision} libswscale>=${version}_${revision} - libswresample>=${version}_${revision} - libavresample>=${version}_${revision}" + libswresample>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample deleted file mode 120000 index a9f1eea092d5..000000000000 --- a/srcpkgs/libavresample +++ /dev/null @@ -1 +0,0 @@ -ffmpeg \ No newline at end of file diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template index c42be650a1d2..4b95426599bf 100644 --- a/srcpkgs/moc/template +++ b/srcpkgs/moc/template @@ -1,7 +1,7 @@ # Template file for 'moc' pkgname=moc version=2.5.2 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index a20516becd04..63543c230c3d 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.23.11 -revision=1 +revision=2 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5dcef38aa241..74e94bc4451e 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.35.0 -revision=2 +revision=3 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled