diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-02 11:27:39 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-02 11:27:39 +0200 |
| commit | d0a980f59ed24d42b8edfc27229976b3e469d263 (patch) | |
| tree | b3643b688cc1eb13bc3c07f1f8bf18ad4c3649fd /extra | |
| parent | d1f3d0f7ce2e69afdf69bfb0209b97c5589a5a68 (diff) | |
| parent | 8b09f76ed1ea968a2473faf8f56250eea0fdc3cc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libdvbpsi/PKGBUILD
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libdvbpsi/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/vim/PKGBUILD | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index e10dff9e9..4bdad975b 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 143078 2011-11-22 13:07:42Z giovanni $ +# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi pkgver=0.2.2 -pkgrel=1.1 +pkgrel=1 +epoch=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') +license=('LGPL2.1') depends=('glibc') options=('!libtool') replaces=('libdvbpsi4' 'libdvbpsi5') diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 77a8baf3f..b2de0df03 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184013 2013-04-30 20:28:23Z giovanni $ +# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.29 +pkgver=2013.04.30 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('9cdb58c0ecc02711388e9cded104aad6') +md5sums=('95533d91bd196e42fd748076dc244b09') build() { cd ${srcdir}/live diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 623378fce..43b3b8dce 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=875 -__hgrev=acf7368a2acc +_patchlevel=918 +__hgrev=c61da758a9a2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('4d71e8b9ef6a214b3651d69be19fadec' - 'ac2bfed9586c987f0b8435c91be3f18a' +md5sums=('b1a619f017851646a8567deda17bdb36' + 'SKIP' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' |