summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO169
-rw-r--r--LICENSE9
-rw-r--r--PKGBUILD325
-rw-r--r--UNREDISTRIBUTABLE.txt2
-rw-r--r--chromaprint_1.4_fix.patch29
5 files changed, 270 insertions, 264 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e202beb6c93..fd1d49da8e9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,123 +1,126 @@
# Generated by mksrcinfo v8
-# Wed Dec 7 22:14:50 UTC 2016
+# Wed May 31 23:30:50 UTC 2017
pkgbase = ffmpeg-full
- pkgdesc = Complete solution to record, convert and stream audio and video (with all options)
- pkgver = 3.2.2
+ pkgdesc = Record, convert and stream audio and video (with all possible libs)
+ pkgver = 3.3.1
pkgrel = 1
- epoch = 1
- url = http://ffmpeg.org/
+ url = http://www.ffmpeg.org/
arch = i686
arch = x86_64
- license = GPL3
- license = custom:UNREDISTRIBUTABLE
- makedepends = hardening-wrapper
- makedepends = intel-media-sdk
- makedepends = libvdpau
+ license = custom:nonfree and unredistributable
makedepends = yasm
+ makedepends = opencl-headers
+ makedepends = blackmagic-decklink-sdk
+ depends = glibc
depends = alsa-lib
+ depends = jack
+ depends = libpng
depends = bzip2
- depends = fontconfig
- depends = fribidi
- depends = glibc
+ depends = frei0r-plugins
+ depends = libgcrypt
depends = gmp
depends = gnutls
- depends = gsm
- depends = jack
- depends = lame
+ depends = ladspa
+ depends = libass
+ depends = libbluray
+ depends = libcaca
+ depends = celt
+ depends = libcdio-paranoia
+ depends = libdc1394
depends = libavc1394
+ depends = libfdk-aac
+ depends = fontconfig
+ depends = freetype2
+ depends = fribidi
+ depends = libgme
+ depends = gsm
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 = lame
depends = opencore-amr
+ depends = opencv
depends = openjpeg2
depends = opus
+ depends = pulseaudio
+ depends = rubberband
+ depends = rtmpdump
depends = schroedinger
- depends = sdl2
+ depends = smbclient
+ depends = snappy
+ depends = libsoxr
depends = speex
+ depends = libssh
+ depends = tesseract
+ depends = libtheora
+ depends = twolame
depends = v4l-utils
+ depends = vid.stab
+ depends = libvorbis
+ depends = libvpx
+ depends = wavpack
+ depends = libwebp
+ depends = libx264.so
+ depends = x265
+ depends = libxcb
+ depends = xvidcore
+ depends = zimg
+ depends = zeromq
+ depends = zvbi
depends = xz
+ depends = netcdf
+ depends = openal
+ depends = opencl-icd-loader
+ depends = mesa
+ depends = openssl
+ depends = sdl2
+ depends = libx11
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 = libomxil-bellagio
+ depends = libva
+ depends = libdrm
+ depends = libvdpau
depends = chromaprint-fftw
- depends = faac
- depends = frei0r-plugins
- depends = kvazaar
- depends = ladspa
depends = libbs2b
- depends = libcaca
- depends = libcdio-paranoia
- depends = libdc1394
- depends = libebur128
- depends = libfdk-aac
- depends = libgme
+ depends = flite1
depends = libilbc
- depends = libmfx-git
- depends = libopenmpt
- depends = libxv
- depends = java-environment-common
- depends = mesa
+ depends = kvazaar
depends = nut-multimedia-git
- depends = ocl-icd
- depends = openal
- depends = opencl-headers
depends = openh264
- depends = rubberband
- depends = rtmpdump
+ depends = libopenmpt-svn
depends = shine
- depends = smbclient
- depends = snappy
- depends = tesseract
- depends = twolame
- depends = vid.stab
- depends = vo-aacenc
depends = vo-amrwbenc
- depends = wavpack
depends = xavs
- depends = zeromq
- depends = zimg
- depends = zvbi
- optdepends = intel-media-sdk: for Intel QSV encoding/decoding
+ 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 = libavformat.so
provides = libavdevice.so
provides = libavfilter.so
- provides = libavformat.so
provides = libavresample.so
- provides = libavutil.so
- provides = libpostproc.so
- provides = libswresample.so
provides = libswscale.so
- provides = ffmpeg
+ provides = libswresample.so
+ provides = libpostproc.so
conflicts = ffmpeg
+ conflicts = ffmpeg-full-nvenc
+ conflicts = ffmpeg-nvenc
+ conflicts = ffmpeg-libfdk_aac
+ conflicts = ffmpeg-decklink
conflicts = ffmpeg-git
conflicts = ffmpeg-full-git
- source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz
- source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz.asc
- source = UNREDISTRIBUTABLE.txt
- source = chromaprint_1.4_fix.patch
- sha256sums = 3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
- sha256sums = SKIP
- sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
- sha256sums = 3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4
+ conflicts = ffmpeg-semifull-git
+ conflicts = ffmpeg-qsv-git
+ source = https://ffmpeg.org/releases/ffmpeg-3.3.1.tar.xz
+ source = LICENSE
+ sha256sums = b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f
+ sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
+ depends_x86_64 = cuda
+ optdepends_x86_64 = intel-media-sdk: for Intel QSV support (experimental)
pkgname = ffmpeg-full
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..b0bb658ca78c
--- /dev/null
+++ b/LICENSE
@@ -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.
diff --git a/PKGBUILD b/PKGBUILD
index c2715deed6e6..1916847b5981 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,160 +1,185 @@
-#
-# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it>
-#
+# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=ffmpeg-full
-pkgver=3.2.2
+_srcname=ffmpeg
+pkgver=3.3.1
pkgrel=1
-epoch=1
-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)"
arch=('i686' 'x86_64')
-url='http://ffmpeg.org/'
-license=('GPL3' 'custom:UNREDISTRIBUTABLE')
-depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
- 'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse'
- 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau'
- 'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus'
- 'schroedinger' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
- 'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so'
- 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
- 'libx264.so' 'libx265.so' 'libxvidcore.so'
- 'celt' 'chromaprint-fftw' 'faac' 'frei0r-plugins' 'kvazaar'
- 'ladspa' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdc1394'
- 'libebur128' 'libfdk-aac' 'libgme' 'libilbc' 'libmfx-git' 'libopenmpt'
- 'libxv' 'java-environment-common' 'mesa' 'nut-multimedia-git' 'ocl-icd'
- 'openal' 'opencl-headers' 'openh264' 'rubberband' 'rtmpdump' 'shine'
- 'smbclient' 'snappy' 'tesseract' 'twolame' 'vid.stab' 'vo-aacenc'
- 'vo-amrwbenc' 'wavpack' 'xavs' 'zeromq' 'zimg' 'zvbi')
-makedepends=('hardening-wrapper' 'intel-media-sdk' 'libvdpau' 'yasm')
-optdepends=('intel-media-sdk: for Intel QSV encoding/decoding')
-conflicts=('ffmpeg' 'ffmpeg-git' 'ffmpeg-full-git')
-provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
- 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
- 'libswscale.so'
- 'ffmpeg')
-source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc}
- UNREDISTRIBUTABLE.txt
- chromaprint_1.4_fix.patch)
-validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-sha256sums=('3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc'
- 'SKIP'
- 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
- '3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4')
-
-prepare() {
- cd ${pkgname%-full}-$pkgver
-
- patch -p1 -i ../chromaprint_1.4_fix.patch
-}
+url="http://www.ffmpeg.org/"
+license=('custom:nonfree and unredistributable')
+depends=(
+ # official repositories:
+ 'glibc' 'alsa-lib' 'jack' 'libpng'
+ 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
+ 'libbluray' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394' 'libavc1394'
+ 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883'
+ 'libmodplug' 'lame' 'opencore-amr' 'opencv' 'openjpeg2' 'opus' 'pulseaudio'
+ 'rubberband' 'rtmpdump' 'schroedinger' 'smbclient' 'snappy' 'libsoxr' 'speex'
+ 'libssh' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'libvorbis'
+ 'libvpx' 'wavpack' 'libwebp' 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'zimg'
+ 'zeromq' 'zvbi' 'xz' 'netcdf' 'openal' 'opencl-icd-loader' 'mesa' 'openssl'
+ 'sdl2' 'libx11' 'zlib' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
+ # AUR:
+ 'chromaprint-fftw' 'libbs2b' 'flite1' 'libilbc' 'kvazaar' 'nut-multimedia-git'
+ 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'libmfx-git'
+)
+depends_x86_64=('cuda')
+optdepends_x86_64=(
+ # AUR:
+ 'intel-media-sdk: for Intel QSV support (experimental)'
+)
+makedepends=(
+ # official repositories:
+ 'yasm' 'opencl-headers'
+ # AUR:
+ 'blackmagic-decklink-sdk'
+)
+provides=(
+ 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
+ 'qt-faststart' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so'
+ 'libavfilter.so' 'libavresample.so' 'libswscale.so' 'libswresample.so'
+ 'libpostproc.so'
+)
+conflicts=(
+ '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() {
- cd ${pkgname%-full}-$pkgver
-
- ./configure \
- --prefix=/usr \
- --extra-cflags="-I/usr/lib/jvm/$(archlinux-java get)/include \
- -I/usr/lib/jvm/$(archlinux-java get)/include/linux" \
- --extra-ldflags="-Wl,-rpath -Wl,/opt/intel/mediasdk/lib64" \
- --disable-debug \
- --disable-static \
- --disable-stripping \
- --enable-avisynth \
- --enable-avresample \
- --enable-chromaprint \
- --enable-decoder=atrac3 \
- --enable-decoder=atrac3p \
- --enable-frei0r \
- --enable-gcrypt \
- --enable-gmp \
- --enable-gnutls \
- --enable-gpl \
- --enable-gray \
- --enable-jni \
- --enable-ladspa \
- --enable-libass \
- --enable-libbluray \
- --enable-libbs2b \
- --enable-libcaca \
- --enable-libcdio \
- --enable-libcelt \
- --enable-libdc1394 \
- --enable-libebur128 \
- --enable-libfdk-aac \
- --enable-libfontconfig \
- --enable-libfreetype \
- --enable-libfribidi \
- --enable-libgme \
- --enable-libgsm \
- --enable-libiec61883 \
- --enable-libilbc \
- --enable-libkvazaar \
- --enable-libmfx \
- --enable-libmodplug \
- --enable-libmp3lame \
- --enable-libnut \
- --enable-libopencore-amrnb \
- --enable-libopencore-amrwb \
- --enable-libopencv \
- --enable-libopenh264 \
- --enable-libopenjpeg \
- --enable-libopenmpt \
- --enable-libopus \
- --enable-libpulse \
- --enable-librtmp \
- --enable-librubberband \
- --enable-libschroedinger \
- --enable-libshine \
- --enable-libsmbclient \
- --enable-libsnappy \
- --enable-libsoxr \
- --enable-libspeex \
- --enable-libssh \
- --enable-libtesseract \
- --enable-libtheora \
- --enable-libtwolame \
- --enable-libv4l2 \
- --enable-libvidstab \
- --enable-libvo-amrwbenc \
- --enable-libvorbis \
- --enable-libvpx \
- --enable-libwavpack \
- --enable-libwebp \
- --enable-libx264 \
- --enable-libx265 \
- --enable-libxavs \
- --enable-libxcb \
- --enable-libxcb-shape \
- --enable-libxcb-shm \
- --enable-libxcb-xfixes \
- --enable-libxvid \
- --enable-libzimg \
- --enable-libzmq \
- --enable-libzvbi \
- --enable-netcdf \
- --enable-nonfree \
- --enable-omx \
- --enable-openal \
- --enable-opencl \
- --enable-opengl \
- --enable-openssl \
- --enable-runtime-cpudetect \
- --enable-shared \
- --enable-swresample \
- --enable-vaapi \
- --enable-vdpau \
- --enable-version3
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play,server}.1
+ cd "${_srcname}-${pkgver}"
+
+ # set x86_64 specific options
+ 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"
+
+ # strictly specifying nvcc path is needed if package is installing
+ # cuda for the first time
+ sed -i 's/^nvcc_default=.*/nvcc_default=\"\/opt\/cuda\/bin\/nvcc\"/' configure
+ fi
+
+ msg2 "Running ffmpeg configure script. Please wait..."
+
+ ./configure \
+ --prefix=/usr \
+ $_cflags \
+ "$_ldflags" \
+ \
+ --enable-rpath \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-nonfree \
+ --enable-shared \
+ --disable-static \
+ --enable-gray \
+ --enable-avresample \
+ \
+ --enable-avisynth \
+ --enable-bzlib \
+ --enable-chromaprint \
+ --enable-frei0r \
+ --enable-gcrypt \
+ --enable-gmp \
+ --enable-gnutls \
+ --enable-iconv \
+ --enable-ladspa \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libbs2b \
+ --enable-libcaca \
+ --enable-libcelt \
+ --enable-libcdio \
+ --enable-libdc1394 \
+ --enable-libfdk-aac \
+ --enable-libflite \
+ --enable-fontconfig \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --enable-libgme \
+ --enable-libgsm \
+ --enable-libiec61883 \
+ --enable-libilbc \
+ --enable-libkvazaar \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libnut \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb \
+ --enable-libopencv \
+ --enable-libopenh264 \
+ --enable-libopenjpeg \
+ --enable-libopenmpt \
+ --enable-libopus \
+ --enable-libpulse \
+ --enable-librubberband \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libshine \
+ --enable-libsmbclient \
+ --enable-libsnappy \
+ --enable-libsoxr \
+ --enable-libspeex \
+ --enable-libssh \
+ --enable-libtesseract \
+ --enable-libtheora \
+ --enable-libtwolame \
+ --enable-libv4l2 \
+ --enable-libvidstab \
+ --enable-libvo-amrwbenc \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libwavpack \
+ --enable-libwebp \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxavs \
+ --enable-libxcb \
+ --enable-libxcb-shm \
+ --enable-libxcb-xfixes \
+ --enable-libxcb-shape \
+ --enable-libxvid \
+ --enable-libzimg \
+ --enable-libzmq \
+ --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() {
- cd ${pkgname%-full}-$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"
+ cd "${_srcname}-${pkgver}"
+ make DESTDIR="$pkgdir/" install
+
+ install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/UNREDISTRIBUTABLE.txt b/UNREDISTRIBUTABLE.txt
deleted file mode 100644
index ec737d955d96..000000000000
--- a/UNREDISTRIBUTABLE.txt
+++ /dev/null
@@ -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.
diff --git a/chromaprint_1.4_fix.patch b/chromaprint_1.4_fix.patch
deleted file mode 100644
index e424463d9eb5..000000000000
--- a/chromaprint_1.4_fix.patch
+++ /dev/null
@@ -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
-