Update ffmpeg to 4.0
This commit is contained in:
parent
f4c951e0a1
commit
f43e443da8
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
pkgname=ffmpeg-full-nvenc
|
||||
_pkgbasename=ffmpeg
|
||||
pkgver=3.4.2
|
||||
pkgver=4.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
|
||||
|
|
@ -46,21 +46,11 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
|
|||
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
|
||||
'libswscale.so' 'ffmpeg' 'qt-faststart')
|
||||
source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc}
|
||||
'UNREDISTRIBUTABLE.txt'
|
||||
'fs56089.patch')
|
||||
'UNREDISTRIBUTABLE.txt')
|
||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
||||
sha256sums=('2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740'
|
||||
sha256sums=('ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f'
|
||||
'SKIP'
|
||||
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
|
||||
'0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427')
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg-${pkgver}
|
||||
|
||||
# https://bugs.archlinux.org/task/56089
|
||||
# Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
|
||||
patch -Np1 -i ../fs56089.patch
|
||||
}
|
||||
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
|
||||
|
||||
build() {
|
||||
cd $_pkgbasename-$pkgver
|
||||
|
|
@ -191,7 +181,7 @@ build() {
|
|||
msg "Starting make"
|
||||
make
|
||||
make tools/qt-faststart
|
||||
make doc/ff{mpeg,play,server}.1
|
||||
make doc/ff{mpeg,play}.1
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
|
|||
|
|
@ -23,18 +23,8 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
|
|||
'libswscale.so'
|
||||
"ffmpeg=$pkgver")
|
||||
conflicts=("$_name")
|
||||
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git'
|
||||
'fs56089.patch')
|
||||
sha256sums=('SKIP'
|
||||
'0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427')
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg-${pkgver}
|
||||
|
||||
# https://bugs.archlinux.org/task/56089
|
||||
# Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
|
||||
patch -Np1 -i ../fs56089.patch
|
||||
}
|
||||
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
|
||||
sha256sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd "$srcdir/$pkgname"
|
||||
|
|
@ -90,7 +80,7 @@ build() {
|
|||
|
||||
make
|
||||
make tools/qt-faststart
|
||||
make doc/ff{mpeg,play,server}.1
|
||||
make doc/ff{mpeg,play}.1
|
||||
|
||||
cp /usr/share/licenses/libfdk-aac/NOTICE .
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
_name=ffmpeg
|
||||
pkgname=ffmpeg-libfdk_aac
|
||||
pkgver=3.4.2
|
||||
pkgrel=2
|
||||
pkgver=4.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
|
||||
arch=('i686' 'x86_64')
|
||||
|
|
@ -32,20 +32,10 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
|
|||
'libswscale.so'
|
||||
"ffmpeg=$pkgver")
|
||||
conflicts=("$_name")
|
||||
source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc}
|
||||
'fs56089.patch')
|
||||
source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc})
|
||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
|
||||
sha256sums=('2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740'
|
||||
'SKIP'
|
||||
'0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427')
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg-${pkgver}
|
||||
|
||||
# https://bugs.archlinux.org/task/56089
|
||||
# Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
|
||||
patch -Np1 -i ../fs56089.patch
|
||||
}
|
||||
sha256sums=('ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
cd $_name-$pkgver
|
||||
|
|
@ -95,7 +85,7 @@ build() {
|
|||
|
||||
make
|
||||
make tools/qt-faststart
|
||||
make doc/ff{mpeg,play,server}.1
|
||||
make doc/ff{mpeg,play}.1
|
||||
|
||||
cp /usr/share/licenses/libfdk-aac/NOTICE .
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
_name=ffmpeg
|
||||
pkgname=mingw-w64-ffmpeg
|
||||
pkgver=3.4.2
|
||||
pkgver=4.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc='Complete solution to record, convert and stream audio and video (mingw-w64)'
|
||||
|
|
@ -21,22 +21,12 @@ depends=('mingw-w64-crt' 'mingw-w64-bzip2' 'mingw-w64-fontconfig' 'mingw-w64-fri
|
|||
'mingw-w64-zlib' 'mingw-w64-x265')
|
||||
options=(!strip !buildflags staticlibs)
|
||||
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'yasm')
|
||||
source=(https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz{,.asc}
|
||||
'fs56089.patch')
|
||||
source=(https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz{,.asc})
|
||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
|
||||
sha256sums=('2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740'
|
||||
'SKIP'
|
||||
'0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427')
|
||||
sha256sums=('ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f'
|
||||
'SKIP')
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg-${pkgver}
|
||||
|
||||
# https://bugs.archlinux.org/task/56089
|
||||
# Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
|
||||
patch -Np1 -i ../fs56089.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
for _arch in ${_architectures}; do
|
||||
mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch}
|
||||
|
|
|
|||
Loading…
Reference in New Issue