summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-11-28 14:46:47 +0000
committerDaniel Bermond2020-11-28 14:46:47 +0000
commit9da186636e0ed05d3722d8a77ecff05e23542863 (patch)
tree8dcf6e063deacbb24d8904b95fa9a1493b44989b
parent4d24d3bd6a94492416da207c03825b81d90da8d1 (diff)
downloadaur-9da186636e0ed05d3722d8a77ecff05e23542863.tar.gz
Bring back rockchip-mpp support (upstream repo is now public again)
rockchip-mpp was disabled[1] a while ago because the upstream repository was temporarily set to private[2] (hidden from the public). Now the rockchip-mpp repositry is public[3] again and we can re-enable this feature. References ---------- [1] https://aur.archlinux.org/cgit/aur.git/commit/?h=ffmpeg-full-git&id=40ba9358a0bfbe5d9944072621eb9264e30dcce8 [2] https://github.com/HermanChen/mpp/issues/15#issuecomment-690804709 [3] https://github.com/rockchip-linux/mpp/
-rw-r--r--.SRCINFO5
-rw-r--r--015-ffmpeg-cuda11-fix.patch2
-rw-r--r--PKGBUILD8
3 files changed, 8 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 569fe75535a..ce9caddb4f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
- pkgver = 4.4.r99491.g616eb93a40
+ pkgver = 4.4.r100085.g68adb68e96
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -115,6 +115,7 @@ pkgbase = ffmpeg-full-git
depends = xavs
depends = xavs2
depends = pocketsphinx
+ depends = rockchip-mpp
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -137,7 +138,7 @@ pkgbase = ffmpeg-full-git
source = LICENSE
sha256sums = SKIP
sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50
- sha256sums = b20c6e543148c19f18eec58ea911e4fafa86fdd29bb9c52657a40d3b19a4475f
+ sha256sums = 3899622607498c14c5fa15ecfa34a5b30d7b6221339222b25680f84996e0023f
sha256sums = 05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = 34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1
diff --git a/015-ffmpeg-cuda11-fix.patch b/015-ffmpeg-cuda11-fix.patch
index 46a0fed668c..451c94183df 100644
--- a/015-ffmpeg-cuda11-fix.patch
+++ b/015-ffmpeg-cuda11-fix.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -4329,10 +4329,10 @@ fi
+@@ -4341,10 +4341,10 @@ fi
if enabled cuda_nvcc; then
nvcc_default="nvcc"
diff --git a/PKGBUILD b/PKGBUILD
index a08591c5967..375759e69fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _svt_hevc_ver='ead6fdf7c9ff84511b42fc1658c1654b84d83e4b'
_svt_vp9_ver='7951c3cf6773c5e0ede00e4ce3e3ad2f7e090cfb'
pkgname=ffmpeg-full-git
-pkgver=4.4.r99491.g616eb93a40
+pkgver=4.4.r100085.g68adb68e96
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -28,7 +28,7 @@ depends=(
# AUR:
'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
'libopenmpt-svn' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2'
- 'pocketsphinx'
+ 'pocketsphinx' 'rockchip-mpp'
)
makedepends=(
# official repositories:
@@ -49,7 +49,7 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
'LICENSE')
sha256sums=('SKIP'
'52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50'
- 'b20c6e543148c19f18eec58ea911e4fafa86fdd29bb9c52657a40d3b19a4475f'
+ '3899622607498c14c5fa15ecfa34a5b30d7b6221339222b25680f84996e0023f'
'05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1'
@@ -206,7 +206,7 @@ build() {
--enable-nvdec \
--enable-nvenc \
--enable-omx \
- --disable-rkmpp \
+ --enable-rkmpp \
--enable-v4l2-m2m \
--enable-vaapi \
--enable-vdpau