Updated to version 3.3.1

First commit after package adoption.
This commit is contained in:
Daniel Bermond
2017-05-31 20:31:43 -03:00
parent 899d0b7896
commit 2513526bb2
5 changed files with 274 additions and 268 deletions
+90 -87
View File
@@ -1,123 +1,126 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Wed Dec 7 22:14:50 UTC 2016 # Wed May 31 23:30:50 UTC 2017
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (with all options) pkgdesc = Record, convert and stream audio and video (with all possible libs)
pkgver = 3.2.2 pkgver = 3.3.1
pkgrel = 1 pkgrel = 1
epoch = 1 url = http://www.ffmpeg.org/
url = http://ffmpeg.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = GPL3 license = custom:nonfree and unredistributable
license = custom:UNREDISTRIBUTABLE
makedepends = hardening-wrapper
makedepends = intel-media-sdk
makedepends = libvdpau
makedepends = yasm makedepends = yasm
depends = alsa-lib makedepends = opencl-headers
depends = bzip2 makedepends = blackmagic-decklink-sdk
depends = fontconfig
depends = fribidi
depends = glibc depends = glibc
depends = alsa-lib
depends = jack
depends = libpng
depends = bzip2
depends = frei0r-plugins
depends = libgcrypt
depends = gmp depends = gmp
depends = gnutls depends = gnutls
depends = gsm
depends = jack
depends = lame
depends = libavc1394
depends = libiec61883
depends = libmodplug
depends = libpulse
depends = libraw1394
depends = libsoxr
depends = libssh
depends = libtheora
depends = libva
depends = libvdpau
depends = libwebp
depends = libx11
depends = libxcb
depends = opencore-amr
depends = openjpeg2
depends = opus
depends = schroedinger
depends = sdl2
depends = speex
depends = v4l-utils
depends = xz
depends = zlib
depends = libass.so
depends = libbluray.so
depends = libfreetype.so
depends = libnetcdf.so
depends = libvidstab.so
depends = libvorbisenc.so
depends = libvorbis.so
depends = libvpx.so
depends = libx264.so
depends = libx265.so
depends = libxvidcore.so
depends = celt
depends = chromaprint-fftw
depends = faac
depends = frei0r-plugins
depends = kvazaar
depends = ladspa depends = ladspa
depends = libbs2b depends = libass
depends = libbluray
depends = libcaca depends = libcaca
depends = celt
depends = libcdio-paranoia depends = libcdio-paranoia
depends = libdc1394 depends = libdc1394
depends = libebur128 depends = libavc1394
depends = libfdk-aac depends = libfdk-aac
depends = fontconfig
depends = freetype2
depends = fribidi
depends = libgme depends = libgme
depends = libilbc depends = gsm
depends = libmfx-git depends = libiec61883
depends = libopenmpt depends = libmodplug
depends = libxv depends = lame
depends = java-environment-common depends = opencore-amr
depends = mesa depends = opencv
depends = nut-multimedia-git depends = openjpeg2
depends = ocl-icd depends = opus
depends = openal depends = pulseaudio
depends = opencl-headers
depends = openh264
depends = rubberband depends = rubberband
depends = rtmpdump depends = rtmpdump
depends = shine depends = schroedinger
depends = smbclient depends = smbclient
depends = snappy depends = snappy
depends = libsoxr
depends = speex
depends = libssh
depends = tesseract depends = tesseract
depends = libtheora
depends = twolame depends = twolame
depends = v4l-utils
depends = vid.stab depends = vid.stab
depends = vo-aacenc depends = libvorbis
depends = vo-amrwbenc depends = libvpx
depends = wavpack depends = wavpack
depends = xavs depends = libwebp
depends = zeromq depends = libx264.so
depends = x265
depends = libxcb
depends = xvidcore
depends = zimg depends = zimg
depends = zeromq
depends = zvbi depends = zvbi
optdepends = intel-media-sdk: for Intel QSV encoding/decoding depends = xz
depends = netcdf
depends = openal
depends = opencl-icd-loader
depends = mesa
depends = openssl
depends = sdl2
depends = libx11
depends = zlib
depends = libomxil-bellagio
depends = libva
depends = libdrm
depends = libvdpau
depends = chromaprint-fftw
depends = libbs2b
depends = flite1
depends = libilbc
depends = kvazaar
depends = nut-multimedia-git
depends = openh264
depends = libopenmpt-svn
depends = shine
depends = vo-amrwbenc
depends = xavs
depends = libmfx-git
provides = ffmpeg
provides = ffmpeg-full-nvenc
provides = ffmpeg-nvenc
provides = ffmpeg-libfdk_aac
provides = ffmpeg-decklink
provides = qt-faststart
provides = libavutil.so
provides = libavcodec.so provides = libavcodec.so
provides = libavformat.so
provides = libavdevice.so provides = libavdevice.so
provides = libavfilter.so provides = libavfilter.so
provides = libavformat.so
provides = libavresample.so provides = libavresample.so
provides = libavutil.so
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so provides = libswscale.so
provides = ffmpeg provides = libswresample.so
provides = libpostproc.so
conflicts = ffmpeg conflicts = ffmpeg
conflicts = ffmpeg-full-nvenc
conflicts = ffmpeg-nvenc
conflicts = ffmpeg-libfdk_aac
conflicts = ffmpeg-decklink
conflicts = ffmpeg-git conflicts = ffmpeg-git
conflicts = ffmpeg-full-git conflicts = ffmpeg-full-git
source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz conflicts = ffmpeg-semifull-git
source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz.asc conflicts = ffmpeg-qsv-git
source = UNREDISTRIBUTABLE.txt source = https://ffmpeg.org/releases/ffmpeg-3.3.1.tar.xz
source = chromaprint_1.4_fix.patch source = LICENSE
sha256sums = 3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc sha256sums = b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f
sha256sums = SKIP sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4 depends_x86_64 = cuda
sha256sums = 3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4 optdepends_x86_64 = intel-media-sdk: for Intel QSV support (experimental)
pkgname = ffmpeg-full pkgname = ffmpeg-full
+9
View File
@@ -0,0 +1,9 @@
This software is nonfree and unredistributable.
The end-user must compile this software for himself in order to be allowed to use it.
This software cannot be redistributed.
This software cannot be used commercially.
Due to the libraries used to compile this software, the resulting binaries and libraries are under a complex and restrictive license mix.
+175 -150
View File
@@ -1,160 +1,185 @@
# # Maintainer : Daniel Bermond < yahoo-com: danielbermond >
# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it> # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
#
pkgname=ffmpeg-full pkgname=ffmpeg-full
pkgver=3.2.2 _srcname=ffmpeg
pkgver=3.3.1
pkgrel=1 pkgrel=1
epoch=1 pkgdesc="Record, convert and stream audio and video (with all possible libs)"
pkgdesc='Complete solution to record, convert and stream audio and video (with all options)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://ffmpeg.org/' url="http://www.ffmpeg.org/"
license=('GPL3' 'custom:UNREDISTRIBUTABLE') license=('custom:nonfree and unredistributable')
depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' depends=(
'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse' # official repositories:
'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'glibc' 'alsa-lib' 'jack' 'libpng'
'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
'schroedinger' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' 'libbluray' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394' 'libavc1394'
'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883'
'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libmodplug' 'lame' 'opencore-amr' 'opencv' 'openjpeg2' 'opus' 'pulseaudio'
'libx264.so' 'libx265.so' 'libxvidcore.so' 'rubberband' 'rtmpdump' 'schroedinger' 'smbclient' 'snappy' 'libsoxr' 'speex'
'celt' 'chromaprint-fftw' 'faac' 'frei0r-plugins' 'kvazaar' 'libssh' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'libvorbis'
'ladspa' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdc1394' 'libvpx' 'wavpack' 'libwebp' 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'zimg'
'libebur128' 'libfdk-aac' 'libgme' 'libilbc' 'libmfx-git' 'libopenmpt' 'zeromq' 'zvbi' 'xz' 'netcdf' 'openal' 'opencl-icd-loader' 'mesa' 'openssl'
'libxv' 'java-environment-common' 'mesa' 'nut-multimedia-git' 'ocl-icd' 'sdl2' 'libx11' 'zlib' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
'openal' 'opencl-headers' 'openh264' 'rubberband' 'rtmpdump' 'shine' # AUR:
'smbclient' 'snappy' 'tesseract' 'twolame' 'vid.stab' 'vo-aacenc' 'chromaprint-fftw' 'libbs2b' 'flite1' 'libilbc' 'kvazaar' 'nut-multimedia-git'
'vo-amrwbenc' 'wavpack' 'xavs' 'zeromq' 'zimg' 'zvbi') 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'libmfx-git'
makedepends=('hardening-wrapper' 'intel-media-sdk' 'libvdpau' 'yasm') )
optdepends=('intel-media-sdk: for Intel QSV encoding/decoding') depends_x86_64=('cuda')
conflicts=('ffmpeg' 'ffmpeg-git' 'ffmpeg-full-git') optdepends_x86_64=(
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' # AUR:
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'intel-media-sdk: for Intel QSV support (experimental)'
'libswscale.so' )
'ffmpeg') makedepends=(
source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc} # official repositories:
UNREDISTRIBUTABLE.txt 'yasm' 'opencl-headers'
chromaprint_1.4_fix.patch) # AUR:
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel 'blackmagic-decklink-sdk'
sha256sums=('3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc' )
'SKIP' provides=(
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4' 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
'3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4') 'qt-faststart' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so'
'libavfilter.so' 'libavresample.so' 'libswscale.so' 'libswresample.so'
prepare() { 'libpostproc.so'
cd ${pkgname%-full}-$pkgver )
conflicts=(
patch -p1 -i ../chromaprint_1.4_fix.patch 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
} 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-semifull-git' 'ffmpeg-qsv-git'
)
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
'LICENSE')
sha256sums=('b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
build() { build() {
cd ${pkgname%-full}-$pkgver cd "${_srcname}-${pkgver}"
./configure \ # set x86_64 specific options
--prefix=/usr \ if [ "$CARCH" = "x86_64" ]
--extra-cflags="-I/usr/lib/jvm/$(archlinux-java get)/include \ then
-I/usr/lib/jvm/$(archlinux-java get)/include/linux" \ _cuda="--enable-cuda"
--extra-ldflags="-Wl,-rpath -Wl,/opt/intel/mediasdk/lib64" \ _cuvid="--enable-cuvid"
--disable-debug \ _libnpp="--enable-libnpp"
--disable-static \ _cflags="--extra-cflags=-I/opt/cuda/include"
--disable-stripping \ _ldflags="--extra-ldflags=-L/opt/cuda/lib64 -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64"
--enable-avisynth \
--enable-avresample \ # strictly specifying nvcc path is needed if package is installing
--enable-chromaprint \ # cuda for the first time
--enable-decoder=atrac3 \ sed -i 's/^nvcc_default=.*/nvcc_default=\"\/opt\/cuda\/bin\/nvcc\"/' configure
--enable-decoder=atrac3p \ fi
--enable-frei0r \
--enable-gcrypt \ msg2 "Running ffmpeg configure script. Please wait..."
--enable-gmp \
--enable-gnutls \ ./configure \
--enable-gpl \ --prefix=/usr \
--enable-gray \ $_cflags \
--enable-jni \ "$_ldflags" \
--enable-ladspa \ \
--enable-libass \ --enable-rpath \
--enable-libbluray \ --enable-gpl \
--enable-libbs2b \ --enable-version3 \
--enable-libcaca \ --enable-nonfree \
--enable-libcdio \ --enable-shared \
--enable-libcelt \ --disable-static \
--enable-libdc1394 \ --enable-gray \
--enable-libebur128 \ --enable-avresample \
--enable-libfdk-aac \ \
--enable-libfontconfig \ --enable-avisynth \
--enable-libfreetype \ --enable-bzlib \
--enable-libfribidi \ --enable-chromaprint \
--enable-libgme \ --enable-frei0r \
--enable-libgsm \ --enable-gcrypt \
--enable-libiec61883 \ --enable-gmp \
--enable-libilbc \ --enable-gnutls \
--enable-libkvazaar \ --enable-iconv \
--enable-libmfx \ --enable-ladspa \
--enable-libmodplug \ --enable-libass \
--enable-libmp3lame \ --enable-libbluray \
--enable-libnut \ --enable-libbs2b \
--enable-libopencore-amrnb \ --enable-libcaca \
--enable-libopencore-amrwb \ --enable-libcelt \
--enable-libopencv \ --enable-libcdio \
--enable-libopenh264 \ --enable-libdc1394 \
--enable-libopenjpeg \ --enable-libfdk-aac \
--enable-libopenmpt \ --enable-libflite \
--enable-libopus \ --enable-fontconfig \
--enable-libpulse \ --enable-libfreetype \
--enable-librtmp \ --enable-libfribidi \
--enable-librubberband \ --enable-libgme \
--enable-libschroedinger \ --enable-libgsm \
--enable-libshine \ --enable-libiec61883 \
--enable-libsmbclient \ --enable-libilbc \
--enable-libsnappy \ --enable-libkvazaar \
--enable-libsoxr \ --enable-libmodplug \
--enable-libspeex \ --enable-libmp3lame \
--enable-libssh \ --enable-libnut \
--enable-libtesseract \ --enable-libopencore-amrnb \
--enable-libtheora \ --enable-libopencore-amrwb \
--enable-libtwolame \ --enable-libopencv \
--enable-libv4l2 \ --enable-libopenh264 \
--enable-libvidstab \ --enable-libopenjpeg \
--enable-libvo-amrwbenc \ --enable-libopenmpt \
--enable-libvorbis \ --enable-libopus \
--enable-libvpx \ --enable-libpulse \
--enable-libwavpack \ --enable-librubberband \
--enable-libwebp \ --enable-librtmp \
--enable-libx264 \ --enable-libschroedinger \
--enable-libx265 \ --enable-libshine \
--enable-libxavs \ --enable-libsmbclient \
--enable-libxcb \ --enable-libsnappy \
--enable-libxcb-shape \ --enable-libsoxr \
--enable-libxcb-shm \ --enable-libspeex \
--enable-libxcb-xfixes \ --enable-libssh \
--enable-libxvid \ --enable-libtesseract \
--enable-libzimg \ --enable-libtheora \
--enable-libzmq \ --enable-libtwolame \
--enable-libzvbi \ --enable-libv4l2 \
--enable-netcdf \ --enable-libvidstab \
--enable-nonfree \ --enable-libvo-amrwbenc \
--enable-omx \ --enable-libvorbis \
--enable-openal \ --enable-libvpx \
--enable-opencl \ --enable-libwavpack \
--enable-opengl \ --enable-libwebp \
--enable-openssl \ --enable-libx264 \
--enable-runtime-cpudetect \ --enable-libx265 \
--enable-shared \ --enable-libxavs \
--enable-swresample \ --enable-libxcb \
--enable-vaapi \ --enable-libxcb-shm \
--enable-vdpau \ --enable-libxcb-xfixes \
--enable-version3 --enable-libxcb-shape \
--enable-libxvid \
make --enable-libzimg \
make tools/qt-faststart --enable-libzmq \
make doc/ff{mpeg,play,server}.1 --enable-libzvbi \
--enable-lzma \
--enable-decklink \
--enable-netcdf \
--enable-openal \
--enable-opencl \
--enable-opengl \
--enable-openssl \
--enable-sdl2 \
--enable-xlib \
--enable-zlib \
\
$_cuda \
$_cuvid \
--enable-libmfx \
$_libnpp \
--enable-nvenc \
--enable-omx \
--enable-omx-rpi \
--enable-vaapi \
--enable-vdpau \
--enable-videotoolbox
make
make tools/qt-faststart
} }
package() { package() {
cd ${pkgname%-full}-$pkgver cd "${_srcname}-${pkgver}"
make DESTDIR="$pkgdir/" install
make DESTDIR="${pkgdir}" install install-man
install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/ install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
install -Dm 644 "$srcdir"/UNREDISTRIBUTABLE.txt "${pkgdir}/usr/share/licenses/$pkgname/UNREDISTRIBUTABLE.txt" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
} }
# vim:set ts=2 sw=2 et:
-2
View File
@@ -1,2 +0,0 @@
This package, although built from GPL sources, is linked against non-GPL
libraries and thus cannot be redistributed in binary form.
-29
View File
@@ -1,29 +0,0 @@
From 581f93f37ef2e7a00662828ed0348d1edb9041fe Mon Sep 17 00:00:00 2001
From: "Georgi D. Sotirov" <gdsotirov@dir.bg>
Date: Tue, 6 Dec 2016 21:07:59 +0100
Subject: [PATCH] lavf/chromaprint: Update for version 1.4
Fixes ticket #5997.
---
libavformat/chromaprint.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index 8c9a6c0..4da02be 100644
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext {
int silence_threshold;
int algorithm;
FingerprintFormat fp_format;
+#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0)
+ ChromaprintContext *ctx;
+#else
ChromaprintContext ctx;
+#endif
} ChromaprintMuxContext;
static void cleanup(ChromaprintMuxContext *cpr)
--
2.1.4