From 839b76733a0f54e10c46d69551ef66b7ab5ae054 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Tue, 21 Aug 2012 18:30:36 +0900 Subject: [PATCH] 2.0_beta --- debian/changelog | 131 +++++++++++++++++++++++++++++++------- debian/control | 12 ++++ debian/libavfilter-dev.install.in | 2 + debian/libavfilter.install.in | 1 + debian/rules | 10 ++- packaging/ffmpeg.spec | 52 ++++++++++----- 6 files changed, 169 insertions(+), 39 deletions(-) create mode 100755 debian/libavfilter-dev.install.in create mode 100755 debian/libavfilter.install.in diff --git a/debian/changelog b/debian/changelog index 8fae593..9e620ef 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,45 +1,132 @@ -ffmpeg (0.8.5-4) unstable; urgency=low +ffmpeg (0.8.5-15) unstable; urgency=low + + * enable pcm alaw, mulaw decoder to support OSP + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-15 + + -- root Mon, 13 Aug 2012 18:56:43 +0900 + +ffmpeg (0.8.5-14) unstable; urgency=low + + * just version up + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-14 + + -- Haejeong Kim Mon, 04 Jun 2012 11:21:23 +0900 + +ffmpeg (0.8.5-13) unstable; urgency=low + + * enable some fileters to support OSP + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-13 + + -- Haejeong Kim Thu, 31 May 2012 18:45:38 +0900 + +ffmpeg (0.8.5-12) unstable; urgency=low + + * enable msmpeg4v3 decoder + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-12 + + -- Haejeong Kim Tue, 03 Apr 2012 14:07:27 +0900 + +ffmpeg (0.8.5-11) unstable; urgency=low + + * update spec file + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-11 + + -- Haejeong Kim Thu, 22 Mar 2012 12:08:45 +0900 + +ffmpeg (0.8.5-10) unstable; urgency=low + + * remove useless avdevice related install files + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-10 + + -- Haejeong Kim Wed, 22 Feb 2012 10:22:52 +0900 + +ffmpeg (0.8.5-9) unstable; urgency=low + + * enable encoder h263, h263p, mpeg4 to support BADA + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-9 + + -- Haejoeng Kim Fri, 10 Feb 2012 09:51:40 +0900 + +ffmpeg (0.8.5-8) unstable; urgency=low * bug fix. ffmpeg can't extract year (WM/Year) of wma format. - * Git : unmodified/ffmpeg - * Tag : ffmpeg_0.8.5-4 + * enable aac encoder to support BADA. + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-8 -- Haejeong Kim Fri, 03 Feb 2012 10:01:52 +0900 -ffmpeg (0.8.5-3) unstable; urgency=low +ffmpeg (0.8.5-7) unstable; urgency=low - * disable unused options : filter, bsf, protocol - * Git : unmodified/ffmpeg - * Tag : ffmpeg_0.8.5-3 + * disable unused options -> filter, bsf, protocol + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-7 -- Haejeong Kim Thu, 05 Jan 2012 10:07:01 +0900 -ffmpeg (0.8.5-2) unstable; urgency=low +ffmpeg (0.8.5-6) unstable; urgency=low - * enable some codecs + * enable codec to support BADA platform. * bmp : enc/dec, tif : dec * mp3/amrnb/aac : dec - * aac, h263, h263p, mpeg4 : enc - * Git : unmodified/ffmpeg - * Tag : ffmpeg_0.8.5-2 + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-6 -- Haejeong Kim Wed, 04 Jan 2012 11:12:54 +0900 -ffmpeg (0.8.5-1) unstable; urgency=low +ffmpeg (0.8.5-5) unstable; urgency=low - * bug fix. - * 1. some m4a(aac) file's info is 0. + * patch code to fix bugs. + * 1. some m4a(aac) file's info is 0. * 2. some m4a(aac) and ogg file's find stream info fail. - * Git : unmodified/ffmpeg - * Tag : ffmpeg_0.8.5-1 + * Git : slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-5 -- Haejeong Kim Tue, 03 Jan 2012 15:18:04 +0900 -ffmpeg (0.8.5) unstable; urgency=low +ffmpeg (0.8.5-4) unstable; urgency=low + + * disable build avfilter and avdevice + * Git : 165.213.180.234:slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-4 + + -- Haejeong Kim Fri, 09 Dec 2011 13:07:57 +0900 + +ffmpeg (0.8.5-3) unstable; urgency=low + + * add option. --disable-version3 + * Git : 165.213.180.234:slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-3 + + -- Haejeong Kim Wed, 07 Dec 2011 14:08:15 +0900 + +ffmpeg (0.8.5-2) unstable; urgency=low + + * dependency error fix + * Git : 165.213.180.234:slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-2 + + -- root Wed, 07 Dec 2011 10:22:56 +0900 + +ffmpeg (0.8.5-1) unstable; urgency=low + + * make .so (enable shared, disabled static) + * Git : 165.213.180.234:slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-1 + + -- Haejeong Kim Mon, 05 Dec 2011 17:54:22 +0900 - * Initial Release. - * Git : unmodified/ffmpeg - * Tag : ffmpeg_0.8.5 +ffmpeg (0.8.5-0) unstable; urgency=low - -- Haejeong Kim Wed, 07 Dec 2011 12:22:56 +0900 + * Initial Release. - ffmpeg 0.8.5 + * Git : 165.213.180.234:slp/unmodified/ffmpeg + * Tag : ffmpeg_0.8.5-0 + -- Haejeong Kim Mon, 24 Oct 2011 13:45:53 +0900 diff --git a/debian/control b/debian/control index caff2b6..f2b86fe 100755 --- a/debian/control +++ b/debian/control @@ -41,6 +41,18 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libavformat (= ${Source-Version}) Description: development files for libavformat +Package: libavfilter +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: libavfilter library + +Package: libavfilter-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libavfilter (= ${Source-Version}) +Description: development files for libavfilter + Package: libswscale Section: libs Architecture: any diff --git a/debian/libavfilter-dev.install.in b/debian/libavfilter-dev.install.in new file mode 100755 index 0000000..2f89931 --- /dev/null +++ b/debian/libavfilter-dev.install.in @@ -0,0 +1,2 @@ +@PREFIX@/include/libavfilter* +@PREFIX@/lib/pkgconfig/libavfilter* diff --git a/debian/libavfilter.install.in b/debian/libavfilter.install.in new file mode 100755 index 0000000..0cf7f1d --- /dev/null +++ b/debian/libavfilter.install.in @@ -0,0 +1 @@ +@PREFIX@/lib/libavfilter.so* diff --git a/debian/rules b/debian/rules index 2dd780b..4913a81 100755 --- a/debian/rules +++ b/debian/rules @@ -25,9 +25,13 @@ CFLAGS += -fPIC CONFIGURE_OPTIONS = --disable-static --enable-shared --disable-postproc \ --disable-version3 --disable-devices --disable-nonfree --disable-gpl --disable-doc \ --disable-mmx --disable-zlib --disable-network \ - --disable-ffserver --disable-ffplay --disable-ffmpeg \ - --disable-avfilter --disable-avdevice \ + --disable-ffserver --disable-ffplay --disable-ffmpeg --disable-ffprobe \ + --disable-avdevice \ --disable-bsfs --disable-filters \ + --enable-filter=buffer --enable-filter=buffersink --enable-filter=crop \ + --enable-filter=hflip --enable-filter=lut --enable-filter=lutyuv \ + --enable-filter=lutrgb --enable-filter=overlay --enable-filter=scale \ + --enable-filter=transpose --enable-filter=unsharp --enable-filter=vflip \ --disable-protocols \ --enable-protocol=file \ --disable-encoders \ @@ -48,7 +52,9 @@ CONFIGURE_OPTIONS = --disable-static --enable-shared --disable-postproc \ --enable-decoder=flac --enable-decoder=mpeg4 --enable-decoder=wmv2 \ --enable-decoder=h263 --enable-decoder=mpegvideo --enable-decoder=wmv3 \ --enable-decoder=vc1 \ + --enable-decoder=msmpeg4v3 \ --enable-decoder=h263i --enable-decoder=theora \ + --enable-decoder=pcm_alaw --enable-decoder=pcm_mulaw \ --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 \ --enable-decoder=bmp --enable-encoder=bmp \ --enable-decoder=tiff \ diff --git a/packaging/ffmpeg.spec b/packaging/ffmpeg.spec index 1284d67..769d0de 100755 --- a/packaging/ffmpeg.spec +++ b/packaging/ffmpeg.spec @@ -1,7 +1,7 @@ Name: ffmpeg Summary: AV codec lib Version: 0.8.5 -Release: 1 +Release: 15 Group: TO_BE/FILLED_IN License: LGPLv2 Source0: %{name}-%{version}.tar.gz @@ -15,8 +15,7 @@ AV codec library %package -n libavcodec Summary: AV codec lib -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Group: TO_BE/FILLED_IN %description -n libavcodec AV codec library @@ -31,8 +30,7 @@ AV codec library (devel) %package -n libavformat Summary: AV format lib -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Group: TO_BE/FILLED_IN %description -n libavformat AV format library @@ -47,8 +45,7 @@ AV format library (devel) %package -n libavutil Summary: AV util lib -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Group: TO_BE/FILLED_IN %description -n libavutil AV util library @@ -61,10 +58,24 @@ Requires: libavutil = %{version}-%{release} %description -n libavutil-devel AV util library (devel) +%package -n libavfilter +Summary: AV util lib +Group: TO_BE/FILLED_IN + +%description -n libavfilter +AV filter library + +%package -n libavfilter-devel +Summary: AV util lib (devel) +Group: Development/Libraries +Requires: libavfilter = %{version}-%{release} + +%description -n libavfilter-devel +AV filter library (devel) + %package -n libswscale Summary: SW scale lib -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Group: TO_BE/FILLED_IN %description -n libswscale developement files for libswsacle @@ -84,9 +95,13 @@ developement files for libswsacle export CONFIGURE_OPTIONS="--enable-shared --disable-static --disable-postproc \ --disable-version3 --disable-devices --disable-nonfree --disable-gpl --disable-doc \ --disable-mmx --disable-zlib --disable-network \ ---disable-ffserver --disable-ffplay --disable-ffmpeg \ ---disable-avfilter --disable-avdevice \ +--disable-ffserver --disable-ffplay --disable-ffmpeg --disable-ffprobe \ +--disable-avdevice \ --disable-bsfs --disable-filters \ +--enable-filter=buffer --enable-filter=buffersink --enable-filter=crop \ +--enable-filter=hflip --enable-filter=lut --enable-filter=lutyuv \ +--enable-filter=lutrgb --enable-filter=overlay --enable-filter=scale \ +--enable-filter=transpose --enable-filter=unsharp --enable-filter=vflip \ --disable-protocols \ --enable-protocol=file \ --disable-encoders \ @@ -108,6 +123,7 @@ export CONFIGURE_OPTIONS="--enable-shared --disable-static --disable-postpr --enable-decoder=h263 --enable-decoder=mpegvideo --enable-decoder=wmv3 \ --enable-decoder=vc1 \ --enable-decoder=h263i --enable-decoder=theora \ +--enable-decoder=pcm_alaw --enable-decoder=pcm_mulaw \ --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 \ --enable-decoder=bmp --enable-encoder=bmp \ --enable-decoder=tiff \ @@ -135,10 +151,6 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files -%exclude /usr/share/ffmpeg/* -%exclude /usr/bin/ffprobe - %files -n libavcodec %defattr(-,root,root,-) %{_libdir}/libavcodec.so.* @@ -151,6 +163,10 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/libavutil.so.* +%files -n libavfilter +%defattr(-,root,root,-) +%{_libdir}/libavfilter.so.* + %files -n libswscale %defattr(-,root,root,-) %{_libdir}/libswscale.so.* @@ -173,6 +189,12 @@ rm -rf %{buildroot} %_libdir/libavutil.so %_libdir/pkgconfig/libavutil.pc +%files -n libavfilter-devel +%defattr(-,root,root,-) +%_includedir/libavfilter/* +%_libdir/libavfilter.so +%_libdir/pkgconfig/libavfilter.pc + %files -n libswscale-devel %defattr(-,root,root,-) %_includedir/libswscale/* -- 2.7.4