[packages/libav] - up to 9.1 (closer to ffmpeg 1.0.x, includes ilbc and opus support) - updated gsm,openjpeg,cdio-par

qboosh qboosh at pld-linux.org
Sat Jan 12 13:07:12 CET 2013 

commit 55f064f76d3d9fc4f6f1c6064eec963591aaf0d5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 12 13:07:26 2013 +0100

    - up to 9.1 (closer to ffmpeg 1.0.x, includes ilbc and opus support)
    - updated gsm,openjpeg,cdio-paranoia patches
    - added avserver patch (fixes avserver build: link with static libavformat, as it uses private symbols)

 libav-avserver.patch      | 22 ++++++++++++++++++++
 libav-cdio-paranoia.patch | 10 ++++-----
 libav-gsm.patch           | 10 ++++-----
 libav-openjpeg.patch      |  8 +++----
 libav.spec                | 53 +++++++++++++++++++++++++----------------------
 5 files changed, 64 insertions(+), 39 deletions(-)
---
diff --git a/libav.spec b/libav.spec
index 361a178..5c92b8b 100644
--- a/libav.spec
+++ b/libav.spec
@@ -1,3 +1,4 @@
+# TODO: avserver no longer supports daemon mode, so adjust init script
 # NOTE: don't send it to Th unless you resolve libraries (incl. sonames) conflict with ffmpeg
 # libav is a fork of ffmpeg; as of Dec 2012 they are not 100% compatible
 # (e.g. libav didn't drop some deprecated APIs); ffmpeg 1.0.x seems more powerful than libav 0.8.x.
@@ -10,7 +11,9 @@
 #
 # Conditional build:
 %bcond_with	nonfree		# non free options of package (currently: faac)
+%bcond_with	fdk_aac		# AAC encoding via libfdk_aac (requires nonfree)
 %bcond_without	frei0r		# frei0r video filtering
+%bcond_without	ilbc		# iLBC de/encoding via WebRTC libilbc
 %bcond_without	opencv		# OpenCV video filtering
 %bcond_without	pulseaudio	# PulseAudio input support
 %bcond_without	x264		# x264 encoder
@@ -21,15 +24,15 @@
 Summary:	libav - Open Source audio and video processing tools
 Summary(pl.UTF-8):	libav - narzędzia do przetwarzania dźwięku i obrazu o otwartych źródłach
 Name:		libav
-Version:	0.8.4
+Version:	9.1
 Release:	0.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (postprocessing, some filters, x264, xavs, xvid, x11grab)
+# (some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
 License:	GPL v3+ with LGPL v3+ parts
 Group:		Libraries
 Source0:	http://libav.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	4634b35dec327f9aba61b3b894df03f7
+# Source0-md5:	6c70d41a452762d16162f4d66120efbe
 Source1:	avserver.init
 Source2:	avserver.sysconfig
 Source3:	avserver.conf
@@ -37,11 +40,13 @@ Patch0:		%{name}-gsm.patch
 Patch1:		%{name}-opencv24.patch
 Patch2:		%{name}-openjpeg.patch
 Patch3:		%{name}-cdio-paranoia.patch
+Patch4:		%{name}-avserver.patch
 URL:		http://libav.org/
 BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
 %{?with_nonfree:BuildRequires:	faac-devel}
