diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
| commit | 20325742c50f83cc58e49aa3b8347fde1399d734 (patch) | |
| tree | c165cfbea80913f12dad4d009a70d9fe5e8bfceb /community/mplayer2 | |
| parent | 42512f0cff006451fa78981bf2f41e819fe96131 (diff) | |
| parent | 6a2547c3f20da8a8df65a8032a01677b74b6ece7 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
community/mplayer2/PKGBUILD
extra/live-media/PKGBUILD
Diffstat (limited to 'community/mplayer2')
| -rw-r--r-- | community/mplayer2/PKGBUILD | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 5e43fd6ea..4a4da3547 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mplayer2 pkgver=2.0.20111101 -pkgrel=1 +pkgrel=1.1 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ if [ "${CARCH}" = "mips64el" ] ; then # the supported mips64el machines. depends=('ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libass' 'fontconfig' 'freetype2' 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex') + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex' 'libxv') makedepends=('live-media' 'p7zip-libre' 'gettext') else depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' @@ -57,6 +57,9 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ + --disable-vdpau \ + --disable-gl \ + --enable-xv \ --language=all \ --enable-translation \ --confdir=/etc/mplayer |