Author: qboosh Date: Mon Jun 27 15:14:52 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.8 (note: new sonames, API changes)
- updated pl descriptions
- updated patches: bug-803 (is it still needed?), gsm
- removed obsolete faadbin-libfaadname,libvpx patches
- (nonfree) libfaad support is gone
- updated BRs; needs x264 ABI >= 115
---- Files affected:
packages/ffmpeg:
ffmpeg-bug-803.patch (1.1 -> 1.2) , ffmpeg-gsm.patch (1.1 -> 1.2) ,
ffmpeg.spec (1.213 -> 1.214) , faadbin-libfaadname.patch (1.1 -> NONE)
(REMOVED), ffmpeg-0.6_libvpx-0.9.1.diff (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/ffmpeg/ffmpeg-bug-803.patch
diff -u packages/ffmpeg/ffmpeg-bug-803.patch:1.1
packages/ffmpeg/ffmpeg-bug-803.patch:1.2
--- packages/ffmpeg/ffmpeg-bug-803.patch:1.1 Tue May 12 00:30:41 2009
+++ packages/ffmpeg/ffmpeg-bug-803.patch Mon Jun 27 17:14:47 2011
@@ -1,29 +1,43 @@
---- ffmpeg-20080908/libavcodec/libmp3lame.c.orig 2008-08-09
21:37:36.000000000 +0400
-+++ ffmpeg-20080908/libavcodec/libmp3lame.c 2009-02-03 11:22:37.000000000
+0300
-@@ -34,6 +34,7 @@
+--- ffmpeg-0.8/libavcodec/libmp3lame.c.orig 2011-06-21 21:29:25.000000000
+0200
++++ ffmpeg-0.8/libavcodec/libmp3lame.c 2011-06-26 17:35:11.772209142 +0200
+@@ -35,6 +35,7 @@
int stereo;
uint8_t buffer[BUFFER_SIZE];
int buffer_index;
+ int flushed;
- } Mp3AudioContext;
+ struct {
+ int *left;
+ int *right;
+@@ -169,11 +170,16 @@
+ /* lame 3.91 dies on '1-channel interleaved' data */
- static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
-@@ -166,12 +167,18 @@
+ if(!data){
++ if(s->flushed)
++ lame_result = 0;
++ else {
++ s->flushed = 1;
+ lame_result= lame_encode_flush(
+ s->gfp,
+ s->buffer + s->buffer_index,
+ BUFFER_SIZE - s->buffer_index
+ );
++ }
+ #if 2147483647 == INT_MAX
+ }else if(AV_SAMPLE_FMT_S32 == avctx->sample_fmt){
+ if (s->stereo) {
+@@ -205,6 +211,7 @@
BUFFER_SIZE - s->buffer_index
);
}
-+ s->flushed = 0;
++ s->flushed = 0;
+ #endif
}else{
-+ if (s->flushed)
-+ lame_result = 0;
-+ else {
-+ s->flushed = 1;
- lame_result= lame_encode_flush(
- s->gfp,
- s->buffer + s->buffer_index,
+ if (s->stereo) {
+@@ -225,6 +232,7 @@
BUFFER_SIZE - s->buffer_index
);
-+ }
+ }
++ s->flushed = 0;
}
- if(lame_result==-1) {
+ if(lame_result < 0){
================================================================
Index: packages/ffmpeg/ffmpeg-gsm.patch
diff -u packages/ffmpeg/ffmpeg-gsm.patch:1.1
packages/ffmpeg/ffmpeg-gsm.patch:1.2
--- packages/ffmpeg/ffmpeg-gsm.patch:1.1 Fri Jun 18 08:19:42 2010
+++ packages/ffmpeg/ffmpeg-gsm.patch Mon Jun 27 17:14:47 2011
@@ -1,14 +1,14 @@
---- configure~ 2010-06-15 21:44:30.000000000 +0200
-+++ configure 2010-06-18 07:51:49.083904825 +0200
-@@ -2611,7 +2611,7 @@
- require libdirac libdirac_encoder/dirac_encoder.h
dirac_encoder_init $(pkg-config --libs dirac)
+--- configure.orig 2011-06-21 21:29:25.000000000 +0200
++++ configure 2011-06-26 20:07:17.579181375 +0200
+@@ -2920,7 +2920,7 @@
+ "dirac_decoder_init dirac_encoder_init"
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
-lfaac
- enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad
+ 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 libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame -lm
+ 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 -lm
+ enabled libopencore_amrnb && require libopencore_amrnb
opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
--- libavcodec/libgsm.c~ 2010-04-20 16:45:34.000000000 +0200
+++ libavcodec/libgsm.c 2010-06-18 08:05:19.692574999 +0200
@@ -28,7 +28,7 @@
================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.213 packages/ffmpeg/ffmpeg.spec:1.214
--- packages/ffmpeg/ffmpeg.spec:1.213 Wed Apr 27 21:42:00 2011
+++ packages/ffmpeg/ffmpeg.spec Mon Jun 27 17:14:47 2011
@@ -1,6 +1,10 @@
# $Revision$, $Date$
# TODO
+# - is bug803 patch still needed? the code changed somehow
# - libnut enabled no (http://www.nut-container.org/)
+# - frei0r (frei0r.h)?
+# - libvo_aacenc, libvo_amrwbenc?
+# - libxavs?
#
# Conditional build:
%bcond_with nonfree # non free options of package
@@ -9,41 +13,39 @@
%bcond_without vpx # VP8, a high-quality video codec
%bcond_without doc # don't build docs
-Summary: FFmpeg is a very fast video and audio converter
-Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer
strumieni
+Summary: FFmpeg - a very fast video and audio converter
+Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 0.6.3
+Version: 0.8
Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (postprocessing, ac3, xvid, x264, faad)
+# (postprocessing, ac3, xvid, x264)
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: cdf4ad9b2a4d195b5ca874494bc7b0b0
+# Source0-md5: 7e9b8c8a6952de0c477027e48249f3ed
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
Patch0: %{name}-bug-803.patch
Patch1: %{name}-gsm.patch
-Patch2: faadbin-libfaadname.patch
-# vhook is gone. this patch needs different approach
-#PatchX: imagewidth.patch
-# http://webm.googlecode.com/files/ffmpeg-0.6_libvpx-0.9.1.diff.gz
-Patch3: ffmpeg-0.6_libvpx-0.9.1.diff
URL: http://www.ffmpeg.org/
BuildRequires: SDL-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: celt-devel
BuildRequires: dirac-devel >= 1.0.0
BuildRequires: faac-devel
-BuildRequires: faad2-devel
BuildRequires: freetype-devel
%ifarch ppc
# require version with altivec support fixed
BuildRequires: gcc >= 5:3.3.2-3
%endif
-BuildRequires: lame-libs-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lame-libs-devel >= 3.98.3
BuildRequires: libdc1394-devel
BuildRequires: libgsm-devel
BuildRequires: libraw1394-devel
+BuildRequires: librtmp-devel
BuildRequires: libtheora-devel >= 1.0-0.beta3
BuildRequires: libtool >= 2:1.4d-3
%{?with_va:BuildRequires: libva-devel >= 1.0.3}
@@ -51,7 +53,7 @@
BuildRequires: libvorbis-devel
%{?with_vpx:BuildRequires: libvpx-devel >= 0.9.1}
# X264_BUILD >= 83
-BuildRequires: libx264-devel >= 0.1.3-1.20100424_2245.1
+BuildRequires: libx264-devel >= 0.1.3-1.20110625_2245
BuildRequires: opencore-amr-devel
BuildRequires: openjpeg-devel >= 1.3-2
BuildRequires: speex-devel >= 1:1.2-rc1
@@ -68,6 +70,8 @@
%{?with_doc:BuildRequires: tetex}
%{?with_doc:BuildRequires: texi2html}
%{?with_doc:BuildRequires: texinfo}
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
BuildRequires: xvid-devel >= 1:1.1.0
BuildRequires: zlib-devel
%{?with_autoreqdep:BuildConflicts: libpostproc}
@@ -94,29 +98,32 @@
card.
%description -l pl.UTF-8
-ffmpeg jest bardzo szybkim koderem audio/wideo w czasie rzeczywistym
-oraz serwerem strumieni multimedialnych. ffmpeg potrafi zrzucać dane
-ze standardowego urządzenia Video4Linux i przekonwertować je w kilka
-formatów plików bazujących na kodowaniu DCT/kompensacji ruchu. Dźwięk
-jest kompresowany do strumienia MPEG audio layer 2 lub używając
-strumienia kompatybilnego z AC3.
+FFmpeg to kompletne rozwiązanie nagrywania, konwersji i transmisji
+strumieni dźwięku i obrazu. Jest to działające z linii poleceń
+narzędzie do konwersji obrazu z jednego formatu do innego. Obsługuje
+także przechwytywanie i kodowanie w czasie rzeczywistym z karty
+telewizyjnej.
%package libs
Summary: ffmpeg libraries
Summary(pl.UTF-8): Biblioteki ffmpeg
Group: Libraries
-Suggests: faad2-libs
%description libs
-This package contains:
-- the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...),
-- demuxer library from the ffmpeg project. It supports most existing
- file formats (AVI, MPEG, OGG, Matroska, ASF...),
-- video postprocessing library from the ffmpeg project.
+This package contains the ffmpeg shared libraries:
+- the codec library (libavcodec). It supports most existing encoding
+ formats (MPEG, DivX, MPEG4, AC3, DV...),
+- demuxer library (libavformat). It supports most existing file
+ formats (AVI, MPEG, OGG, Matroska, ASF...),
+- video postprocessing library (libpostproc).
%description libs -l pl.UTF-8
-Ten pakiet zawiera biblioteki współdzielone ffmpeg.
+Ten pakiet zawiera biblioteki współdzielone ffmpeg:
+- bibliotekę kodeków (libavcodec); obsługuje większość istniejących
+ formatów kodowania (MPEG, DivX, MPEG4, AC3, DV...),
+- bibliotekę demuksera (libavformat); obsługuje większość istniejących
+ formatów plików (AVI, MPEG, OGG, Matroska, ASF...),
+- bibliotekę postprocessingu (libpostproc).
%package devel
Summary: ffmpeg header files
@@ -126,7 +133,6 @@
# for libavcodec:
Requires: dirac-devel
Requires: faac-devel
-Requires: faad2-devel
Requires: lame-libs-devel
Requires: libgsm-devel
Requires: libraw1394-devel
@@ -196,8 +202,6 @@
%setup -q
%patch0 -p1
%patch1 -p0
-%patch2 -p1
-%patch3 -p0
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > ffmpeg-avconfig
@@ -272,11 +276,14 @@
--enable-gpl \
--enable-version3 \
--enable-libdc1394 \
+ --enable-libcelt \
--enable-libdirac \
- --enable-libfaad \
- --enable-libfaadbin \
--enable-libgsm \
--enable-libmp3lame \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb \
+ --enable-libopenjpeg \
+ --enable-librtmp \
--enable-libschroedinger \
--enable-libspeex \
--enable-libtheora \
@@ -284,9 +291,6 @@
%{?with_vpx:--enable-libvpx} \
--enable-libx264 \
--enable-libxvid \
- --enable-libopencore-amrnb \
- --enable-libopencore-amrwb \
- --enable-libopenjpeg \
--enable-postproc \
--enable-pthreads \
--enable-shared \
@@ -305,6 +309,8 @@
%endif
--enable-runtime-cpudetect
+# --enable-libopencv would cause dependency loop
+
# force oldscaler build
%{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g'
config.h
@@ -374,7 +380,7 @@
%files
%defattr(644,root,root,755)
-%doc Changelog LICENSE README %{?with_doc:doc/*.html} doc/TODO
+%doc CREDITS LICENSE MAINTAINERS README doc/{APIchanges,RELEASE_NOTES,TODO}
%{?with_doc:doc/*.html}
%attr(755,root,root) %{_bindir}/ffmpeg
%attr(755,root,root) %{_bindir}/ffprobe
%attr(755,root,root) %{_bindir}/qt-faststart
@@ -386,19 +392,19 @@
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.52
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.53
%attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.52
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.53
%attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.1
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.2
%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.52
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.53
%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.50
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.51
%attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.51
%attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.0
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
%files devel
%defattr(644,root,root,755)
@@ -458,6 +464,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.214 2011/06/27 15:14:47 qboosh
+- updated to 0.8 (note: new sonames, API changes)
+- updated pl descriptions
+- updated patches: bug-803 (is it still needed?), gsm
+- removed obsolete faadbin-libfaadname,libvpx patches
+- (nonfree) libfaad support is gone
+- updated BRs; needs x264 ABI >= 115
+
Revision 1.213 2011/04/27 19:42:00 marti
- up to 0.6.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg-bug-803.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg-gsm.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.213&r2=1.214&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
