diff --git a/common/shlibs b/common/shlibs index 83418a75b5..b869f446d7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -362,7 +362,8 @@ libmp3lame.so.0 lame lame-devel libavdevice.so.53 libavdevice ffmpeg-devel libavformat.so.53 libavformat ffmpeg-devel libswscale.so.2 libswscale ffmpeg-devel -libpostproc.so.51 libpostproc ffmpeg-devel +libswresample.so.0 libswresample ffmpeg-devel +libpostproc.so.52 libpostproc ffmpeg-devel libavcodec.so.53 libavcodec ffmpeg-devel libavutil.so.51 libavutil ffmpeg-devel libavfilter.so.2 libavfilter ffmpeg-devel diff --git a/srcpkgs/ffmpeg/depends b/srcpkgs/ffmpeg/depends index 87484a5b65..110e940a93 100644 --- a/srcpkgs/ffmpeg/depends +++ b/srcpkgs/ffmpeg/depends @@ -1,2 +1,2 @@ abi_depends=">=0.8.6" -api_depends="${abi_depends}" +api_depends=">=0.10" # libswresample diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template index 9150af0c29..a0d401491c 100644 --- a/srcpkgs/ffmpeg/ffmpeg-devel.template +++ b/srcpkgs/ffmpeg/ffmpeg-devel.template @@ -5,18 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -Add_dependency run alsa-lib-devel -Add_dependency run libXext-devel -Add_dependency run faad2-devel -Add_dependency run lame-devel -Add_dependency run libtheora-devel -Add_dependency run libvorbis-devel -Add_dependency run x264-devel -Add_dependency run xvidcore-devel -Add_dependency run SDL-devel -Add_dependency run libvpx-devel -Add_dependency run libva-devel Add_dependency run libavcodec Add_dependency run libavdevice Add_dependency run libavformat @@ -24,9 +12,9 @@ Add_dependency run libavutil Add_dependency run libavfilter Add_dependency run libpostproc Add_dependency run libswscale +Add_dependency run libswresample -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib diff --git a/srcpkgs/ffmpeg/ffmpeg.rshlibs b/srcpkgs/ffmpeg/ffmpeg.rshlibs index 17389e61df..2138b51bf9 100644 --- a/srcpkgs/ffmpeg/ffmpeg.rshlibs +++ b/srcpkgs/ffmpeg/ffmpeg.rshlibs @@ -2,7 +2,6 @@ libavdevice.so.53 libavfilter.so.2 libavformat.so.53 libavcodec.so.53 -libpostproc.so.51 libswscale.so.2 libavutil.so.51 libpthread.so.0 @@ -10,3 +9,5 @@ libm.so.6 libc.so.6 libSDL-1.2.so.0 libdl.so.2 +libpostproc.so.52 +libswresample.so.0 diff --git a/srcpkgs/ffmpeg/libavcodec.rshlibs b/srcpkgs/ffmpeg/libavcodec.rshlibs index 68f1be0e91..f8211a75d3 100644 --- a/srcpkgs/ffmpeg/libavcodec.rshlibs +++ b/srcpkgs/ffmpeg/libavcodec.rshlibs @@ -2,7 +2,6 @@ libavutil.so.51 libva.so.1 libpthread.so.0 libxvidcore.so.4 -libx264.so.115 libvpx.so.0 libvorbisenc.so.2 libvorbis.so.0 @@ -12,3 +11,4 @@ libmp3lame.so.0 libm.so.6 libz.so.1 libc.so.6 +libx264.so.120 diff --git a/srcpkgs/ffmpeg/libavdevice.rshlibs b/srcpkgs/ffmpeg/libavdevice.rshlibs index 877c1c7234..a1b216899a 100644 --- a/srcpkgs/ffmpeg/libavdevice.rshlibs +++ b/srcpkgs/ffmpeg/libavdevice.rshlibs @@ -10,3 +10,4 @@ libc.so.6 libX11.so.6 libXext.so.6 libXfixes.so.3 +libavfilter.so.2 diff --git a/srcpkgs/ffmpeg/libavfilter.rshlibs b/srcpkgs/ffmpeg/libavfilter.rshlibs index 9c65d31d68..261f1a5a57 100644 --- a/srcpkgs/ffmpeg/libavfilter.rshlibs +++ b/srcpkgs/ffmpeg/libavfilter.rshlibs @@ -5,3 +5,4 @@ libavutil.so.51 libm.so.6 libpthread.so.0 libc.so.6 +libswresample.so.0 diff --git a/srcpkgs/ffmpeg/libswresample.rshlibs b/srcpkgs/ffmpeg/libswresample.rshlibs new file mode 100644 index 0000000000..506e965988 --- /dev/null +++ b/srcpkgs/ffmpeg/libswresample.rshlibs @@ -0,0 +1,4 @@ +libavutil.so.51 +libm.so.6 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/ffmpeg/libswresample.template b/srcpkgs/ffmpeg/libswresample.template new file mode 100644 index 0000000000..5703382c40 --- /dev/null +++ b/srcpkgs/ffmpeg/libswresample.template @@ -0,0 +1,9 @@ +# Template file for 'libswresample'. +# +short_desc="FFmpeg video resampling library" +long_desc=" + This is the video software resampling library from FFmpeg." + +do_install() { + vmove "usr/lib/libswresample.so*" usr/lib +} diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 5a91907b4d..71e204bfa2 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,12 +1,12 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=0.8.8 +version=0.10 homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" -checksum=c799600601ca181811a7fc1803c9753d5b5711aa73245ce721650c15978e9dbf +checksum=43596aa76d1a0fab6d42927bf60383405de2bca8fbc740c2012877559ae17ff9 long_desc=" FFmpeg is the first complete and free Internet Live Audio and Video Broadcasting solution. FFMpeg aims at being the command line tool to @@ -20,7 +20,7 @@ long_desc=" simultaneously, faster than any other solution." subpackages="libavcodec libavdevice libavformat libavutil libavfilter" -subpackages="${subpackages} libpostproc libswscale $pkgname-devel" +subpackages="${subpackages} libpostproc libswscale libswresample $pkgname-devel" Add_dependency run faad2 Add_dependency run x264 @@ -41,11 +41,11 @@ Add_dependency build libtheora-devel Add_dependency build libvorbis-devel Add_dependency build x264-devel Add_dependency build xvidcore-devel +Add_dependency build jack-devel Add_dependency build SDL-devel Add_dependency build libvpx-devel Add_dependency build libva-devel Add_dependency build libvdpau-devel -Add_dependency build jack-devel do_configure() { ./configure --prefix=/usr --disable-debug --enable-gpl \ diff --git a/srcpkgs/libswresample b/srcpkgs/libswresample new file mode 120000 index 0000000000..a9f1eea092 --- /dev/null +++ b/srcpkgs/libswresample @@ -0,0 +1 @@ +ffmpeg \ No newline at end of file