diff --git a/srcpkgs/ffmpeg/libavcodec.template b/srcpkgs/ffmpeg/libavcodec.template index b99ca80187c..d1e4ee887c9 100644 --- a/srcpkgs/ffmpeg/libavcodec.template +++ b/srcpkgs/ffmpeg/libavcodec.template @@ -1,17 +1,11 @@ # Template file for 'libavcodec'. # -revision=1 short_desc="FFmpeg codec library" long_desc=" This is the codec library from FFmpeg (both encoding and decoding). It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...)." - -Add_dependency run faad2 - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavcodec.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libavcodec.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libavdevice.template b/srcpkgs/ffmpeg/libavdevice.template index eef0cc7e3e4..4dfcb3e95dd 100644 --- a/srcpkgs/ffmpeg/libavdevice.template +++ b/srcpkgs/ffmpeg/libavdevice.template @@ -1,14 +1,9 @@ # Template file for 'libavdevice'. # -revision=2 short_desc="FFmpeg device handling library" long_desc=" This is the device handling library from FFmpeg." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavdevice.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libavdevice.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libavfilter.template b/srcpkgs/ffmpeg/libavfilter.template index 27f22707f85..b854f177c0f 100644 --- a/srcpkgs/ffmpeg/libavfilter.template +++ b/srcpkgs/ffmpeg/libavfilter.template @@ -1,14 +1,9 @@ # Template file for 'libavfilter'. # -revision=1 short_desc="FFmpeg audio/video filter library" long_desc=" This is the audio/video filter library from FFmpeg." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavfilter.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libavfilter.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libavformat.template b/srcpkgs/ffmpeg/libavformat.template index 48ca336bb98..9e4d3fc5716 100644 --- a/srcpkgs/ffmpeg/libavformat.template +++ b/srcpkgs/ffmpeg/libavformat.template @@ -1,16 +1,11 @@ # Template file for 'libavformat'. # -revision=1 short_desc="FFmpeg file format library" long_desc=" This is the library for handling file formats from FFmpeg. It supports most existing file formats (AVI, MPEG, OGG, Matroska, ASF...)." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavformat.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libavformat.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libavutil.template b/srcpkgs/ffmpeg/libavutil.template index 990fe170873..6b7444d5b60 100644 --- a/srcpkgs/ffmpeg/libavutil.template +++ b/srcpkgs/ffmpeg/libavutil.template @@ -1,15 +1,10 @@ # Template file for 'libavutil'. # -revision=1 short_desc="FFmpeg utility library" long_desc=" This is the common utility library from FFmpeg. It contains shared code used by all other ffmpeg libraries." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavutil.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libavutil.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libpostproc.template b/srcpkgs/ffmpeg/libpostproc.template index 90f83b5f641..b2ab60467bd 100644 --- a/srcpkgs/ffmpeg/libpostproc.template +++ b/srcpkgs/ffmpeg/libpostproc.template @@ -1,14 +1,9 @@ # Template file for 'libpostproc'. # -revision=1 short_desc="FFmpeg video postprocessing library" long_desc=" This is the video postprocessing library from FFmpeg." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libpostproc.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libpostproc.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/libswscale.template b/srcpkgs/ffmpeg/libswscale.template index 14bf62ba227..57b4e906899 100644 --- a/srcpkgs/ffmpeg/libswscale.template +++ b/srcpkgs/ffmpeg/libswscale.template @@ -1,14 +1,9 @@ # Template file for 'libswscale'. # -revision=1 short_desc="FFmpeg video scaling library" long_desc=" This is the video software scaling library from FFmpeg." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libswscale.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/libswscale.so*" usr/lib } diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 9fd2a88250e..26c4615ab42 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,13 +1,12 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=0.8.6 +version=0.8.7 homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" -revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" -checksum=0ec9084438a26514455d49a72008d0b563d5a3c9d137cd22e46cb86bdc8bf6f0 +checksum=e074656390bfff51c2915d3334306dd7748bab8589a8d04128143c7b8962d0e1 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 @@ -49,27 +48,14 @@ Add_dependency build libvdpau-devel Add_dependency build jack-devel do_configure() { - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-vdpau \ - --enable-vaapi \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --disable-libopencore_amrnb \ - --disable-libopencore_amrwb \ - --disable-libschroedinger \ - --disable-libopenjpeg \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug + ./configure --prefix=/usr --disable-debug --enable-gpl \ + --enable-version3 --enable-runtime-cpudetect \ + --enable-libmp3lame --enable-libvorbis --enable-libxvid \ + --enable-libx264 --enable-libvpx --enable-libtheora \ + --enable-vdpau --enable-vaapi --enable-postproc \ + --enable-shared --enable-x11grab \ + --disable-libopencore_amrnb --disable-libopencore_amrwb \ + --disable-libschroedinger --disable-libopenjpeg } do_build() {