+%{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
 BuildRequires:	freetype-devel
 %{?with_frei0r:BuildRequires:	frei0r-devel}
 %ifarch ppc
@@ -54,7 +59,6 @@ BuildRequires:	lame-libs-devel >= 3.98.3
 BuildRequires:	libcdio-paranoia-devel >= 0.90-2
 BuildRequires:	libdc1394-devel >= 2
 BuildRequires:	libgsm-devel
-BuildRequires:	libnut-devel
 BuildRequires:	libraw1394-devel >= 2
 BuildRequires:	librtmp-devel
 BuildRequires:	libtheora-devel >= 1.0-0.beta3
@@ -73,6 +77,7 @@ BuildRequires:	nasm
 BuildRequires:	opencore-amr-devel
 %{?with_opencv:BuildRequires:	opencv-devel}
 BuildRequires:	openjpeg-devel >= 1.5
+BuildRequires:	opus-devel
 BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
@@ -86,6 +91,7 @@ BuildRequires:	tar >= 1:1.22
 %{?with_doc:BuildRequires:	texinfo}
 BuildRequires:	vo-aacenc-devel
 BuildRequires:	vo-amrwbenc-devel
+%{?with_ilbc:BuildRequires:	webrtc-libilbc-devel}
 BuildRequires:	xavs-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
@@ -93,8 +99,8 @@ BuildRequires:	xvid-devel >= 1:1.1.0
 BuildRequires:	xz
 BuildRequires:	yasm
 BuildRequires:	zlib-devel
+%{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xvid >= 1:1.1.0
-Obsoletes:	libpostproc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -128,13 +134,13 @@ Requires:	SDL-devel >= 1.2.1
 Requires:	alsa-lib-devel
 Requires:	bzip2-devel
 %{?with_nonfree:Requires:	faac-devel}
+%{?with_fdk_aac:Requires:	fdk-aac-devel}
 Requires:	freetype-devel
 Requires:	jack-audio-connection-kit-devel
 Requires:	lame-libs-devel >= 3.98.3
 Requires:	libcdio-paranoia-devel >= 0.90-2
 Requires:	libdc1394-devel >= 2
 Requires:	libgsm-devel
-Requires:	libnut-devel
 Requires:	libraw1394-devel >= 2
 Requires:	librtmp-devel
 Requires:	libtheora-devel >= 1.0-0.beta3
@@ -145,16 +151,17 @@ Requires:	libvorbis-devel
 Requires:	opencore-amr-devel
 %{?with_opencv:Requires:	opencv-devel}
 Requires:	openjpeg-devel >= 1.5
+Requires:	opus-devel
 Requires:	schroedinger-devel
 Requires:	speex-devel >= 1:1.2-rc1
 Requires:	vo-aacenc-devel
 Requires:	vo-amrwbenc-devel
+%{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xavs-devel
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXfixes-devel
 Requires:	xvid-devel >= 1:1.1.0
 Requires:	zlib-devel
-Obsoletes:	libpostproc-devel
 
 %description devel
 libav header files.
@@ -230,6 +237,7 @@ dużej przestrzeni na dane skonfigurowanej w avserver.conf).
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > libav-avconfig
@@ -288,7 +296,6 @@ EOF
 # notes:
 # - it's not autoconf configure
 # - --disable-debug, --disable-optimizations, tune=generic causes not to override our optflags
-# - dirac is not enabled (Dirac is supported via schroedinger, dropped in ffmpeg)
 # - openssl is not enabled (gnutls is instead)
 ./configure \
 	--arch=%{_target_base_arch} \
@@ -308,14 +315,16 @@ EOF
 	%{?with_frei0r:--enable-frei0r} \
 	--enable-libcdio \
 	--enable-libdc1394 \
+	%{?with_fdk_aac:--enable-libfdk-aac} \
 	--enable-libfreetype \
 	--enable-libgsm \
+	%{?with_ilbc:--enable-libilbc} \
 	--enable-libmp3lame \
-	--enable-libnut \
 	--enable-libopencore-amrnb \
 	--enable-libopencore-amrwb \
 	%{?with_opencv:--enable-libopencv} \
 	--enable-libopenjpeg \
+	--enable-libopus \
 	%{?with_pulseaudio:--enable-libpulse} \
 	--enable-librtmp \
 	--enable-libschroedinger \
@@ -328,7 +337,6 @@ EOF
 	%{?with_x264:--enable-libx264} \
 	--enable-libxavs \
 	--enable-libxvid \
-	--enable-postproc \
 	--enable-pthreads \
 	--enable-shared \
 	--enable-swscale \
@@ -347,9 +355,6 @@ EOF
 %endif
 	--enable-runtime-cpudetect
 
-# force oldscaler build
-%{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
-
 %{__make} \
 	V=1
 
@@ -420,17 +425,17 @@ fi
 %defattr(644,root,root,755)
 %doc CREDITS Changelog LICENSE README doc/{APIchanges,RELEASE_NOTES} %{?with_doc:doc/*.html}
 %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.54
 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libavdevice.so.53
 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.2
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.3
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.54
+%attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.1
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.51
-%attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.52
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.52
 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
 
@@ -442,23 +447,23 @@ fi
 %attr(755,root,root) %{_libdir}/libavdevice.so
 %attr(755,root,root) %{_libdir}/libavfilter.so
 %attr(755,root,root) %{_libdir}/libavformat.so
+%attr(755,root,root) %{_libdir}/libavresample.so
 %attr(755,root,root) %{_libdir}/libavutil.so
-%attr(755,root,root) %{_libdir}/libpostproc.so
 %attr(755,root,root) %{_libdir}/libswscale.so
 %{_includedir}/libav
 %{_includedir}/libavcodec
 %{_includedir}/libavdevice
 %{_includedir}/libavfilter
 %{_includedir}/libavformat
+%{_includedir}/libavresample
 %{_includedir}/libavutil
-%{_includedir}/libpostproc
 %{_includedir}/libswscale
 %{_pkgconfigdir}/libavcodec.pc
 %{_pkgconfigdir}/libavdevice.pc
 %{_pkgconfigdir}/libavfilter.pc
 %{_pkgconfigdir}/libavformat.pc
+%{_pkgconfigdir}/libavresample.pc
 %{_pkgconfigdir}/libavutil.pc
-%{_pkgconfigdir}/libpostproc.pc
 %{_pkgconfigdir}/libswscale.pc
 
 %files static
@@ -467,8 +472,8 @@ fi
 %{_libdir}/libavdevice.a
 %{_libdir}/libavfilter.a
 %{_libdir}/libavformat.a
+%{_libdir}/libavresample.a
 %{_libdir}/libavutil.a
-%{_libdir}/libpostproc.a
 %{_libdir}/libswscale.a
 
 %files tools
@@ -476,12 +481,10 @@ fi
 %attr(755,root,root) %{_bindir}/avconv
 %attr(755,root,root) %{_bindir}/avprobe
 %attr(755,root,root) %{_bindir}/avqt-faststart
-%attr(755,root,root) %{_bindir}/ffmpeg
 %dir %{_datadir}/avconv
 %{_datadir}/avconv/*.avpreset
 %{?with_doc:%{_mandir}/man1/avconv.1*}
 %{?with_doc:%{_mandir}/man1/avprobe.1*}
-%{?with_doc:%{_mandir}/man1/ffmpeg.1*}
 
 %files avplay
 %defattr(644,root,root,755)
diff --git a/libav-avserver.patch b/libav-avserver.patch
new file mode 100644
index 0000000..a9acb0d
--- /dev/null
+++ b/libav-avserver.patch
@@ -0,0 +1,22 @@
+--- libav-9.1/configure.orig	2013-01-10 21:32:17.613593592 +0100
++++ libav-9.1/configure	2013-01-11 22:20:57.565065216 +0100
+@@ -1782,7 +1782,7 @@
+ avplay_deps="avcodec avformat avresample swscale sdl"
+ avplay_select="rdft"
+ avprobe_deps="avcodec avformat"
+-avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
++avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer static"
+ avserver_extralibs='$ldl'
+ 
+ doc_deps="texi2html"
+--- libav-9.1/Makefile.orig	2013-01-07 11:17:21.000000000 +0100
++++ libav-9.1/Makefile	2013-01-12 10:58:43.537450899 +0100
+@@ -137,6 +137,8 @@
+ 
+ $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
+ 
++avserver: FF_EXTRALIBS=-lavdevice -lavfilter libavformat/libavformat.a -lavresample -lavcodec -lswscale -lavutil $(EXTRALIBS)
++
+ $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
+ 	$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+ 
diff --git a/libav-cdio-paranoia.patch b/libav-cdio-paranoia.patch
index 48ecede..5600562 100644
--- a/libav-cdio-paranoia.patch
+++ b/libav-cdio-paranoia.patch
@@ -11,14 +11,14 @@
  
  #include "libavutil/log.h"
  #include "libavutil/mem.h"
---- ffmpeg-1.0.1/configure.orig	2012-12-06 19:06:32.011945790 +0100
-+++ ffmpeg-1.0.1/configure	2012-12-06 19:29:13.155250760 +0100
-@@ -3771,7 +3771,7 @@
+--- libav-9.1/configure.orig	2013-01-10 21:00:22.840300169 +0100
++++ libav-9.1/configure	2013-01-10 21:29:21.180263938 +0100
+@@ -3552,7 +3552,7 @@
  enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
  
  enabled libcdio &&
--    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
-+    check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
+-    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
++    check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
  
  enabled x11grab                                           &&
  require X11 X11/Xlib.h XOpenDisplay -lX11                 &&
diff --git a/libav-gsm.patch b/libav-gsm.patch
index 6f4bca3..4f37798 100644
--- a/libav-gsm.patch
+++ b/libav-gsm.patch
@@ -1,13 +1,13 @@
---- libav-0.8.4/configure.orig	2012-12-22 17:45:12.936567283 +0100
-+++ libav-0.8.4/configure	2012-12-22 17:52:41.616557932 +0100
-@@ -2942,7 +2942,7 @@
-     "dirac_decoder_init dirac_encoder_init"
+--- libav-9.1/configure.orig	2013-01-10 20:51:10.110311689 +0100
++++ libav-9.1/configure	2013-01-10 20:55:14.063639939 +0100
+@@ -3467,7 +3467,7 @@
  enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+ enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
  enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
 -enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
 +enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
+ enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
  enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
- enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
  enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 --- ffmpeg-0.10/libavcodec/libgsm.c.orig	2012-01-26 23:15:59.000000000 +0100
 +++ ffmpeg-0.10/libavcodec/libgsm.c	2012-01-27 17:58:28.495275196 +0100
diff --git a/libav-openjpeg.patch b/libav-openjpeg.patch
index c774eb1..988c6c2 100644
--- a/libav-openjpeg.patch
+++ b/libav-openjpeg.patch
@@ -1,11 +1,11 @@
---- libav-0.8.4/configure.orig	2012-12-22 18:00:01.673215427 +0100
-+++ libav-0.8.4/configure	2012-12-22 18:04:38.113209665 +0100
-@@ -2948,7 +2948,7 @@
+--- libav-9.1/configure.orig	2013-01-10 20:55:39.673639404 +0100
++++ libav-9.1/configure	2013-01-10 20:59:51.676967488 +0100
+@@ -3473,7 +3473,7 @@
  enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
  enabled libopencore_amrwb  && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
  enabled libopencv  && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect
 -enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
 +enabled libopenjpeg && require_pkg_config libopenjpeg openjpeg.h opj_version
+ enabled libopus    && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
  enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
  enabled librtmp    && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libav.git/commitdiff/55f064f76d3d9fc4f6f1c6064eec963591aaf0d5

More information about the pld-cvs-commit mailing list