From 9bf065ea78812d4e2975ef64dcbe7f309b2e872c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 3 Feb 2020 18:08:30 +0100 Subject: ffmpeg-rpi: try to use upstream version instead of LibreELEC one --- ffmpeg-rpi/APKBUILD | 59 +++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 36 deletions(-) (limited to 'ffmpeg-rpi/APKBUILD') diff --git a/ffmpeg-rpi/APKBUILD b/ffmpeg-rpi/APKBUILD index 1cdc921..ff65c73 100644 --- a/ffmpeg-rpi/APKBUILD +++ b/ffmpeg-rpi/APKBUILD @@ -1,17 +1,13 @@ -# Contributor: Sergei Lukin -# Contributor: Łukasz Jendrysik -# Contributor: Jakub Skrzypnik -# Maintainer: Natanael Copa +# Maintainer: Karel Kočí pkgname=ffmpeg-rpi -pkgver="4.0.4" +pkgver=4.2.2 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix - Raspberry Pi" url="https://ffmpeg.org/" -arch="aarch64" +arch="armhf aarch64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" -options="!check" # tests/data/hls-lists.append.m3u8 fails +options="!check" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -provides="ffmpeg" makedepends=" alsa-lib-dev coreutils @@ -25,35 +21,29 @@ makedepends=" libvorbis-dev libvpx-dev libxfixes-dev + opus-dev perl-dev + raspberrypi-dev sdl2-dev - v4l-utils-dev x264-dev x265-dev xvidcore-dev yasm zlib-dev - raspberrypi-dev " -srcver="4.0.4-Leia-18.4" -source="https://github.com/xbmc/FFmpeg/archive/$srcver.tar.gz - ffmpeg-99.1001-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch - ffmpeg-99.1002-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - ffmpeg-99.1003-pfcd_hevc_optimisations.patch - ffmpeg-99.1004-added_upstream_mvc_patches.patch - ffmpeg-99.1008-dav1d-enable-av1.patch - ffmpeg-99.1009-dav1d-fix-multithreaded-av1-sw-decoding.patch - ffmpeg-99.1010-yuv2rgb-logspam.patch -" +checkdepends="rsync" +source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz + 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch + " # add support for AV1 codec for all archies except armhf and armv7 # as aom is not available on them _aom=""; -unpack() { - default_unpack - mv "FFmpeg-$srcver" "$builddir" -} +case "$CARCH" in + aarch64) + _aom="--enable-libaom"; makedepends="$makedepends aom-dev" ;; +esac build() { local _dbg="--disable-debug" @@ -61,6 +51,7 @@ build() { ./configure \ --prefix=/usr \ + --enable-avresample \ --enable-avfilter \ --enable-gnutls \ --enable-gpl \ @@ -72,7 +63,6 @@ build() { --enable-libx264 \ --enable-libx265 \ --enable-libtheora \ - --enable-libv4l2 \ --enable-postproc \ --enable-pic \ --enable-pthreads \ @@ -85,11 +75,14 @@ build() { --disable-vaapi \ --disable-vdpau \ --disable-libopus \ - --enable-rpi \ - --extra-cflags="-I/opt/vc/include -Wno-error" \ + --disable-v4l2_m2m \ + --enable-omx \ + --enable-omx-rpi \ + --enable-mmal \ + --extra-cflags="-I/opt/vc/include -I/opt/vc/include/IL" \ --extra-ldflags="-L/opt/vc/lib" \ --extra-libs="-lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm" \ - $_dbg + $_aom $_dbg make ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c make doc/ffmpeg.1 doc/ffplay.1 @@ -107,11 +100,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078 4.0.4-Leia-18.4.tar.gz -b0d3441b8dcb457254dcb965fbfedcb5bd2bc3bb9b6ae18aacba12d314e01d39a42bc25a4d927413e2783dd9e900a00801a9de254e9fbceb5e6e8b5532fdf31e ffmpeg-99.1001-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch -4ff179c139ec878a9022ebfba69a515bff4c6f8dcfbe1c9b65e7be818a4a4a087589cc33e9164030cff71dda81ce3751038b90f778feba4b7817c5f8341641dd ffmpeg-99.1002-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -9c946a401283b7d2b4e4a9691c25a52ca988fba75414f8453a38998747496377f0556994564388ad18453282b003c70bbd11433bf79d65cd12197a213028848e ffmpeg-99.1003-pfcd_hevc_optimisations.patch -5a34fe204e7e488db6b6abca01518a946739c1a57e67e8e56c8fa3c78395f04447780773f7b7f5713a009945b34c6993ac5231073961ae514223c1f351919764 ffmpeg-99.1004-added_upstream_mvc_patches.patch -eb7e71371f395a37c179876f500857132f8b4e5dc3bc8641cbfbd897302808fc31c4fec329fcb1974aba19a5f64fcbf23d6f6a21b9e6fdac5beb94e6aab31c8d ffmpeg-99.1008-dav1d-enable-av1.patch -36c8814d90cff693dbe6a7c6eb50682a0edceef6dfa435e4ef24f42c7d478693bdae9294178ab3e91b7eb2365bed6ef3580d3eec229392d27c83c610eebb3362 ffmpeg-99.1009-dav1d-fix-multithreaded-av1-sw-decoding.patch -19b4d4bbdaa0ed64f37eae87d9b68e593e645569df11692fbbb3d3d2d53f627d3820a28a643e36216ea5780f8c5c18ed24cc66ef6ef1b898716fe57750decfbd ffmpeg-99.1010-yuv2rgb-logspam.patch" +sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz +1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" -- cgit v1.2.3