diff options
author | root <root@rshg054.dnsready.net> | 2012-10-13 00:57:48 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-13 00:57:48 -0700 |
commit | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (patch) | |
tree | ef49797b1f76586e9f8281e301a4923d90f29aa7 /extra | |
parent | 3cfedd8a4ed1e5464ef328d91b1a224aedc07960 (diff) |
Sat Oct 13 00:57:48 PDT 2012
Diffstat (limited to 'extra')
-rw-r--r-- | extra/facile/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/gnome-games/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/gnu-efi-libs/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch | 327 | ||||
-rw-r--r-- | extra/kdegraphics-kamera/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/ocaml/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/openexr/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/subversion/PKGBUILD | 8 |
8 files changed, 361 insertions, 29 deletions
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index 9de25cd83..6048b3f72 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166401 2012-09-07 16:46:16Z tpowa $ +# $Id: PKGBUILD 168478 2012-10-12 13:06:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=facile pkgver=1.1 -pkgrel=14 +pkgrel=15 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64) url="http://www.recherche.enac.fr/opti/facile/" diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index 87d9067f6..86c47d226 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159079 2012-05-15 11:54:56Z heftig $ +# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD index f71cd69b5..2799ac0d9 100644 --- a/extra/gnu-efi-libs/PKGBUILD +++ b/extra/gnu-efi-libs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167140 2012-09-26 06:30:46Z tpowa $ +# $Id: PKGBUILD 168460 2012-10-12 06:35:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> _pkgver="3.0" pkgname="gnu-efi-libs" -pkgver="${_pkgver}q" +pkgver="${_pkgver}r" pkgrel="1" pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain" url="http://sourceforge.net/projects/gnu-efi/" @@ -19,8 +19,7 @@ conflicts=('gnu-efi') provides=('gnu-efi') replaces=('gnu-efi') options=('!strip' '!makeflags') -source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz") -sha1sums=('99d29be5fd17dfca762cf0e265477862c21d63bb') +source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz" gnu-efi-libs-x86_64-call-fix.patch) _build_gnu-efi-libs-x86_64() { cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64" @@ -36,12 +35,15 @@ _build_gnu-efi-libs-i386() { ARCH="ia32" make -C apps all } -build() { +build() { + cd ${srcdir}/gnu-efi-${_pkgver} + # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423 + patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch ## Fix Makefiles to enable compile for both UEFI arch - sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" - sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" - sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" - sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" + sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults + sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults + sed 's|ARCH :=|ARCH ?=|g' -i Make.defaults + sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults if [[ "${CARCH}" == "x86_64" ]]; then _build_gnu-efi-libs-x86_64 fi @@ -73,3 +75,5 @@ package() { _package_gnu-efi-libs-i386 fi } +md5sums=('c5081850414bec34d3e254e8e970811b' + '4b5428c51af1981d3eb158d924d6bf85') diff --git a/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch b/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch new file mode 100644 index 000000000..8bda35c6b --- /dev/null +++ b/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch @@ -0,0 +1,327 @@ +diff -ur gnu-efi-3.0/lib/x86_64/efi_stub.S gnu-efi-3.0-mod/lib/x86_64/efi_stub.S +--- gnu-efi-3.0/lib/x86_64/efi_stub.S 2012-04-30 17:35:44.000000000 +0200 ++++ gnu-efi-3.0-mod/lib/x86_64/efi_stub.S 2012-10-12 00:39:09.300289985 +0200 +@@ -4,6 +4,7 @@ + * Copyright (C) 2007 Intel Corp + * Bibo Mao <bibo.mao@intel.com> + * Huang Ying <ying.huang@intel.com> ++ * Copyright (C) 2012 Felipe Contreras <felipe.contreras@gmail.com> + */ + + /* +@@ -14,152 +15,94 @@ + * + * Basically here are the conversion rules: + * a) our function pointer is in %rdi +- * b) ELF gives us 8-byte aligned %rsp, so we need to pad out to 16-byte +- * alignment. +- * c) inside each call thunker, we can only adjust the stack by +- * multiples of 16 bytes. "offset" below refers to however much +- * we allocate inside a thunker. +- * d) rsi through r8 (elf) aka rcx through r9 (ms) require stack space ++ * b) rsi through r8 (elf) aka rcx through r9 (ms) require stack space + * on the MS side even though it's not getting used at all. +- * e) arguments are as follows: (elf -> ms) ++ * c) 8(%rsp) is always aligned to 16 in ELF, so %rsp is shifted 8 bytes extra ++ * d) arguments are as follows: (elf -> ms) + * 1) rdi -> rcx (32 saved) + * 2) rsi -> rdx (32 saved) +- * 3) rdx -> r8 ( 32 saved) ++ * 3) rdx -> r8 (32 saved) + * 4) rcx -> r9 (32 saved) +- * 5) r8 -> 32(%rsp) (48 saved) ++ * 5) r8 -> 32(%rsp) (32 saved) + * 6) r9 -> 40(%rsp) (48 saved) +- * 7) pad+offset+0(%rsp) -> 48(%rsp) (64 saved) +- * 8) pad+offset+8(%rsp) -> 56(%rsp) (64 saved) +- * 9) pad+offset+16(%rsp) -> 64(%rsp) (80 saved) +- * 10) pad+offset+24(%rsp) -> 72(%rsp) (80 saved) +- * 11) pad+offset+32(%rsp) -> 80(%rsp) (96 saved) +- * 12) pad+offset+40(%rsp) -> 88(%rsp) (96 saved) +- * f) because the first argument we recieve in a thunker is actually the ++ * 7) 8(%rsp) -> 48(%rsp) (48 saved) ++ * 8) 16(%rsp) -> 56(%rsp) (64 saved) ++ * 9) 24(%rsp) -> 64(%rsp) (64 saved) ++ * 10) 32(%rsp) -> 72(%rsp) (80 saved) ++ * e) because the first argument we recieve in a thunker is actually the + * function to be called, arguments are offset as such: + * 0) rdi -> caller + * 1) rsi -> rcx (32 saved) + * 2) rdx -> rdx (32 saved) + * 3) rcx -> r8 (32 saved) + * 4) r8 -> r9 (32 saved) +- * 5) r9 -> 32(%rsp) (48 saved) +- * 6) pad+offset+0(%rsp) -> 40(%rsp) (48 saved) +- * 7) pad+offset+8(%rsp) -> 48(%rsp) (64 saved) +- * 8) pad+offset+16(%rsp) -> 56(%rsp) (64 saved) +- * 9) pad+offset+24(%rsp) -> 64(%rsp) (80 saved) +- * 10) pad+offset+32(%rsp) -> 72(%rsp) (80 saved) +- * 11) pad+offset+40(%rsp) -> 80(%rsp) (96 saved) +- * 12) pad+offset+48(%rsp) -> 88(%rsp) (96 saved) +- * e) arguments need to be moved in opposite order to avoid clobbering +- * f) pad_stack leaves the amount of padding it added in %r11 for functions +- * to use +- * g) efi -> elf calls don't need to pad the stack, because the 16-byte +- * alignment is also always 8-byte aligned. ++ * 5) r9 -> 32(%rsp) (32 saved) ++ * 6) 8(%rsp) -> 40(%rsp) (48 saved) ++ * 7) 16(%rsp) -> 48(%rsp) (48 saved) ++ * 8) 24(%rsp) -> 56(%rsp) (64 saved) ++ * 9) 32(%rsp) -> 64(%rsp) (64 saved) ++ * 10) 40(%rsp) -> 72(%rsp) (80 saved) ++ * f) arguments need to be moved in opposite order to avoid clobbering + */ + + #define ENTRY(name) \ + .globl name; \ + name: + +-#define out(val) \ +- push %rax ; \ +- mov val, %rax ; \ +- out %al, $128 ; \ +- pop %rax +- +-#define pad_stack \ +- subq $8, %rsp ; /* must be a multiple of 16 - sizeof(%rip) */ \ +- /* stash some handy integers */ \ +- mov $0x8, %rax ; \ +- mov $0x10, %r10 ; \ +- /* see if we need padding */ \ +- and %rsp, %rax ; \ +- /* store the pad amount in %r11 */ \ +- cmovnz %rax, %r11 ; \ +- cmovz %r10, %r11 ; \ +- /* insert the padding */ \ +- subq %r11, %rsp ; \ +- /* add the $8 we saved above in %r11 */ \ +- addq $8, %r11 ; \ +- /* store the pad amount */ \ +- mov %r11, (%rsp) ; \ +- /* compensate for %rip being stored on the stack by call */ \ +- addq $8, %r11 +- +-#define unpad_stack \ +- /* fetch the pad amount we saved (%r11 has been clobbered) */ \ +- mov (%rsp), %r11 ; \ +- /* remove the padding */ \ +- addq %r11, %rsp +- + ENTRY(efi_call0) +- pad_stack +- subq $32, %rsp ++ subq $40, %rsp + call *%rdi +- addq $32, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call1) +- pad_stack +- subq $32, %rsp ++ subq $40, %rsp + mov %rsi, %rcx + call *%rdi +- addq $32, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call2) +- pad_stack +- subq $32, %rsp ++ subq $40, %rsp + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $32, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call3) +- pad_stack +- subq $32, %rsp ++ subq $40, %rsp + mov %rcx, %r8 + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $32, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call4) +- pad_stack +- subq $32, %rsp ++ subq $40, %rsp + mov %r8, %r9 + mov %rcx, %r8 + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $32, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call5) +- pad_stack +- subq $48, %rsp ++ subq $40, %rsp + mov %r9, 32(%rsp) + mov %r8, %r9 + mov %rcx, %r8 + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $48, %rsp +- unpad_stack ++ addq $40, %rsp + ret + + ENTRY(efi_call6) +- pad_stack +- subq $48, %rsp +- addq $48, %r11 +- addq %rsp, %r11 +- mov (%r11), %rax ++ subq $56, %rsp ++ mov 56+8(%rsp), %rax + mov %rax, 40(%rsp) + mov %r9, 32(%rsp) + mov %r8, %r9 +@@ -167,20 +110,14 @@ + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $48, %rsp +- unpad_stack ++ addq $56, %rsp + ret + + ENTRY(efi_call7) +- pad_stack +- subq $64, %rsp +- addq $64, %r11 +- addq $8, %r11 +- addq %rsp, %r11 +- mov (%r11), %rax ++ subq $56, %rsp ++ mov 56+16(%rsp), %rax + mov %rax, 48(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 56+8(%rsp), %rax + mov %rax, 40(%rsp) + mov %r9, 32(%rsp) + mov %r8, %r9 +@@ -188,23 +125,16 @@ + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $64, %rsp +- unpad_stack ++ addq $56, %rsp + ret + + ENTRY(efi_call8) +- pad_stack +- subq $64, %rsp +- addq $64, %r11 +- addq $16, %r11 +- addq %rsp, %r11 +- mov (%r11), %rax ++ subq $72, %rsp ++ mov 72+24(%rsp), %rax + mov %rax, 56(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 72+16(%rsp), %rax + mov %rax, 48(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 72+8(%rsp), %rax + mov %rax, 40(%rsp) + mov %r9, 32(%rsp) + mov %r8, %r9 +@@ -212,26 +142,18 @@ + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $64, %rsp +- unpad_stack ++ addq $72, %rsp + ret + + ENTRY(efi_call9) +- pad_stack +- subq $80, %rsp +- addq $80, %r11 +- addq $24, %r11 +- addq %rsp, %r11 +- mov (%r11), %rax ++ subq $72, %rsp ++ mov 72+32(%rsp), %rax + mov %rax, 64(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 72+24(%rsp), %rax + mov %rax, 56(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 72+16(%rsp), %rax + mov %rax, 48(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 72+8(%rsp), %rax + mov %rax, 40(%rsp) + mov %r9, 32(%rsp) + mov %r8, %r9 +@@ -239,29 +161,20 @@ + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $80, %rsp +- unpad_stack ++ addq $72, %rsp + ret + + ENTRY(efi_call10) +- pad_stack +- subq $80, %rsp +- addq $80, %r11 +- addq $32, %r11 +- addq %rsp, %r11 +- mov (%r11), %rax ++ subq $88, %rsp ++ mov 88+40(%rsp), %rax + mov %rax, 72(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 88+32(%rsp), %rax + mov %rax, 64(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 88+24(%rsp), %rax + mov %rax, 56(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 88+16(%rsp), %rax + mov %rax, 48(%rsp) +- subq $8, %r11 +- mov (%r11), %rax ++ mov 88+8(%rsp), %rax + mov %rax, 40(%rsp) + mov %r9, 32(%rsp) + mov %r8, %r9 +@@ -269,6 +182,5 @@ + /* mov %rdx, %rdx */ + mov %rsi, %rcx + call *%rdi +- addq $80, %rsp +- unpad_stack ++ addq $88, %rsp + ret diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 5a02a6b12..dd4840ca0 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 167824 2012-10-03 14:44:43Z andrea $ +# $Id: PKGBUILD 168467 2012-10-12 06:40:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera pkgver=4.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'gphoto2') +depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827') diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 38fa1ddf5..0e8b300c4 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166569 2012-09-12 06:53:18Z tpowa $ +# $Id: PKGBUILD 168480 2012-10-12 13:08:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=4.00.0 -pkgrel=2 +pkgver=4.00.1 +pkgrel=1 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -54,4 +54,4 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('fa11560a45793bd9fa45c1295a6f4a91') +md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index 6c55b9bf5..16b281613 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 149571 2012-02-08 14:46:39Z tpowa $ +# $Id: PKGBUILD 168476 2012-10-12 12:47:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openexr -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="An high dynamic-range image file format library" url="http://www.openexr.com/" arch=('i686' 'x86_64') license=('BSD') depends=('zlib' 'ilmbase') options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'gcc43.patch') -md5sums=('27113284f7d26a58f853c346e0851d7a' - 'd91fae759053a70bcedcf02eb33ca4a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,3 +25,6 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + +md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1' + 'd91fae759053a70bcedcf02eb33ca4a2') diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 8dee5bf18..54dc81bd8 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165382 2012-08-17 10:46:53Z stephane $ +# $Id: PKGBUILD 168489 2012-10-12 17:51:02Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') @@ -26,8 +26,8 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.service subversion-1.7.6-kwallet-gcc47.patch subversion.rpath.fix.patch) -sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068' - 'd8d99c01c49b189047389816b720923f1d9dbf2a' +sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951' + '3df83e46277f0f08868236a6b6e6c0f0d7ef9278' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' |