From 48cabb59879312c609f771f2262ca9d7a63364cd Mon Sep 17 00:00:00 2001 From: triallax Date: Thu, 20 Apr 2023 20:44:01 +0100 Subject: [PATCH] ffmpeg: update to 4.4.4. --- srcpkgs/ffmpeg/template | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 23a3d5c9967b..df4179d1963a 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,17 +1,17 @@ # 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=4.4.4 +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=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 -hostmakedepends="pkg-config perl yasm" +hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel @@ -39,7 +39,10 @@ desc_option_sofa="Enable support for AES SOFA" desc_option_webp="Enable support for WebP" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc nvdec";; + i686*|x86_64*) + hostmakedepends+=" nasm" + build_options_default+=" vaapi vdpau nvenc nvdec" + ;; ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; esac @@ -71,7 +74,7 @@ post_patch() { do_configure() { # Fix gcc on x86_64-musl only if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then - sed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';" + vsed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';" fi if [ "$CROSS_BUILD" ]; then @@ -127,10 +130,12 @@ do_configure() { $(vopt_if nvenc '--enable-nvenc') \ $(vopt_if nvdec '--enable-nvdec') } + do_build() { make ${makejobs} make doc/ff{mpeg,play}.1 } + do_install() { make DESTDIR=${DESTDIR} install install-man } @@ -141,54 +146,63 @@ libavcodec_package() { vmove "usr/lib/libavcodec.so.*" } } + libavdevice_package() { short_desc="FFmpeg device handling library" pkg_install() { 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() { vmove "usr/lib/libavformat.so.*" } } + libavutil_package() { short_desc="FFmpeg utility library" pkg_install() { vmove "usr/lib/libavutil.so.*" } } + libavfilter_package() { short_desc="FFmpeg audio/video filter library" pkg_install() { vmove "usr/lib/libavfilter.so.*" } } + libpostproc_package() { short_desc="FFmpeg video postprocessing library" pkg_install() { vmove "usr/lib/libpostproc.so.*" } } + libswscale_package() { short_desc="FFmpeg video scaling library" pkg_install() { vmove "usr/lib/libswscale.so.*" } } + libswresample_package() { short_desc="FFmpeg video resampling library" pkg_install() { vmove "usr/lib/libswresample.so.*" } } + ffmpeg-devel_package() { depends=" libavcodec>=${version}_${revision} @@ -201,15 +215,22 @@ ffmpeg-devel_package() { libswresample>=${version}_${revision} libavresample>=${version}_${revision}" short_desc+=" - development files" + + if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + # /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections + nostrip_files="/usr/lib/libavfilter.a" + fi + pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/share/ffmpeg/examples vmove usr/share/man/man3 } } + ffplay_package() { short_desc="Simple video player using FFmpeg and SDL2" pkg_install() {