diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
tree | a472ad2701076586f54fbd0859fe2e5c8311184b /extra/live-media | |
parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'extra/live-media')
-rw-r--r-- | extra/live-media/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5a6ff4285..fac601cd0 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 152226 2012-03-05 09:23:14Z ibiru $ +# $Id: PKGBUILD 153994 2012-03-21 08:34:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.02.29 -pkgrel=2 +pkgver=2012.03.20 +pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('ee00b4f9ca4efaa1aeaf47b5c185fe93') +md5sums=('5b91e1bba1431be1ec6abef526bf86bd') build() { cd ${srcdir}/live |