- enabled more features: gnutls (TLS/HTTPS support), libass, libcdio, libmodplug...

  libpulse and openal inputs (bconds)

Changed files:
    ffmpeg.spec -> 1.237

diff --git a/ffmpeg.spec b/ffmpeg.spec
index dbc35211ac22d8cee8f003cd8c2b70b7b321bcb4..f3c08136d9b684d8a01a172d27736c492ebce790 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,4 +1,5 @@
 # TODO
+# - consider: libstagefright-h264, libutvideo
 # - is bug803 patch still needed? the code changed somehow
 #
 # Workaround ffmpeg.spec & opencv.spec updating:
@@ -13,7 +14,9 @@
 %bcond_with    aacplus         # AAC+ encoding via libaacplus (requires nonfree)
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
 %bcond_without frei0r          # build without frei0r video filtering
+%bcond_without openal          # build without OpenAL 1.1 capture support
 %bcond_without opencv          # build without opencv video filtering
+%bcond_without pulseaudio      # build without PulseAudio input support
 %bcond_without x264            # build without x264 encoder
 %bcond_without va              # VAAPI (Video Acceleration API)
 %bcond_without vpx             # VP8, a high-quality video codec
@@ -37,6 +40,7 @@ Source3:      ffserver.conf
 Patch0:                %{name}-bug-803.patch
 Patch1:                %{name}-gsm.patch
 URL:           http://www.ffmpeg.org/
+%{?with_openal:BuildRequires:  OpenAL-devel}
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -49,16 +53,21 @@ BuildRequires:      freetype-devel
 # require version with altivec support fixed
 BuildRequires: gcc >= 5:3.3.2-3
 %endif
+BuildRequires: gnutls-devel
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: lame-libs-devel >= 3.98.3
 %{?with_aacplus:BuildRequires: libaacplus-devel >= 2.0.0}
+BuildRequires: libass-devel
+BuildRequires: libcdio-devel
 BuildRequires: libdc1394-devel
 BuildRequires: libgsm-devel
+BuildRequires: libmodplug-devel
 BuildRequires: libnut-devel
 BuildRequires: libraw1394-devel >= 2
 BuildRequires: librtmp-devel
 BuildRequires: libtheora-devel >= 1.0-0.beta3
 BuildRequires: libtool >= 2:1.4d-3
+BuildRequires: libv4l2-devel
 %{?with_va:BuildRequires:      libva-devel >= 1.0.3}
 BuildRequires: libvdpau-devel
 BuildRequires: libvorbis-devel
@@ -68,6 +77,7 @@ BuildRequires:        libvorbis-devel
 BuildRequires: opencore-amr-devel
 %{?with_opencv:BuildRequires:  opencv-devel}
 BuildRequires: openjpeg-devel >= 1.3-2
+%{?with_pulseaudio:BuildRequires:      pulseaudio-devel}
 BuildRequires: speex-devel >= 1:1.2-rc1
 %ifarch %{ix86}
 %ifnarch i386 i486
@@ -307,24 +317,30 @@ EOF
        --disable-optimizations \
        --disable-stripping \
        --enable-avfilter \
+       --enable-gnutls \
        --enable-gpl \
        --enable-version3 \
        %{?with_frei0r:--enable-frei0r} \
        %{?with_aacplus:--enable-libaacplus} \
-       --enable-libdc1394 \
+       --enable-libass \
        --enable-libcelt \
+       --enable-libcdio \
+       --enable-libdc1394 \
        --enable-libdirac \
        --enable-libgsm \
+       --enable-libmodplug \
        --enable-libmp3lame \
        --enable-libnut \
        --enable-libopencore-amrnb \
        --enable-libopencore-amrwb \
        %{?with_opencv:--enable-libopencv} \
        --enable-libopenjpeg \
+       %{?with_pulseaudio:--enable-libpulse} \
        --enable-librtmp \
        --enable-libschroedinger \
        --enable-libspeex \
        --enable-libtheora \
+       --enable-libv4l2 \
        --enable-libvo-aacenc \
        --enable-libvo-amrwbenc \
        --enable-libvorbis \
@@ -332,6 +348,7 @@ EOF
        %{?with_x264:--enable-libx264} \
        --enable-libxavs \
        --enable-libxvid \
+       %{?with_openal:--enable-openal} \
        --enable-postproc \
        --enable-pthreads \
        --enable-shared \