diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /extra/vlc | |
parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'extra/vlc')
-rw-r--r-- | extra/vlc/PKGBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index be817dda5..9551054de 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $ +# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=1.1.12 -pkgrel=5 +pkgver=1.1.13 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -53,18 +53,14 @@ backup=('usr/share/vlc/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'bp-set-channel-map-pulseaudio-1.0.patch') -md5sums=('91de1ad308c947e35380f9d747ff5713' - 'bae24e02207364d76a1a118644de484e') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('9678fb7a04808b6e0de63746d35e4bb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c - patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch - if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ --disable-rpath \ @@ -80,7 +76,6 @@ build() { --enable-upnp \ --enable-realrtsp else - ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ |