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/mplayer-vaapi-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/mplayer-vaapi-libre/PKGBUILD')
| -rw-r--r-- | libre/mplayer-vaapi-libre/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 2f1028119..22517928e 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -18,9 +18,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils') makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') -provides=("mplayer-vaapi=$pkgver") +provides=("mplayer-vaapi=$pkgver" 'mplayer') conflicts=('mplayer' 'mplayer-vaapi') -replaces=("mplayer-vaapi=$pkgver") +replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2 |