diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:00:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:02:35 +0100 |
| commit | bae1d2619114abb36d636273329ed6d3ae157055 (patch) | |
| tree | 9a9c785204458547c0fc6b6b10357abd379a0fdd /community/mplayer2 | |
| parent | f3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff) | |
| parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/canorus/PKGBUILD
community/celt-0.7/PKGBUILD
community/djview4/PKGBUILD
community/erlang-sdl/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/glitz/PKGBUILD
community/gmerlin/PKGBUILD
community/gmic/PKGBUILD
community/goldendict/PKGBUILD
community/google-gadgets/PKGBUILD
community/highlight/PKGBUILD
community/jack2/PKGBUILD
community/kvirc/PKGBUILD
community/launchy/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/mupdf/PKGBUILD
community/projectm/PKGBUILD
community/psimedia/PKGBUILD
community/pyqt3/PKGBUILD
community/qps/PKGBUILD
community/qstardict/PKGBUILD
community/qsynergy/PKGBUILD
community/synergy/PKGBUILD
community/units/PKGBUILD
community/yagf/PKGBUILD
extra/automoc4/PKGBUILD
extra/avahi/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cagibi/PKGBUILD
extra/cairo/PKGBUILD
extra/calligra/PKGBUILD
extra/cmake/PKGBUILD
extra/dssi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glu/PKGBUILD
extra/graphviz/PKGBUILD
extra/hylafax/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libbluedevil/PKGBUILD
extra/liblastfm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpng/PKGBUILD
extra/libqzeitgeist/PKGBUILD
extra/libx11/PKGBUILD
extra/mesa/PKGBUILD
extra/mpg123/PKGBUILD
extra/mtr/PKGBUILD
extra/mysql/PKGBUILD
extra/netpbm/PKGBUILD
extra/nspr/PKGBUILD
extra/polkit-qt/PKGBUILD
extra/poppler/PKGBUILD
extra/prison/PKGBUILD
extra/pyqt/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/qscintilla/PKGBUILD
extra/qsynth/PKGBUILD
extra/qt-assistant-compat/PKGBUILD
extra/qt-gstreamer/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/qwt/PKGBUILD
extra/samba/PKGBUILD
extra/sane/PKGBUILD
extra/smplayer/PKGBUILD
extra/soprano/PKGBUILD
extra/texmacs/PKGBUILD
extra/tomcat-native/PKGBUILD
extra/transmission/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'community/mplayer2')
| -rw-r--r-- | community/mplayer2/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 45279758e..c18ac4bcf 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84620 2013-02-20 18:43:47Z bpiotrowski $ +# $Id: PKGBUILD 84778 2013-02-24 14:30:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> @@ -14,13 +14,13 @@ install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' - 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' + 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') makedepends=('unzip' 'python' 'python-docutils') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') - makedepends+=('mesa' 'yasm') + makedepends+=('mesa' 'mesa-libgl' 'yasm') fi backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') |