diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /extra | |
parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r-- | extra/imagemagick/PKGBUILD | 20 | ||||
-rw-r--r-- | extra/libisoburn/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/libisofs/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/v86d/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/v86d/v86d | 2 | ||||
-rw-r--r-- | extra/xmlsec/PKGBUILD | 14 |
6 files changed, 32 insertions, 28 deletions
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 035cf0232..cc8504eba 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 127963 2011-06-20 08:24:42Z eric $ +# $Id: PKGBUILD 131116 2011-07-10 21:02:00Z eric $ # Maintainer: Eric BĂ©langer <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.0.8 +pkgver=6.7.1.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') -depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfig' \ - 'libxext' 'libjpeg-turbo') +depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('67d8631c20fc9a2409343c02b159407d' +md5sums=('2c420f9316e15624490efac7ce6eb4ae' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('03b8534d16aee3efc5496817f804d21964be79ad' +sha1sums=('6570b9f994ae58e047d3a3ad84b1bfdf2e749159' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -25,12 +24,13 @@ build() { autoreconf patch -Np0 -i ../perlmagick.rpath.patch - LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml \ + LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --with-jp2 \ - --without-jbig --without-fpx --without-dps --without-fftw + --without-gvc --without-djvu --without-autotrace --without-webp \ + --without-jbig --without-fpx --without-dps --without-fftw --without-lqr make } diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 56e99ab78..6b38ff996 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 128011 2011-06-20 17:29:35Z andyrtr $ +# $Id: PKGBUILD 131111 2011-07-10 16:14:08Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.1.0' 'libisofs>=1.1.0' 'readline>=6.2') +depends=('libburn>=1.1.0' 'libisofs>=1.1.2' 'readline>=6.2') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('53d9da62da77a35af0f0f44c7632d7da') +md5sums=('07a8531e8693b8ad4093b12184da6d1c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index e3bc843e8..a25af3e34 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127996 2011-06-20 16:06:57Z andyrtr $ +# $Id: PKGBUILD 131106 2011-07-10 16:11:07Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.1.0 +pkgver=1.1.2 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('255395610e43c9dad7c8f1c03aba3844') +md5sums=('6d504f2ab57046cb3e95b7d17fe00068') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index bf75201a1..d142a2f8b 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $ +# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=v86d pkgver=0.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=("i686" "x86_64" 'mips64el') url="http://dev.gentoo.org/~spock/projects/uvesafb/" license=('GPL2') depends=('glibc') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') backup=('etc/modprobe.d/uvesafb.conf') options=('!makeflags') source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 @@ -17,7 +17,7 @@ source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.b v86d_hook modprobe.uvesafb) md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' - '33f3131e7bf041ed6a67e92bff272f4c' + '2748ca01397e5c4435f87692f7d042a8' '813958b8f6c75a7063e4858f31509694' '2d7cc8dc6a41916a13869212d0191147') diff --git a/extra/v86d/v86d b/extra/v86d/v86d index 57383fe78..2065b8e64 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d @@ -1,4 +1,4 @@ -install() { +build() { add_binary "/sbin/v86d" add_file "/etc/modprobe.d/uvesafb.conf" MODULES="uvesafb" diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index 9cd55b83d..aa48f707b 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 99799 2010-11-17 20:07:03Z andyrtr $ +# $Id: PKGBUILD 131121 2011-07-10 21:19:59Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=xmlsec -pkgver=1.2.16 +pkgver=1.2.18 pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64 'mips64el') url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls>=2.8.6' 'nss>=3.12.6' 'libtool') +depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls>=2.12.7' 'nss>=3.12.10' 'libtool') makedepends=('pkgconfig') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('17e8eb9a4ec4139b7689d139be4da133') +md5sums=('8694b4609aab647186607f79e1da7f1a') build() { cd ${srcdir}/${pkgname}1-${pkgver} ./configure --prefix=/usr --disable-static make - make check +} + +check() { + cd "$srcdir/${pkgname}1-$pkgver" + make -k check } package() { |