X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=69ddc98bc1196de10e09ac6b6ec00915ff2d9407;hb=1bab6688a1ce4ef223c96760580239571d5b756a;hp=552a06eb006e050fedaf99d94af65240e2656667;hpb=797c3dd669acda999504072fa4125bf045069e1b;p=packages%2Fffmpeg.git diff --git a/ffmpeg.spec b/ffmpeg.spec index 552a06e..69ddc98 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -8,13 +8,14 @@ # # Conditional build: %bcond_with bootstrap # disable features to able to build without installed ffmpeg -%bcond_with nonfree # non free options of package (currently: faac, fdk_aac, nvenc) -%bcond_with fdk_aac # AAC de/encoding via libfdk_aac (requires nonfree) -%bcond_with faac # faac (requires nonfree) +%bcond_with nonfree # non free options of package (currently: decklib, fdk_aac, openssl) %bcond_without bs2b # BS2B audio filter support %bcond_without caca # textual display using libcaca %bcond_without chromaprint # audio fingerprinting with chromaprint -%bcond_without decklink # Blackmagic DeskLink output support +%bcond_with cuda # NVIDIA CUDA code [BR: cuda.h] +%bcond_with cuvid # NVIDIA CUVID support +%bcond_with decklink # Blackmagic DeskLink output support (requires nonfree) +%bcond_with fdk_aac # AAC de/encoding via libfdk_aac (requires nonfree) %bcond_without flite # flite voice synthesis support %bcond_without frei0r # frei0r video filtering %bcond_without fribidi # fribidi support @@ -23,12 +24,15 @@ %bcond_without kvazaar # Kvazaar HEVC encoder support %bcond_without ladspa # LADSPA audio filtering %bcond_with mfx # MFX hardware acceleration support -%bcond_with nvenc # NVIDIA NVENC support (requires nonfree) +%bcond_with npp # NVIDIA Performance Primitives-based code (requires nonfree) [BR: libnppc+libnppi, npp.h] +%bcond_with nvenc # NVIDIA NVENC support +%bcond_without omx # OpenMAX IL support %bcond_without openal # OpenAL 1.1 capture support %bcond_without opencl # OpenCL 1.2 code %bcond_without opencv # OpenCV video filtering %bcond_without opengl # OpenGL rendering support %bcond_with openh264 # OpenH264 H.264 encoder +%bcond_without openmpt # OpenMPT module decoder %bcond_without pulseaudio # PulseAudio input support %bcond_without rubberband # rubberband filter %bcond_without shine # shine fixed-point MP3 encoder @@ -55,7 +59,7 @@ %undefine with_chromaprint %endif -%ifnarch %{ix86} %{x8664} arm +%ifnarch %{ix86} %{x8664} %{arm} %undefine with_x265 %endif %ifarch i386 i486 @@ -64,28 +68,30 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg -Version: 3.1 +Version: 3.3.2 Release: 2 # LGPL or GPL, chosen at configure time (GPL version is more featured) -# (postprocessing, some filters, x264, x265, xavs, xvid, x11grab) +# (postprocessing, some filters, x264, x265, xavs, xvid, xcbgrab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz -# Source0-md5: 24ef0c0d541c857c8bc39215619b126f +# Source0-md5: d6c09c84e3d0d9ca8a51f481da660603 Source1: ffserver.init Source2: ffserver.sysconfig Source3: ffserver.conf +Patch0: %{name}-omx-libnames.patch URL: http://www.ffmpeg.org/ -%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK} +%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.6.1} %{?with_openal:BuildRequires: OpenAL-devel >= 1.1} %{?with_opencl:BuildRequires: OpenCL-devel >= 1.2} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} -BuildRequires: SDL-devel >= 1.2.1 +# libomxil-bellagio-devel or limoi-core-devel (just headers, library is dlopened at runtime) +%{?with_omx:BuildRequires: OpenMAX-IL-devel} +BuildRequires: SDL2-devel >= 2.0.1 BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel BuildRequires: celt-devel >= 0.11.0 -%{?with_faac:BuildRequires: faac-devel} %{?with_fdk_aac:BuildRequires: fdk-aac-devel} %{?with_flite:BuildRequires: flite-devel >= 1.4} BuildRequires: fontconfig-devel @@ -115,6 +121,7 @@ BuildRequires: libgsm-devel BuildRequires: libiec61883-devel BuildRequires: libmodplug-devel BuildRequires: libnut-devel +%{?with_openmpt:BuildRequires: libopenmpt-devel >= 0.2.6557} BuildRequires: libraw1394-devel >= 2 BuildRequires: librtmp-devel %{?with_ssh:BuildRequires: libssh-devel} @@ -122,7 +129,11 @@ BuildRequires: librtmp-devel BuildRequires: libtheora-devel >= 1.0-0.beta3 BuildRequires: libtool >= 2:1.4d-3 BuildRequires: libv4l-devel -%{?with_va:BuildRequires: libva-devel >= 1.0.3} +%if %{with va} +BuildRequires: libva-devel >= 1.0.3 +BuildRequires: libva-drm-devel >= 1.0.3 +BuildRequires: libva-x11-devel >= 1.0.3 +%endif BuildRequires: libvdpau-devel >= 0.2 BuildRequires: libvorbis-devel %{?with_vpx:BuildRequires: libvpx-devel >= 1.3.0} @@ -140,11 +151,11 @@ BuildRequires: nasm %endif %endif # which package? -#%{?with_nvenc:BuildRequires: NVIDIA-NVENC-API} +#%{?with_nvenc:BuildRequires: NVIDIA-NVENC-API} compat/nvenc/nvEncodeAPI.h BuildRequires: opencore-amr-devel %{?with_opencv:BuildRequires: opencv-devel} %{?with_openh264:BuildRequires: openh264-devel >= 1.3} -BuildRequires: openjpeg-devel >= 1.5 +BuildRequires: openjpeg2-devel >= 2.1 BuildRequires: opus-devel BuildRequires: perl-Encode BuildRequires: perl-tools-pod @@ -171,9 +182,10 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXfixes-devel BuildRequires: xvid-devel >= 1:1.1.0 +BuildRequires: xz-devel BuildRequires: yasm %{?with_zmq:BuildRequires: zeromq-devel} -%{?with_zimg:BuildRequires: zimg-devel} +%{?with_zimg:BuildRequires: zimg-devel >= 2.3.0} BuildRequires: zlib-devel %{?with_zvbi:BuildRequires: zvbi-devel} %{?with_autoreqdep:BuildConflicts: libpostproc} @@ -185,8 +197,6 @@ Requires: xvid >= 1:1.1.0 Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLU.so.1 - %define specflags -fno-strict-aliasing # -fomit-frame-pointer is always needed on x86 due to lack of registers (-fPIC takes one) @@ -213,12 +223,15 @@ telewizyjnej. Summary: ffmpeg libraries Summary(pl.UTF-8): Biblioteki ffmpeg Group: Libraries +Requires: SDL2 >= 2.0.1 %if "%(rpm -q --qf '%{V}' gnutls-devel)" >= "3.0.20" # uses gnutls_certificate_set_x509_system_trust if >= 3.0.20 Requires: gnutls-libs >= 3.0.20 %endif +%{?with_openmpt:Requires: libopenmpt >= 0.2.6557} %{?with_vpx:Requires: libvpx >= 1.3.0} %{?with_rubberband:Requires: rubberband-libs >= 1.8.1} +%{?with_zimg:Requires: zimg >= 2.3.0} %description libs This package contains the ffmpeg shared libraries: @@ -244,11 +257,10 @@ Requires: %{name}-libs = %{version}-%{release} # Libs.private from *.pc (unreasonably they are all the same) %{?with_opencl:Requires: OpenCL-devel >= 1.2} %{?with_opengl:Requires: OpenGL-devel} -Requires: SDL-devel >= 1.2.1 +Requires: SDL2-devel >= 2.0.1 Requires: alsa-lib-devel Requires: bzip2-devel Requires: celt-devel >= 0.11.0 -%{?with_faac:Requires: faac-devel} %{?with_fdk_aac:Requires: fdk-aac-devel} %{?with_flite:Requires: flite-devel >= 1.4} Requires: fontconfig-devel @@ -270,6 +282,7 @@ Requires: libgsm-devel Requires: libiec61883-devel Requires: libmodplug-devel Requires: libnut-devel +%{?with_openmpt:Requires: libopenmpt-devel >= 0.2.6557} Requires: libraw1394-devel >= 2 Requires: librtmp-devel %{?with_smb:Requires: libsmbclient-devel} @@ -284,7 +297,7 @@ Requires: libvorbis-devel Requires: opencore-amr-devel %{?with_opencv:Requires: opencv-devel} %{?with_openh264:Requires: openh264-devel >= 1.3} -Requires: openjpeg-devel >= 1.5 +Requires: openjpeg2-devel >= 2.1 %{?with_rubberband:Requires: rubberband-devel >= 1.8.1} Requires: schroedinger-devel %{?with_shine:Requires: shine-devel >= 3.0.0} @@ -302,7 +315,7 @@ Requires: xorg-lib-libXext-devel Requires: xorg-lib-libXfixes-devel Requires: xvid-devel >= 1:1.1.0 %{?with_zmq:Requires: zeromq-devel} -%{?with_zimg:Requires: zimg-devel} +%{?with_zimg:Requires: zimg-devel >= 2.3.0} Requires: zlib-devel Obsoletes: libpostproc-devel @@ -377,6 +390,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML. %prep %setup -q +%patch0 -p1 # package the grep result for mplayer, the result formatted as ./mplayer/configure cat < ffmpeg-avconfig @@ -461,11 +475,12 @@ EOF --enable-avfilter \ --enable-avresample \ %{?with_chromaprint:--enable-chromaprint} \ + %{!?with_cuda:--disable-cuda} \ + %{!?with_cuvid:--disable-cuvid} \ %{?with_decklink:--enable-decklink} \ --enable-gnutls \ --enable-gpl \ --enable-version3 \ - --enable-fontconfig \ %{?with_frei0r:--enable-frei0r} \ %{?with_ladspa:--enable-ladspa} \ --enable-libass \ @@ -476,6 +491,7 @@ EOF --enable-libcdio \ --enable-libdc1394 \ %{?with_flite:--enable-libflite} \ + --enable-libfontconfig \ --enable-libfreetype \ %{?with_fribidi:--enable-libfribidi} \ %{?with_gme:--enable-libgme} \ @@ -492,6 +508,7 @@ EOF %{?with_opencv:--enable-libopencv} \ %{?with_openh264:--enable-libopenh264} \ --enable-libopenjpeg \ + %{?with_openmpt:--enable-libopenmpt} \ --enable-libopus \ %{?with_pulseaudio:--enable-libpulse} \ --enable-librtmp \ @@ -520,6 +537,8 @@ EOF %{?with_zimg:--enable-libzimg} \ %{?with_zmq:--enable-libzmq} \ %{?with_zvbi:--enable-libzvbi} \ + %{!?with_nvenc:--disable-nvenc} \ + %{?with_omx:--enable-omx} \ %{?with_openal:--enable-openal} \ %{?with_opencl:--enable-opencl} \ %{?with_opengl:--enable-opengl} \ @@ -528,7 +547,7 @@ EOF --enable-shared \ --enable-swscale \ %{!?with_va:--disable-vaapi} \ - --enable-x11grab \ + --enable-libxcb \ %ifnarch %{ix86} %{x8664} --disable-mmx \ %endif @@ -540,9 +559,8 @@ EOF %endif %if %{with nonfree} --enable-nonfree \ - %{?with_faac:--enable-libfaac} \ %{?with_fdk_aac:--enable-libfdk-aac} \ - %{?with_nvenc:--enable-nvenc} \ + %{?with_npp:--enable-libnpp} \ %endif --enable-runtime-cpudetect