packages: ffmpeg/ffmpeg.spec - enabled more features: gnutls (TLS/HTTPS sup...

[qboosh]

Author: qboosh                       Date: Fri Dec 16 20:12:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enabled more features: gnutls (TLS/HTTPS support), libass, libcdio, libmodplug, libv4l2;
  libpulse and openal inputs (bconds)

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.236 -> 1.237) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.236 packages/ffmpeg/ffmpeg.spec:1.237
--- packages/ffmpeg/ffmpeg.spec:1.236	Fri Dec 16 13:23:52 2011
+++ packages/ffmpeg/ffmpeg.spec	Fri Dec 16 21:12:37 2011
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO
+# - consider: libstagefright-h264, libutvideo
 # - is bug803 patch still needed? the code changed somehow
 #
 # Workaround ffmpeg.spec & opencv.spec updating:
@@ -14,7 +15,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
@@ -38,6 +41,7 @@
 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
@@ -50,16 +54,21 @@
 # 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
@@ -69,6 +78,7 @@
 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
@@ -308,24 +318,30 @@
 	--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 \
@@ -333,6 +349,7 @@
 	%{?with_x264:--enable-libx264} \
 	--enable-libxavs \
 	--enable-libxvid \
+	%{?with_openal:--enable-openal} \
 	--enable-postproc \
 	--enable-pthreads \
 	--enable-shared \
@@ -514,6 +531,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.237  2011/12/16 20:12:37  qboosh
+- enabled more features: gnutls (TLS/HTTPS support), libass, libcdio, libmodplug, libv4l2;
+  libpulse and openal inputs (bconds)
+
 Revision 1.236  2011/12/16 12:23:52  hawk
 - opencv bcond, added comment about ffmpeg/opencv build dependency loop
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.236&r2=1.237&f=u