diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /community/mplayer2/PKGBUILD | |
parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'community/mplayer2/PKGBUILD')
-rw-r--r-- | community/mplayer2/PKGBUILD | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 98d3e431f..f8caed272 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $ +# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 -pkgver=2.0 -pkgrel=15.1 +pkgver=2.0.20111101 +pkgrel=1 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,26 +25,28 @@ fi backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') -source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz - mplayer2-remove-mp3lib.patch - mplayer2-SAMI-subs.patch) -sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' - 'c55128a99406a5e01ab077555b7b24aa7b54110c' - '4059d5d0564004feb55d25b5f62f7f4672e40fb1') +#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d') options=('!emptydirs') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +# source PKGBUILD && mksource +mksource() { + _gitroot="git://git.mplayer2.org/mplayer2.git" + _gitname="${pkgname}-${pkgver}" + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + else + git clone "$_gitroot" "$_gitname" + fi - # Drop internal mp3lib (FS#24149) - # Default decoder for mp3 will be mpg123 - rm -fr mp3lib - patch -Np1 -i ../mplayer2-remove-mp3lib.patch + tar -cJvf ${_gitname}.tar.xz ${_gitname} + rm -fr ${_gitname} +} - # SAMI subtitle parsing buffer overflow - # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html - # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf - patch -Np1 -i ../mplayer2-SAMI-subs.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ @@ -71,7 +73,6 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ - --enable-xvmc \ --language=all \ --enable-translation \ --confdir=/etc/mplayer |