diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
| commit | b6aef2fa31eefccec41172ba32ece5326c729291 (patch) | |
| tree | 7a6e6efcc20c45c379f244ea388dda5e1a0c2334 /libre/ffmpeg-libre/PKGBUILD | |
| parent | dccab1509d2289e66edf699d1f90d127648fdeeb (diff) | |
| parent | 13bf0e2a4ebb6c8b591b204f4c2e3c8e73e6fe18 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Conflicts:
libre/kernel26-libre-lts/PKGBUILD
libre/kernel26-libre-lts/config.x86_64
Diffstat (limited to 'libre/ffmpeg-libre/PKGBUILD')
| -rw-r--r-- | libre/ffmpeg-libre/PKGBUILD | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD index 3a66030ea..41c332dca 100644 --- a/libre/ffmpeg-libre/PKGBUILD +++ b/libre/ffmpeg-libre/PKGBUILD @@ -16,11 +16,10 @@ makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz) md5sums=('dd682a876a496b9f9ae8afb3b3b70389') -options=('force') #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2) -provides=('ffmpeg') +provides=("ffmpeg=$pkgver") conflicts=('ffmpeg') -replaces=("ffmpeg=$pkgver") +replaces=('ffmpeg') build() { cd "$srcdir/${pkgname%-libre}" |