diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-04-15 18:31:32 -0700 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-04-15 18:31:32 -0700 |
commit | ffb3ebbe0c98853f03a79b95cfff0f525df7d1fe (patch) | |
tree | 9879cb74f4d2f8ab4652b4277b7f66c212766ab0 /libre/ffmpeg-libre | |
parent | 833e63b6728e7fe38ea0e77303623efa6bdef48c (diff) | |
parent | c931fbbe5ae1246b69e2c61452f7c3d7632d98c9 (diff) |
Merge branch 'master' of vparabola:~/projects/abslibre
Conflicts:
.gitignore
Diffstat (limited to 'libre/ffmpeg-libre')
-rw-r--r-- | libre/ffmpeg-libre/PKGBUILD | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD index c77ad16b5..dc5725eff 100644 --- a/libre/ffmpeg-libre/PKGBUILD +++ b/libre/ffmpeg-libre/PKGBUILD @@ -5,18 +5,17 @@ # Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net> pkgname=ffmpeg-libre -pkgver=20110121 +pkgver=20110330 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg') -makedepends=('yasm') -#remake snapshot with: svn export svn://svn.ffmpeg.org/ffmpeg/trunk/@25472 +makedepends=('yasm' 'git') +#git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz) -md5sums=('73080643ae7702d4164da92b9e6fedb6') -options=('force') +md5sums=('dd682a876a496b9f9ae8afb3b3b70389') #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2) provides=('ffmpeg') conflicts=('ffmpeg') |