diff --git a/specs/ffmpeg/ffmpeg-20070109-faad2.patch b/specs/ffmpeg/ffmpeg-20070109-faad2.patch deleted file mode 100644 index 251d321a5..000000000 --- a/specs/ffmpeg/ffmpeg-20070109-faad2.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff -Naupr ffmpeg-20070109.orig/configure ffmpeg-20070109/configure ---- ffmpeg-20070109.orig/configure 2007-01-07 01:22:32.000000000 +0100 -+++ ffmpeg-20070109/configure 2007-01-09 16:28:16.000000000 +0100 -@@ -1516,7 +1516,7 @@ if enabled libfaad; then - check_ld < - int main(){ -- faacDecOpen(); -+ NeAACDecOpen(); - return 0; - } - EOF -diff -Naupr ffmpeg-20070109.orig/libavcodec/faad.c ffmpeg-20070109/libavcodec/faad.c ---- ffmpeg-20070109.orig/libavcodec/faad.c 2007-01-07 00:54:01.000000000 +0100 -+++ ffmpeg-20070109/libavcodec/faad.c 2007-01-09 16:28:52.000000000 +0100 -@@ -55,42 +55,42 @@ typedef struct { - int init; - - /* faad calls */ -- faacDecHandle FAADAPI (*faacDecOpen)(void); -- faacDecConfigurationPtr FAADAPI (*faacDecGetCurrentConfiguration)(faacDecHandle hDecoder); -+ NeAACDecHandle FAADAPI (*NeAACDecOpen)(void); -+ NeAACDecConfigurationPtr FAADAPI (*NeAACDecGetCurrentConfiguration)(NeAACDecHandle hDecoder); - #ifndef FAAD2_VERSION -- int FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, -- faacDecConfigurationPtr config); -- int FAADAPI (*faacDecInit)(faacDecHandle hDecoder, -+ int FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, -+ NeAACDecConfigurationPtr config); -+ int FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long *samplerate, - unsigned long *channels); -- int FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, -+ int FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, - unsigned long SizeOfDecoderSpecificInfo, - unsigned long *samplerate, unsigned long *channels); -- int FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, -+ int FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long *bytesconsumed, - short *sample_buffer, - unsigned long *samples); - #else -- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, -- faacDecConfigurationPtr config); -- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder, -+ unsigned char FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, -+ NeAACDecConfigurationPtr config); -+ long FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long buffer_size, - unsigned long *samplerate, - unsigned char *channels); -- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, -+ char FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, - unsigned long SizeOfDecoderSpecificInfo, - unsigned long *samplerate, unsigned char *channels); -- void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, -- faacDecFrameInfo *hInfo, -+ void *FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, -+ NeAACDecFrameInfo *hInfo, - unsigned char *buffer, - unsigned long buffer_size); -- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); -+ char* FAADAPI (*NeAACDecGetErrorMessage)(unsigned char errcode); - #endif - -- void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); -+ void FAADAPI (*NeAACDecClose)(NeAACDecHandle hDecoder); - - - } FAACContext; -@@ -113,12 +113,12 @@ static int faac_init_mp4(AVCodecContext - int r = 0; - - if (avctx->extradata){ -- r = s->faacDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, -+ r = s->NeAACDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, - avctx->extradata_size, - &samplerate, &channels); - if (r < 0){ - av_log(avctx, AV_LOG_ERROR, -- "faacDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", -+ "NeAACDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", - r, samplerate, (long)channels, avctx->extradata_size); - } else { - avctx->sample_rate = samplerate; -@@ -141,13 +141,13 @@ static int faac_decode_frame(AVCodecCont - unsigned long samples; - int out; - #else -- faacDecFrameInfo frame_info; -+ NeAACDecFrameInfo frame_info; - void *out; - #endif - if(buf_size == 0) - return 0; - #ifndef FAAD2_VERSION -- out = s->faacDecDecode(s->faac_handle, -+ out = s->NeAACDecDecode(s->faac_handle, - (unsigned char*)buf, - &bytesconsumed, - data, -@@ -162,10 +162,10 @@ static int faac_decode_frame(AVCodecCont - if(!s->init){ - unsigned long srate; - unsigned char channels; -- int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels); -+ int r = s->NeAACDecInit(s->faac_handle, buf, buf_size, &srate, &channels); - if(r < 0){ - av_log(avctx, AV_LOG_ERROR, "faac: codec init failed: %s\n", -- s->faacDecGetErrorMessage(frame_info.error)); -+ s->NeAACDecGetErrorMessage(frame_info.error)); - return -1; - } - avctx->sample_rate = srate; -@@ -173,11 +173,11 @@ static int faac_decode_frame(AVCodecCont - s->init = 1; - } - -- out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); -+ out = s->NeAACDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); - - if (frame_info.error > 0) { - av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", -- s->faacDecGetErrorMessage(frame_info.error)); -+ s->NeAACDecGetErrorMessage(frame_info.error)); - return -1; - } - -@@ -196,8 +196,8 @@ static int faac_decode_end(AVCodecContex - { - FAACContext *s = (FAACContext *) avctx->priv_data; - -- if (s->faacDecClose) -- s->faacDecClose(s->faac_handle); -+ if (s->NeAACDecClose) -+ s->NeAACDecClose(s->faac_handle); - - dlclose(s->handle); - return 0; -@@ -206,7 +206,7 @@ static int faac_decode_end(AVCodecContex - static int faac_decode_init(AVCodecContext *avctx) - { - FAACContext *s = (FAACContext *) avctx->priv_data; -- faacDecConfigurationPtr faac_cfg; -+ NeAACDecConfigurationPtr faac_cfg; - - #ifdef CONFIG_LIBFAADBIN - const char* err = 0; -@@ -219,38 +219,38 @@ static int faac_decode_init(AVCodecConte - return -1; - } - #define dfaac(a, b) \ -- do { static const char* n = "faacDec" #a; \ -- if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) -+ do { static const char* n = "NeAACDec" #a; \ -+ if ((s->NeAACDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) - for(;;) { - #else /* !CONFIG_LIBFAADBIN */ --#define dfaac(a, b) s->faacDec ## a = faacDec ## a -+#define dfaac(a, b) s->NeAACDec ## a = NeAACDec ## a - #endif /* CONFIG_LIBFAADBIN */ - - // resolve all needed function calls -- dfaac(Open, (faacDecHandle FAADAPI (*)(void))); -- dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr -- FAADAPI (*)(faacDecHandle))); -+ dfaac(Open, (NeAACDecHandle FAADAPI (*)(void))); -+ dfaac(GetCurrentConfiguration, (NeAACDecConfigurationPtr -+ FAADAPI (*)(NeAACDecHandle))); - #ifndef FAAD2_VERSION -- dfaac(SetConfiguration, (int FAADAPI (*)(faacDecHandle, -- faacDecConfigurationPtr))); -+ dfaac(SetConfiguration, (int FAADAPI (*)(NeAACDecHandle, -+ NeAACDecConfigurationPtr))); - -- dfaac(Init, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long*, unsigned long*))); -- dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init2, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, - unsigned long*))); -- dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder))); -- dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Close, (void FAADAPI (*)(NeAACDecHandle hDecoder))); -+ dfaac(Decode, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long*, short*, unsigned long*))); - #else -- dfaac(SetConfiguration, (unsigned char FAADAPI (*)(faacDecHandle, -- faacDecConfigurationPtr))); -- dfaac(Init, (long FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(SetConfiguration, (unsigned char FAADAPI (*)(NeAACDecHandle, -+ NeAACDecConfigurationPtr))); -+ dfaac(Init, (long FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, unsigned char*))); -- dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init2, (char FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, - unsigned char*))); -- dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, -+ dfaac(Decode, (void *FAADAPI (*)(NeAACDecHandle, NeAACDecFrameInfo*, - unsigned char*, unsigned long))); - dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char))); - #endif -@@ -267,7 +267,7 @@ static int faac_decode_init(AVCodecConte - } - #endif - -- s->faac_handle = s->faacDecOpen(); -+ s->faac_handle = s->NeAACDecOpen(); - if (!s->faac_handle) { - av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot create handler!\n"); - faac_decode_end(avctx); -@@ -275,7 +275,7 @@ static int faac_decode_init(AVCodecConte - } - - -- faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); -+ faac_cfg = s->NeAACDecGetCurrentConfiguration(s->faac_handle); - - if (faac_cfg) { - switch (avctx->bits_per_sample) { -@@ -305,7 +305,7 @@ static int faac_decode_init(AVCodecConte - faac_cfg->defObjectType = LC; - } - -- s->faacDecSetConfiguration(s->faac_handle, faac_cfg); -+ s->NeAACDecSetConfiguration(s->faac_handle, faac_cfg); - - faac_init_mp4(avctx); - diff --git a/specs/ffmpeg/ffmpeg-20070109-gsm.patch b/specs/ffmpeg/ffmpeg-20070109-gsm.patch deleted file mode 100644 index e948a3755..000000000 --- a/specs/ffmpeg/ffmpeg-20070109-gsm.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr ffmpeg-20070109.orig/configure ffmpeg-20070109/configure ---- ffmpeg-20070109.orig/configure 2007-01-07 01:22:32.000000000 +0100 -+++ ffmpeg-20070109/configure 2007-01-09 16:26:37.000000000 +0100 -@@ -1481,7 +1481,7 @@ done - - # these are off by default, so fail if requested and not available - enabled libdts && require libdts dts.h dts_init -ldts -lm --enabled libgsm && require libgsm gsm.h gsm_create -lgsm -+enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm - enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm - enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg - enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg -diff -Naupr ffmpeg-20070109.orig/libavcodec/libgsm.c ffmpeg-20070109/libavcodec/libgsm.c ---- ffmpeg-20070109.orig/libavcodec/libgsm.c 2006-10-07 17:30:46.000000000 +0200 -+++ ffmpeg-20070109/libavcodec/libgsm.c 2007-01-09 16:26:54.000000000 +0100 -@@ -25,7 +25,7 @@ - */ - - #include "avcodec.h" --#include -+#include - - // gsm.h miss some essential constants - #define GSM_BLOCK_SIZE 33 diff --git a/specs/ffmpeg/ffmpeg-20070109.spec b/specs/ffmpeg/ffmpeg-20070109.spec deleted file mode 100644 index 45001c399..000000000 --- a/specs/ffmpeg/ffmpeg-20070109.spec +++ /dev/null @@ -1,351 +0,0 @@ -# $Id$ -# Authority: dag - -# ExclusiveDist: el3 - -%{?el4:%define _without_texi2html 1} -%{?el3:%define _without_dts 1} -%{?el3:%define _without_texi2html 1} - -%define date 20070109 - -Summary: Utilities and libraries to record, convert and stream audio and video -Name: ffmpeg -Version: 0.4.9 -Release: 0.10%{?date:.%{date}}%{?dist} -License: GPL -Group: Applications/Multimedia -URL: http://ffmpeg.org/ - -# svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg -# find ffmpeg -name .svn | xargs rm -rf -# then rename the directory and compress -Source: ffmpeg-%{date}.tar.bz2 -Patch0: ffmpeg-20070109-gsm.patch -Patch1: ffmpeg-20070109-faad2.patch -Patch2: ffmpeg-0.4.9_p20080326-libx264.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -BuildRequires: SDL-devel -BuildRequires: freetype-devel -BuildRequires: imlib2-devel -BuildRequires: zlib-devel -%{!?_without_a52dec:BuildRequires: a52dec-devel} -%{!?_without_dts:BuildRequires: libdca-devel} -%{!?_without_faac:BuildRequires: faac-devel} -%{!?_without_faad:BuildRequires: faad2-devel} -%{!?_without_gsm:BuildRequires: gsm-devel} -%{!?_without_lame:BuildRequires: lame-devel} -%{!?_without_texi2html:BuildRequires: texi2html} -%{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel} -%{!?_without_x264:BuildRequires: x264-devel} -%{!?_without_xvid:BuildRequires: xvidcore-devel} -%{!?_without_a52dec:Requires: a52dec} - -%description -FFmpeg is a very fast video and audio converter. It can also grab from a -live audio/video source. -The command line interface is designed to be intuitive, in the sense that -ffmpeg tries to figure out all the parameters, when possible. You have -usually to give only the target bitrate you want. FFmpeg can also convert -from any sample rate to any other, and resize video on the fly with a high -quality polyphase filter. - -Available rpmbuild rebuild options : ---without : lame vorbis faad faac gsm xvid x264 a52dec dts altivec - -%package devel -Summary: Header files and static library for the ffmpeg codec library -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig -%{!?_without_a52dec:Requires: a52dec-devel} -%{!?_without_dts:Requires: libdca-devel} -%{!?_without_faac:Requires: faac-devel} -%{!?_without_faad:Requires: faad2-devel} -%{!?_without_gsm:Requires: gsm-devel} -%{!?_without_lame:Requires: lame-devel} -%{!?_without_vorbis:Requires: libogg-devel, libvorbis-devel} -%{!?_without_x264:Requires: x264-devel} -%{!?_without_xvid:Requires: xvidcore-devel} - -%description devel -FFmpeg is a very fast video and audio converter. It can also grab from a -live audio/video source. -The command line interface is designed to be intuitive, in the sense that -ffmpeg tries to figure out all the parameters, when possible. You have -usually to give only the target bitrate you want. FFmpeg can also convert -from any sample rate to any other, and resize video on the fly with a high -quality polyphase filter. - -Install this package if you want to compile apps with ffmpeg support. - -%package libpostproc -Summary: Video postprocessing library from ffmpeg -Group: System Environment/Libraries -Provides: ffmpeg-libpostproc-devel = %{version}-%{release} -Provides: libpostproc = 1.0-1 -Provides: libpostproc-devel = 1.0-1 -Obsoletes: libpostproc < 1.0-1 -Obsoletes: libpostproc-devel < 1.0-1 -Requires: pkgconfig - -%description libpostproc -FFmpeg is a very fast video and audio converter. It can also grab from a -live audio/video source. - -This package contains only ffmpeg's libpostproc post-processing library which -other projects such as transcode may use. Install this package if you intend -to use MPlayer, transcode or other similar programs. - -%prep -%setup -n ffmpeg-%{date} -%patch0 -p1 -b .gsm -%patch1 -p1 -b .faad2 -%patch2 -p1 -b .x264 - -%build -export CFLAGS="%{optflags}" -# We should be using --disable-opts since configure is adding some default opts -# to ours (-O3), but as of 20061215 the build fails on asm stuff when it's set -./configure \ - --prefix="%{_prefix}" \ - --libdir="%{_libdir}" \ - --shlibdir="%{_libdir}" \ - --mandir="%{_mandir}" \ - --incdir="%{_includedir}/ffmpeg" \ - --disable-static \ - --disable-strip \ -%ifarch x86_64 - --extra-cflags="-fPIC" \ -%endif -%{!?_without_a52:--enable-a52 --enable-a52bin} \ -%{!?_without_dts:--enable-dts} \ -%{!?_without_faac:--enable-faac} \ -%{!?_without_faad:--enable-faad} \ -%{!?_without_gsm:--enable-libgsm} \ -%{!?_without_lame:--enable-mp3lame} \ -%{!?_without_vorbis:--enable-libogg --enable-vorbis} \ -%{!?_without_x264:--enable-x264} \ -%{!?_without_xvid:--enable-xvid} \ - --enable-gpl \ - --enable-pp \ - --enable-pthreads \ - --enable-shared \ - --enable-swscaler -%{__make} %{?_smp_mflags} - - -%install -%{__rm} -rf %{buildroot} _docs -%{__make} install DESTDIR="%{buildroot}" - -# Remove unwanted files from the included docs -%{__cp} -a doc _docs -%{__rm} -rf _docs/{Makefile,*.texi,*.pl} - -# The is now at , so provide -# a compatibility symlink -#%{__mkdir_p} %{buildroot}%{_includedir}/postproc/ -#%{__ln_s} ../ffmpeg/postprocess.h %{buildroot}%{_includedir}/postproc/postprocess.h - -%clean -%{__rm} -rf %{buildroot} - -%post -/sbin/ldconfig -chcon -t textrel_shlib_t %{_libdir}/libav{codec,format,util}.so.*.*.* \ - &>/dev/null || : - -%postun -p /sbin/ldconfig - -%post libpostproc -p /sbin/ldconfig -%postun libpostproc -p /sbin/ldconfig - -%files -%defattr(-, root, root, 0755) -%doc Changelog COPYING CREDITS README -%doc %{_mandir}/man1/ffmpeg.1* -%doc %{_mandir}/man1/ffplay.1* -%doc %{_mandir}/man1/ffserver.1* -%{_bindir}/ffmpeg -%{_bindir}/ffplay -%{_bindir}/ffserver -%{_libdir}/libavcodec.so.* -%{_libdir}/libavformat.so.* -%{_libdir}/libavutil.so.* -%{_libdir}/libswscale.so.* -%{_libdir}/vhook/ -%exclude %{_libdir}/libpostproc.so* - -%files devel -%defattr(-, root, root, 0755) -%doc _docs/* -%{_includedir}/ffmpeg/ -%{_libdir}/libavcodec.so -%{_libdir}/libavformat.so -%{_libdir}/libavutil.so -%{_libdir}/libswscale.so -%{_libdir}/pkgconfig/libavcodec.pc -%{_libdir}/pkgconfig/libavformat.pc -%{_libdir}/pkgconfig/libavutil.pc -%{_libdir}/pkgconfig/libswscale.pc -%exclude %{_libdir}/pkgconfig/libpostproc.pc - -%files libpostproc -%defattr(-, root, root, 0755) -%{_includedir}/postproc/ -%{_libdir}/libpostproc.so* -%{_libdir}/pkgconfig/libpostproc.pc - -%changelog -* Thu Jul 09 2009 Dag Wieers - 0.4.9-0.10.20070109 -- Rebuild against x264-0.4.20090708. - -* Mon Jun 04 2007 Dag Wieers - 0.4.9-0.9.20070109 -- Rebuild against x264-0.4.20070529 because I missed it. - -* Tue Jan 9 2007 Matthias Saou 0.4.9-0.8.20070109 -- Update to today's SVN codebase, fixes the non existing ffmpeg.pc refrence. -- Add faad2 patch. - -* Fri Dec 15 2006 Matthias Saou 0.4.9-0.7.20061215 -- Update to today's SVN codebase. -- Update gsm patch so that it still applies. -- Remove no longer needed x264 patch. -- Remove --disable-opts option for now, as the build fails without. It seems - like an option from -O3 might be required for inline asm to work on x86. - -* Tue Oct 24 2006 Matthias Saou 0.4.9-0.7.20060918 -- Try to update, but stick with 20060918 as linking "as needed" is causing - too much trouble for now (libdca and libmp3lame with libm functions). -- Include patch to work with latest x264. -- Update URL and remove non-%%date stuff since there are no more releases. -- Change group to Applications/Multimedia since ffmpeg is an application. -- Remove dc1394 support since the lib isn't available anymore anyway. - -* Mon Sep 18 2006 Matthias Saou 0.4.9-0.6.20060918 -- Update to today's SVN codebase. -- Remove theora support, it seems to be gone... -- Remove a52 patch as ffmpeg doesn't link against it anyway. -- Make installlib works again, so don't manually install anymore. -- Remove all prever stuff that hasn't been useful in ages. -- Change postproc/postprocess.h to be a symlink. - -* Fri May 12 2006 Matthias Saou 0.4.9-0.5.20060317 -- Change selinux library context in %%post to allow text relocation. - -* Fri Mar 17 2006 Matthias Saou 0.4.9-0.4.20060317 -- Update to CVS snapshot. -- The libraries are versionned at last, so no longer use the autoreqprov hack. -- Override incdir to get install to work properly. -- Provide a postprocess.h compatibility copy. - -* Wed Dec 7 2005 Matthias Saou 0.4.9-0.3.20051207 -- Update to CVS snapshot. -- Added theora, gsm, x264, dts and dc1394 rebuild options, all on by default. -- Nope, disable dc1394, as it fails to build. -- Add GSM patch -> -- Enable pthreads explicitly, as the build fails otherwise. -- Include new pkgconfig files, add pkgconfig requirements to devel packages. -- Add new libavutil.so* provides. -- Rename libpostproc package to ffmpeg-libpostproc, in order to make things - easier to obsolete the old mplayer sub-package. -- No longer use %%configure, since --host makes the script stop. -- No longer explicitly disable MMX for non-x86 (works again on x86_64). - -* Tue May 3 2005 Matthias Saou 0.4.9-0.20050427.1 -- Downgrade to 20050427 since avcodec.h is missing AVCodecContext otherwise. -- Re-enable upgrade path for FC3. - -* Tue May 3 2005 Matthias Saou 0.4.9-0.1.20050502 -- Update and include patches from Enrico to fix gcc4 build. -- Remove no longer include static libs from the devel package. -- Remove no longer required explicit requirements. -- Clean up obsolete stuff from the build : separate libpostproc compile etc. - -* Sun Apr 17 2005 Matthias Saou 0.4.9-0.1.20050417 -- Update to today's snapshot (no upgrade path, but that shouldn't matter). -- Disable patch3 as it's nowhere to be found :-( -- Added theora... hmm, nope, the build is broken. - -* Sat Jan 15 2005 Dag Wieers - 0.4.9-0.20041110.3 -- Exclude libpostproc.so* from ffmpeg package. - -* Sun Nov 21 2004 Matthias Saou 0.4.9-0.20041110.2 -- Put back explicit requirements since some (all?) don't get properly added - automatically, like faad2 (thanks to Holden McGroin). - -* Tue Nov 16 2004 Matthias Saou 0.4.9-0.20041110.1 -- Update to latest CVS snaphsot. -- Explicitely disable mmx on non-x86 to fix x86_64 build. -- Add -fPIC to --extra-cflags on non-x86 to fix x86_64 build, as it seems mmx - and pic are mutually exclusive (build fails with both). - -* Tue Nov 2 2004 Matthias Saou 0.4.9-0.20041102.1 -- Update to 20040926 CVS to fix FC3 compilation problems... not! -- Moved OPTFLAGS to --extra-cflags configure option... no better! -- Add HAVE_LRINTF workaround to fix compile failure... yeah, one less. -- Disable -fPIC, libpostproc breaks with it enabled... argh :-( -- ...I give up, disable a52 for now. - -* Mon Sep 27 2004 Matthias Saou 0.4.9-0.pre1.1 -- Update to 0.4.9-pre1. -- Enable GPL, pp, shared and shared-pp! -- Add sharedpp and nostrip patches from livna.org rpm. -- Add PIC vs. __PIC__ patch. -- Re-enable MMX. -- Add mandatory -fomit-frame-pointer flag to not bomb on compile. -- Added man pages. -- Added -UUSE_FASTMEMCPY for libpostproc, otherwise we get : - libpostproc.so.0: undefined reference to `fast_memcpy' - -* Mon Aug 2 2004 Matthias Saou 0.4.8-3 -- Removed explicit binary dependencies. -- Removed faac support, it doesn't exist. -- Seems like Imlib2 support is broken... -- Added missing -devel requirements for the -devel package. - -* Thu Jun 03 2004 Dag Wieers - 0.4.8-3 -- Fixes for building for x86_64 architecture. - -* Tue May 18 2004 Matthias Saou 0.4.8-3 -- Rebuilt for Fedora Core 2. - -* Sat Feb 21 2004 Matthias Saou 0.4.8-2 -- Add faac support. -- Enable pp. -- Remove unneeded explicit main a52dec dependency. - -* Fri Nov 7 2003 Matthias Saou 0.4.8-1 -- Update to 0.4.8. -- Steal some changes back from Troy Engel : Disabling mmx to make the build - succeed and added man pages. -- Re-enabled auto provides but added explicit libavcodec.so and libavformat.so. -- Rebuild for Fedora Core 1. - -* Mon Aug 25 2003 Matthias Saou -- Update to 0.4.7. - -* Fri Aug 8 2003 Matthias Saou -- Update to todays's snapshot. - -* Tue Jul 1 2003 Matthias Saou -- Update to a CVS snapshot as videolan-client 0.6.0 needs it. -- Enable faad, imlib2 and SDL support. -- Force OPTFLAGS to remove -mcpu, -march and -pipe that all prevent building! - -* Mon Mar 31 2003 Matthias Saou -- Rebuilt for Red Hat Linux 9. -- Hardcode provides in order to get it right :-/ - -* Tue Feb 25 2002 Matthias Saou -- Moved libavcodec.so to the main package to fix dependency problems. - -* Wed Feb 19 2002 Matthias Saou -- Major spec file updates, based on a very nice Mandrake spec. -- Revert to the 0.4.6 release as CVS snapshots don't build. - -* Tue Feb 4 2002 Matthias Saou -- Initial RPM release. - diff --git a/specs/ffmpeg/ffmpeg-20070530-faad2.patch b/specs/ffmpeg/ffmpeg-20070530-faad2.patch deleted file mode 100644 index 689d15d60..000000000 --- a/specs/ffmpeg/ffmpeg-20070530-faad2.patch +++ /dev/null @@ -1,232 +0,0 @@ -diff -Naupr ffmpeg-20070530.orig/configure ffmpeg-20070530/configure ---- ffmpeg-20070530.orig/configure 2007-05-27 18:31:02.000000000 +0200 -+++ ffmpeg-20070530/configure 2007-05-30 21:02:05.000000000 +0200 -@@ -1635,7 +1635,7 @@ enabled x264 && require x264 x264. - enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 - enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib - enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac --enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad -+enabled libfaad && require2 libfaad faad.h NeAACDecOpen -lfaad - enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32 - - # test for lrintf in math.h -diff -Naupr ffmpeg-20070530.orig/libavcodec/faad.c ffmpeg-20070530/libavcodec/faad.c ---- ffmpeg-20070530.orig/libavcodec/faad.c 2007-04-08 22:24:16.000000000 +0200 -+++ ffmpeg-20070530/libavcodec/faad.c 2007-05-30 21:03:22.000000000 +0200 -@@ -55,42 +55,42 @@ typedef struct { - int init; - - /* faad calls */ -- faacDecHandle FAADAPI (*faacDecOpen)(void); -- faacDecConfigurationPtr FAADAPI (*faacDecGetCurrentConfiguration)(faacDecHandle hDecoder); -+ NeAACDecHandle FAADAPI (*NeAACDecOpen)(void); -+ NeAACDecConfigurationPtr FAADAPI (*NeAACDecGetCurrentConfiguration)(NeAACDecHandle hDecoder); - #ifndef FAAD2_VERSION -- int FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, -- faacDecConfigurationPtr config); -- int FAADAPI (*faacDecInit)(faacDecHandle hDecoder, -+ int FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, -+ NeAACDecConfigurationPtr config); -+ int FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long *samplerate, - unsigned long *channels); -- int FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, -+ int FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, - unsigned long SizeOfDecoderSpecificInfo, - unsigned long *samplerate, unsigned long *channels); -- int FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, -+ int FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long *bytesconsumed, - short *sample_buffer, - unsigned long *samples); - #else -- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, -- faacDecConfigurationPtr config); -- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder, -+ unsigned char FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, -+ NeAACDecConfigurationPtr config); -+ long FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long buffer_size, - unsigned long *samplerate, - unsigned char *channels); -- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, -+ char FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, - unsigned long SizeOfDecoderSpecificInfo, - unsigned long *samplerate, unsigned char *channels); -- void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, -- faacDecFrameInfo *hInfo, -+ void *FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, -+ NeAACDecFrameInfo *hInfo, - unsigned char *buffer, - unsigned long buffer_size); -- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); -+ char* FAADAPI (*NeAACDecGetErrorMessage)(unsigned char errcode); - #endif - -- void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); -+ void FAADAPI (*NeAACDecClose)(NeAACDecHandle hDecoder); - - - } FAACContext; -@@ -113,12 +113,12 @@ static int faac_init_mp4(AVCodecContext - int r = 0; - - if (avctx->extradata){ -- r = s->faacDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, -+ r = s->NeAACDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, - avctx->extradata_size, - &samplerate, &channels); - if (r < 0){ - av_log(avctx, AV_LOG_ERROR, -- "faacDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", -+ "NeAACDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", - r, samplerate, (long)channels, avctx->extradata_size); - } else { - avctx->sample_rate = samplerate; -@@ -141,13 +141,13 @@ static int faac_decode_frame(AVCodecCont - unsigned long samples; - int out; - #else -- faacDecFrameInfo frame_info; -+ NeAACDecFrameInfo frame_info; - void *out; - #endif - if(buf_size == 0) - return 0; - #ifndef FAAD2_VERSION -- out = s->faacDecDecode(s->faac_handle, -+ out = s->NeAACDecDecode(s->faac_handle, - (unsigned char*)buf, - &bytesconsumed, - data, -@@ -162,10 +162,10 @@ static int faac_decode_frame(AVCodecCont - if(!s->init){ - unsigned long srate; - unsigned char channels; -- int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels); -+ int r = s->NeAACDecInit(s->faac_handle, buf, buf_size, &srate, &channels); - if(r < 0){ - av_log(avctx, AV_LOG_ERROR, "faac: codec init failed: %s\n", -- s->faacDecGetErrorMessage(frame_info.error)); -+ s->NeAACDecGetErrorMessage(frame_info.error)); - return -1; - } - avctx->sample_rate = srate; -@@ -173,11 +173,11 @@ static int faac_decode_frame(AVCodecCont - s->init = 1; - } - -- out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); -+ out = s->NeAACDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); - - if (frame_info.error > 0) { - av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", -- s->faacDecGetErrorMessage(frame_info.error)); -+ s->NeAACDecGetErrorMessage(frame_info.error)); - return -1; - } - -@@ -196,7 +196,7 @@ static int faac_decode_end(AVCodecContex - { - FAACContext *s = avctx->priv_data; - -- s->faacDecClose(s->faac_handle); -+ s->NeAACDecClose(s->faac_handle); - - dlclose(s->handle); - return 0; -@@ -205,7 +205,7 @@ static int faac_decode_end(AVCodecContex - static int faac_decode_init(AVCodecContext *avctx) - { - FAACContext *s = avctx->priv_data; -- faacDecConfigurationPtr faac_cfg; -+ NeAACDecConfigurationPtr faac_cfg; - - #ifdef CONFIG_LIBFAADBIN - const char* err = 0; -@@ -218,38 +218,38 @@ static int faac_decode_init(AVCodecConte - return -1; - } - #define dfaac(a, b) \ -- do { static const char* n = "faacDec" #a; \ -- if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) -+ do { static const char* n = "NeAACDec" #a; \ -+ if ((s->NeAACDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) - for(;;) { - #else /* !CONFIG_LIBFAADBIN */ --#define dfaac(a, b) s->faacDec ## a = faacDec ## a -+#define dfaac(a, b) s->NeAACDec ## a = NeAACDec ## a - #endif /* CONFIG_LIBFAADBIN */ - - // resolve all needed function calls -- dfaac(Open, (faacDecHandle FAADAPI (*)(void))); -- dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder))); -- dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr -- FAADAPI (*)(faacDecHandle))); -+ dfaac(Open, (NeAACDecHandle FAADAPI (*)(void))); -+ dfaac(Close, (void FAADAPI (*)(NeAACDecHandle hDecoder))); -+ dfaac(GetCurrentConfiguration, (NeAACDecConfigurationPtr -+ FAADAPI (*)(NeAACDecHandle))); - #ifndef FAAD2_VERSION -- dfaac(SetConfiguration, (int FAADAPI (*)(faacDecHandle, -- faacDecConfigurationPtr))); -+ dfaac(SetConfiguration, (int FAADAPI (*)(NeAACDecHandle, -+ NeAACDecConfigurationPtr))); - -- dfaac(Init, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long*, unsigned long*))); -- dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init2, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, - unsigned long*))); -- dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Decode, (int FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long*, short*, unsigned long*))); - #else -- dfaac(SetConfiguration, (unsigned char FAADAPI (*)(faacDecHandle, -- faacDecConfigurationPtr))); -- dfaac(Init, (long FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(SetConfiguration, (unsigned char FAADAPI (*)(NeAACDecHandle, -+ NeAACDecConfigurationPtr))); -+ dfaac(Init, (long FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, unsigned char*))); -- dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*, -+ dfaac(Init2, (char FAADAPI (*)(NeAACDecHandle, unsigned char*, - unsigned long, unsigned long*, - unsigned char*))); -- dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, -+ dfaac(Decode, (void *FAADAPI (*)(NeAACDecHandle, NeAACDecFrameInfo*, - unsigned char*, unsigned long))); - dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char))); - #endif -@@ -266,7 +266,7 @@ static int faac_decode_init(AVCodecConte - } - #endif - -- s->faac_handle = s->faacDecOpen(); -+ s->faac_handle = s->NeAACDecOpen(); - if (!s->faac_handle) { - av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot create handler!\n"); - faac_decode_end(avctx); -@@ -274,7 +274,7 @@ static int faac_decode_init(AVCodecConte - } - - -- faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); -+ faac_cfg = s->NeAACDecGetCurrentConfiguration(s->faac_handle); - - if (faac_cfg) { - switch (avctx->bits_per_sample) { -@@ -304,7 +304,7 @@ static int faac_decode_init(AVCodecConte - faac_cfg->defObjectType = LC; - } - -- s->faacDecSetConfiguration(s->faac_handle, faac_cfg); -+ s->NeAACDecSetConfiguration(s->faac_handle, faac_cfg); - - faac_init_mp4(avctx); - diff --git a/specs/ffmpeg/ffmpeg-20070530-gsm.patch b/specs/ffmpeg/ffmpeg-20070530-gsm.patch deleted file mode 100644 index 8a5e105cf..000000000 --- a/specs/ffmpeg/ffmpeg-20070530-gsm.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr ffmpeg-20070530.orig/configure ffmpeg-20070530/configure ---- ffmpeg-20070530.orig/configure 2007-05-27 18:31:02.000000000 +0200 -+++ ffmpeg-20070530/configure 2007-05-30 20:58:15.000000000 +0200 -@@ -1624,7 +1624,7 @@ enabled_any libamr_nb libamr_wb && enabl - enabled liba52 && require liba52 a52dec/a52.h a52_init -la52 - enabled libamr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm - enabled libamr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm --enabled libgsm && require libgsm gsm.h gsm_create -lgsm -+enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm - enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm - enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg - enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg -diff -Naupr ffmpeg-20070530.orig/libavcodec/libgsm.c ffmpeg-20070530/libavcodec/libgsm.c ---- ffmpeg-20070530.orig/libavcodec/libgsm.c 2007-02-20 12:09:47.000000000 +0100 -+++ ffmpeg-20070530/libavcodec/libgsm.c 2007-05-30 20:58:55.000000000 +0200 -@@ -28,7 +28,7 @@ - // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - - #include "avcodec.h" --#include -+#include - - // gsm.h miss some essential constants - #define GSM_BLOCK_SIZE 33 diff --git a/specs/ffmpeg/ffmpeg.spec b/specs/ffmpeg/ffmpeg.spec index ca37c3c17..a1d758c1a 100644 --- a/specs/ffmpeg/ffmpeg.spec +++ b/specs/ffmpeg/ffmpeg.spec @@ -3,8 +3,6 @@ ### No package yet %define _without_nut 1 -%define _without_openjpeg 1 -%define _without_vpx 1 ### Use native vorbis %define _without_vorbis 1 @@ -29,7 +27,6 @@ %{?el4:%define _without_vdpau 1} %{?el3:%define _without_dc1394 1} -%{?el3:%define _without_dirac 1} %{?el3:%define _without_rtmp 1} %{?el3:%define _without_schroedinger 1} %{?el3:%define _without_speex 1} @@ -40,7 +37,7 @@ Summary: Utilities and libraries to record, convert and stream audio and video Name: ffmpeg -Version: 0.6.5 +Version: 3.0 Release: 1%{?dist} License: GPL Group: Applications/Multimedia @@ -53,11 +50,7 @@ BuildRequires: SDL-devel BuildRequires: freetype-devel BuildRequires: imlib2-devel BuildRequires: zlib-devel -%{!?_without_a52dec:BuildRequires: a52dec-devel} %{!?_without_dc1394:BuildRequires: libdc1394-devel} -%{!?_without_dirac:BuildRequires: dirac-devel} -%{!?_without_faac:BuildRequires: faac-devel} -%{!?_without_faad:BuildRequires: faad2-devel} %{!?_without_gsm:BuildRequires: gsm-devel} %{!?_without_lame:BuildRequires: lame-devel} %{!?_without_nut:BuildRequires: libnut-devel} @@ -71,8 +64,9 @@ BuildRequires: zlib-devel %{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel} %{!?_without_vpx:BuildRequires: libvpx-devel} %{!?_without_x264:BuildRequires: x264-devel} +%{!?_without_x265:BuildRequires: x265-devel} %{!?_without_xvid:BuildRequires: xvidcore-devel} -%{!?_without_a52dec:Requires: a52dec} +%{!?_without_fdk_aac:BuildRequires: fdk-aac-devel} %description FFmpeg is a very fast video and audio converter. It can also grab from a @@ -84,18 +78,14 @@ from any sample rate to any other, and resize video on the fly with a high quality polyphase filter. Available rpmbuild rebuild options : ---without : lame vorbis theora faad faac gsm xvid x264 a52dec altivec +--without : lame vorbis theora faad faac gsm xvid x264 altivec %package devel Summary: Header files and static library for the ffmpeg codec library Group: Development/Libraries Requires: %{name} = %{version} Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig -%{!?_without_a52dec:Requires: a52dec-devel} %{!?_without_dc1394:Requires: libdc1394-devel} -%{!?_without_dirac:Requires: dirac-devel} -%{!?_without_faac:Requires: faac-devel} -%{!?_without_faad:Requires: faad2-devel} %{!?_without_gsm:Requires: gsm-devel} %{!?_without_lame:Requires: lame-devel} %{!?_without_opencore_amr:Requires: opencore-amr-devel} @@ -106,7 +96,9 @@ Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig %{!?_without_vorbis:Requires: libogg-devel, libvorbis-devel} %{!?_without_vpx:Requires: libvpx-devel} %{!?_without_x264:Requires: x264-devel} +%{!?_without_x265:Requires: x265-devel} %{!?_without_xvid:Requires: xvidcore-devel} +%{!?_without_fdk_aac:Requires: fdk-aac-devel} %description devel FFmpeg is a very fast video and audio converter. It can also grab from a @@ -159,12 +151,9 @@ export CFLAGS="%{optflags}" %ifarch x86_64 --extra-cflags="%{optflags} -fPIC" \ %endif + %{!?_without_fdk_aac:--ld=g++} \ --enable-avfilter \ - --enable-avfilter-lavf \ %{!?_without_dc1394:--enable-libdc1394} \ -%{!?_without_dirac:--enable-libdirac} \ -%{!?_without_faac:--enable-libfaac} \ -%{!?_without_faad:--enable-libfaad --enable-libfaadbin} \ %{!?_without_gsm:--enable-libgsm} \ %{!?_without_lame:--enable-libmp3lame} \ %{!?_without_nut:--enable-libnut} \ @@ -176,6 +165,8 @@ export CFLAGS="%{optflags}" %{!?_without_vorbis: --enable-libvorbis} \ %{!?_without_vpx: --enable-libvpx} \ %{!?_without_x264:--enable-libx264} \ +%{!?_without_x265:--enable-libx265} \ +%{!?_without_fdk_aac:--enable-libfdk-aac} \ %{!?_without_xvid:--enable-libxvid} \ --enable-gpl \ --enable-nonfree \ @@ -217,11 +208,32 @@ chcon -t textrel_shlib_t %{_libdir}/libav{codec,device,format,util}.so.*.*.* &>/ %files %defattr(-, root, root, 0755) -%doc Changelog COPYING* CREDITS INSTALL MAINTAINERS README -%doc %{_mandir}/man1/ffprobe.1* +%doc Changelog COPYING* CREDITS INSTALL.md MAINTAINERS LICENSE.md README.md %doc %{_mandir}/man1/ffmpeg.1* +%doc %{_mandir}/man1/ffmpeg-all.1* +%doc %{_mandir}/man1/ffmpeg-bitstream-filters.1* +%doc %{_mandir}/man1/ffmpeg-codecs.1* +%doc %{_mandir}/man1/ffmpeg-devices.1* +%doc %{_mandir}/man1/ffmpeg-filters.1* +%doc %{_mandir}/man1/ffmpeg-formats.1* +%doc %{_mandir}/man1/ffmpeg-protocols.1* +%doc %{_mandir}/man1/ffmpeg-resampler.1* +%doc %{_mandir}/man1/ffmpeg-scaler.1* +%doc %{_mandir}/man1/ffmpeg-utils.1* %doc %{_mandir}/man1/ffplay.1* +%doc %{_mandir}/man1/ffplay-all.1* +%doc %{_mandir}/man1/ffprobe.1* +%doc %{_mandir}/man1/ffprobe-all.1* %doc %{_mandir}/man1/ffserver.1* +%doc %{_mandir}/man1/ffserver-all.1* +%doc %{_mandir}/man3/libavcodec.3* +%doc %{_mandir}/man3/libavdevice.3* +%doc %{_mandir}/man3/libavfilter.3* +%doc %{_mandir}/man3/libavformat.3* +%doc %{_mandir}/man3/libavutil.3* +%doc %{_mandir}/man3/libswresample.3* +%doc %{_mandir}/man3/libswscale.3* +%doc %{_docdir}/ffmpeg/*.html %{_bindir}/ffprobe %{_bindir}/ffmpeg %{_bindir}/ffplay @@ -233,6 +245,7 @@ chcon -t textrel_shlib_t %{_libdir}/libav{codec,device,format,util}.so.*.*.* &>/ %{_libdir}/libavformat.so.* %{_libdir}/libavutil.so.* %{_libdir}/libswscale.so.* +%{_libdir}/libswresample.so.* #%{_libdir}/vhook/ %files devel @@ -244,24 +257,28 @@ chcon -t textrel_shlib_t %{_libdir}/libav{codec,device,format,util}.so.*.*.* &>/ %{_includedir}/libavformat/ %{_includedir}/libavutil/ %{_includedir}/libswscale/ +%{_includedir}/libswresample/ %{_libdir}/libavcodec.a %{_libdir}/libavdevice.a %{_libdir}/libavfilter.a %{_libdir}/libavformat.a %{_libdir}/libavutil.a %{_libdir}/libswscale.a +%{_libdir}/libswresample.a %{_libdir}/libavcodec.so %{_libdir}/libavdevice.so %{_libdir}/libavfilter.so %{_libdir}/libavformat.so %{_libdir}/libavutil.so %{_libdir}/libswscale.so +%{_libdir}/libswresample.so %{_libdir}/pkgconfig/libavcodec.pc %{_libdir}/pkgconfig/libavdevice.pc %{_libdir}/pkgconfig/libavfilter.pc %{_libdir}/pkgconfig/libavformat.pc %{_libdir}/pkgconfig/libavutil.pc %{_libdir}/pkgconfig/libswscale.pc +%{_libdir}/pkgconfig/libswresample.pc %files libpostproc %defattr(-, root, root, 0755) @@ -272,6 +289,9 @@ chcon -t textrel_shlib_t %{_libdir}/libav{codec,device,format,util}.so.*.*.* &>/ %{_libdir}/pkgconfig/libpostproc.pc %changelog +* Tue Feb 23 2016 Moriyoshi Koizumi - 3.0-1 +- Updated to release 3.0. + * Sun Jan 29 2012 Dag Wieers - 0.6.5-1 - Updated to release 0.6.5.