Rebuild ffmpeg and vlc against x264 157

This commit is contained in:
Martchus 2019-03-28 00:36:19 +01:00
parent 209ece345f
commit a11538e091
3 changed files with 93 additions and 52 deletions

View File

@ -8,94 +8,122 @@
# Contributor: Paul Mattal <paul@archlinux.org>
# If you don't want CUDA/CUVID support, you can remove
# depends_x86_64=('cuda') line and
# depends_x86_64=('cuda') line and
# $_cuda \, $_cuvid \, $_libnpp \ lines from PKGBUILD
#
# Replace "--disable-libsrt" with "--enable-libsrt"
# and add 'srt' to depends array if you need the support
# for Haivision Open SRT (Secure Reliable Transport).
# Enabling it is known to cause segfaults with OBS,
# that's why it's disabled by default.
#
# Add "--enable-decklink \" to configure flags
# if you have decklink-sdk installed
#
# Add "--enable-libndi_newtek \" to configure flags
# if you have ndi-sdk installed
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=4.0
pkgrel=1
pkgver=4.1.2
pkgrel=2
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
arch=('i686' 'x86_64')
url='http://ffmpeg.org/'
license=('GPL' 'custom:UNREDISTRIBUTABLE')
depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint-fftw' 'fontconfig' 'frei0r-plugins'
'fribidi' 'glibc' 'gnutls' 'gsm' 'jack' 'kvazaar' 'ladspa' 'lame' 'libass.so'
'libavc1394' 'libbluray.so' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdc1394'
'libfdk-aac' 'libgme' 'libiec61883' 'libilbc' 'libmodplug' 'libomxil-bellagio'
'libpulse' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
'libxv' 'mesa' 'netcdf' 'nut-multimedia-git' 'openal' 'opencore-amr'
'opencv' 'opencl-driver' 'opencl-icd-loader' 'openh264'
'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump' 'schroedinger'
'sdl2' 'smbclient' 'speex' 'shine' 'tesseract' 'twolame' 'v4l-utils'
'libvidstab.so' 'vo-amrwbenc' 'libxcb' 'libxml2' 'libxvidcore.so' 'xz' 'wavpack' 'zeromq' 'zimg'
'zlib' 'zvbi' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
'libx265.so' 'snappy' 'sndio' 'xavs' 'libfreetype.so')
url="http://ffmpeg.org/"
license=('custom: nonfree and unredistributable')
depends=('alsa-lib' 'aom' 'bzip2' 'celt' 'chromaprint-fftw' 'codec2' 'davs2' 'fontconfig'
'ffnvcodec-headers' 'frei0r-plugins' 'fribidi' 'glibc' 'gsm' 'jack' 'kvazaar'
'ladspa' 'lame' 'lensfun' 'libass' 'libavc1394' 'libbluray' 'libbs2b' 'libcaca'
'libcdio-paranoia' 'libdc1394' 'libfdk-aac' 'libgme' 'libiec61883'
'libilbc' 'libmodplug' 'libomxil-bellagio' 'libmysofa' 'libpulse'
'librsvg' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libxcb'
'libxext' 'libwebp' 'libxml2' 'libxv' 'lilv' 'libgl' 'lv2' 'ndi-sdk' 'openal'
'opencore-amr' 'opencl-driver' 'opencl-icd-loader' 'openh264'
'openjpeg2' 'libklvanc-git' 'libopenmpt-svn' 'opus' 'rockchip-mpp' 'rubberband'
'rtmpdump' 'sdl2' 'speex' 'shine' 'tensorflow' 'tesseract'
'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vo-amrwbenc' 'xavs2-git'
'xvidcore' 'xz' 'wavpack' 'zeromq' 'zimg' 'zlib' 'zvbi' 'libvorbisenc.so'
'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so' 'snappy' 'sndio' 'xavs')
depends_x86_64=('cuda')
makedepends=('flite' 'libmfx' 'libvdpau' 'yasm' 'opencl-headers')
makedepends=('flite' 'ffnvcodec-headers' 'libmfx' 'libvdpau' 'nasm' 'opencl-headers')
makedepends_x86_64=('vmaf')
optdepends=('avxsynth-git: for Avisynth support'
'blackmagic-decklink-sdk: for Blackmagic DeckLink support; need to add --enable-decklink option in this PKGBUILD')
optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)')
conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra')
conflicts=('ffmpeg')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so' 'ffmpeg' 'qt-faststart')
'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so' 'ffmpeg')
source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc}
'UNREDISTRIBUTABLE.txt')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
sha256sums=('ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f'
sha256sums=('b95f0ae44798ab1434155ac7f81f30a7e9760a02282e4b5898372c22a335347b'
'SKIP'
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
build() {
cd $_pkgbasename-$pkgver
cd "$_pkgbasename-$pkgver"
# Add x86_64 (opt)depends to the build
if [ "$CARCH" = "x86_64" ]
then
_cuda="--enable-cuda"
_cuvid="--enable-cuvid"
_libnpp="--enable-libnpp"
_cflags="--extra-cflags=-I/opt/cuda/include"
_ldflags="--extra-ldflags=-L/opt/cuda/lib64 -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64"
local _libvmaf='--enable-libvmaf'
local _cudasdk='--enable-cuda-sdk'
local _libmfx='--enable-libmfx'
local _libnpp='--enable-libnpp'
local _cflags='-I/opt/cuda/include'
# '-L/usr/lib/nvidia' (for cuda_sdk) needs to be enabled only on
# systems with nvidia-340xx-utils or nvidia-304xx-utils
if pacman -Qqs '^nvidia-340xx-utils$' | grep -q '^nvidia-340xx-utils$' ||
pacman -Qqs '^nvidia-304xx-utils$' | grep -q '^nvidia-304xx-utils$'
then
local _nvidia_340xx_ldflags='-L/usr/lib/nvidia'
fi
local _ldflags="-L/opt/cuda/lib64 ${_nvidia_340xx_ldflags}"
local _ldflags="${_ldflags} -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64:/opt/intel/mediasdk/plugins"
# strictly specifying nvcc path is needed if package is installing
# cuda for the first time (nvcc path will be in $PATH only after relogin)
sed -i "s@^nvcc_default=.*@nvcc_default='/opt/cuda/bin/nvcc'@" configure
fi
msg "Starting configure..."
## Add "--enable-decklink \"
## Add "--enable-decklink \"
## if you have decklink-sdk installed
./configure \
--prefix=/usr \
$_cflags \
"$_ldflags" \
--extra-cflags="${_cflags}" \
--extra-ldflags="${_ldflags}" \
\
--toolchain=hardened \
\
--enable-rpath \
--disable-rpath \
--enable-gpl \
--enable-version3 \
--enable-nonfree \
--disable-static \
--disable-stripping \
--enable-shared \
--enable-avresample \
--enable-swresample \
\
\
$_cuda \
$_cudasdk \
$_cuvid \
$_libnpp \
$_libmfx \
\
--enable-ffnvcodec \
--enable-libdrm \
--enable-libmfx \
--enable-nvdec \
--enable-nvenc \
--enable-nvdec \
--enable-omx \
--enable-omx-rpi \
\
\
--enable-alsa \
--enable-avisynth \
--enable-chromaprint \
--enable-decoder=atrac3 \
@ -103,17 +131,20 @@ build() {
--enable-bzlib \
--enable-fontconfig \
--enable-frei0r \
--enable-gnutls \
--enable-gpl \
--enable-gray \
--enable-iconv \
--enable-ladspa \
--enable-libaom \
--enable-libass \
--enable-libcodec2 \
--enable-libbluray \
--enable-libbs2b \
--enable-libcaca \
--enable-libcdio \
--enable-libcelt \
--enable-libcodec2 \
--enable-libdavs2 \
--enable-libdc1394 \
--enable-libfdk-aac \
--enable-libfreetype \
@ -122,32 +153,38 @@ build() {
--enable-libgsm \
--enable-libiec61883 \
--enable-libilbc \
--enable-libjack \
--enable-libklvanc \
--enable-libkvazaar \
--enable-liblensfun \
--enable-libmodplug \
--enable-libmp3lame \
--enable-libnut \
--enable-libmysofa \
--enable-libndi_newtek \
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
--enable-libopencv \
--disable-libopencv \
--enable-libopenh264 \
--enable-libopenjpeg \
--enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
--enable-librsvg \
--enable-librubberband \
--enable-librtmp \
--enable-libschroedinger \
--enable-libshine \
--enable-libsmbclient \
--enable-libsnappy \
--enable-libsoxr \
--enable-libspeex \
--disable-libsrt \
--enable-libssh \
--enable-libtensorflow \
--enable-libtesseract \
--enable-libtheora \
--enable-libtwolame \
--enable-libv4l2 \
--enable-libvidstab \
--disable-libvmaf \
--enable-libvo-amrwbenc \
--enable-libvorbis \
--enable-libvpx \
@ -156,29 +193,33 @@ build() {
--enable-libx264 \
--enable-libx265 \
--enable-libxavs \
--enable-libxavs2 \
--enable-libxcb \
--enable-libxcb-shm \
--enable-libxcb-xfixes \
--enable-libxcb-shape \
--enable-libxml2 \
--enable-libxvid \
--enable-libxml2 \
--enable-libzimg \
--enable-libzmq \
--enable-libzvbi \
--enable-lv2 \
--enable-lzma \
--enable-netcdf \
--enable-openal \
--enable-opencl \
--enable-opengl \
--enable-openssl \
--enable-rkmpp \
--enable-sndio \
--enable-sdl2 \
--enable-vapoursynth \
--enable-v4l2-m2m \
--enable-vaapi \
--enable-vdpau \
--enable-videotoolbox \
--enable-xlib \
--enable-zlib
msg "Starting make"
make
make tools/qt-faststart
@ -186,8 +227,8 @@ build() {
}
package() {
cd $_pkgbasename-$pkgver
cd "$_pkgbasename-$pkgver"
make DESTDIR="$pkgdir" install install-man
install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/
install -Dm 644 "$srcdir"/UNREDISTRIBUTABLE.txt "$pkgdir/usr/share/licenses/$pkgname/UNREDISTRIBUTABLE.txt"
install -Dm 755 tools/qt-faststart "${pkgdir}/usr/bin"
install -Dm 644 "$srcdir"/UNREDISTRIBUTABLE.txt "$pkgdir/usr/share/licenses/${pkgname}"
}

View File

@ -10,7 +10,7 @@
_name=ffmpeg
pkgname=ffmpeg-libfdk_aac
pkgver=4.1.2
pkgrel=1
pkgrel=2
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
arch=('x86_64')

View File

@ -5,10 +5,10 @@
_appname_=vlc
pkgname=${_appname_}-nightly
pkgver=4.0.0v20190324
pkgver=4.0.0v20190327
_pkgver=4.0.0
_snapshot_=20190324
_snapver_=0231
_snapshot_=20190327
_snapver_=0230
_suffix_=dev
_nightly_=${_snapshot_}-${_snapver_}
pkgrel=1
@ -263,7 +263,7 @@ package() {
# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
}
sha256sums=('9f465ae1c61f5cae057d3c103d64e79d953e1018ba3ebe8a8f805facd18c051b'
sha256sums=('08a8962362d619c507f94b08a7e347e29a7c117b835c129c65f6239cf9b5c1de'
'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
'3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf'
'90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')