From f566ab403132b1bb3eb3a5b2e604c117bc0630c7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 25 Jun 2013 01:24:59 -0700 Subject: Tue Jun 25 01:24:57 PDT 2013 --- community/bonnie++/PKGBUILD | 18 +++++------ community/couchdb/PKGBUILD | 11 ++++--- community/couchdb/erlang-r16b01.patch | 12 +++++++ community/glfw/PKGBUILD | 8 ++--- community/libaccounts-qt/PKGBUILD | 6 ++-- community/luxrays/PKGBUILD | 51 +++++++++++++++++++++++------- community/luxrays/luxmark_scenes_path.diff | 20 ++++++++++++ community/lxc/PKGBUILD | 7 ++-- community/perl-libapreq2/PKGBUILD | 4 +-- community/signon-plugin-oauth2/PKGBUILD | 6 ++-- community/tigervnc/PKGBUILD | 6 ++-- community/usb_modeswitch/PKGBUILD | 14 ++++---- 12 files changed, 113 insertions(+), 50 deletions(-) create mode 100644 community/couchdb/erlang-r16b01.patch create mode 100644 community/luxrays/luxmark_scenes_path.diff (limited to 'community') diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index f45a04241..cfafec7c9 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -3,19 +3,17 @@ # Contributor: Tom Newsom pkgname=bonnie++ -pkgver=1.03e -pkgrel=7 +pkgver=1.97 +pkgrel=1 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' - 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') - +source=(http://www.coker.com.au/bonnie++/experimental/$pkgname-$pkgver.tgz) +md5sums=('d6cf9703242998b2ddc2d875b028b3c6') build() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver}.1 ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile @@ -23,13 +21,13 @@ build() { } package() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver}.1 # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ - patch -Np1 -i $srcdir/move_away_from_sbin.patch + sed -i 's/sbin/bin/' Makefile make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ - install -Dm644 $srcdir/$pkgname-$pkgver/readme.html $pkgdir/usr/share/doc/bonnie++/readme.html + install -Dm644 $srcdir/$pkgname-$pkgver.1/readme.html $pkgdir/usr/share/doc/bonnie++/readme.html } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 92a5e7393..276e62de3 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90750 2013-05-13 15:02:06Z spupykin $ +# $Id: PKGBUILD 93089 2013-06-24 09:55:10Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger pkgname=couchdb pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -19,16 +19,19 @@ backup=('etc/couchdb/local.ini' source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "build-fix.patch") + "build-fix.patch" + "erlang-r16b01.patch") md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' 'SKIP' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - '71afe48505dfc07ba2091786b4650fa2') + '71afe48505dfc07ba2091786b4650fa2' + '5ee0105a72b841de4d9c19d0fd2508e0') build() { cd "$srcdir/apache-$pkgname-$pkgver" patch -p1 <$srcdir/build-fix.patch + patch -p1 <$srcdir/erlang-r16b01.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/couchdb/erlang-r16b01.patch b/community/couchdb/erlang-r16b01.patch new file mode 100644 index 000000000..f10bc6cf9 --- /dev/null +++ b/community/couchdb/erlang-r16b01.patch @@ -0,0 +1,12 @@ +diff -wbBur apache-couchdb-1.2.2/src/couchdb/couch_app.erl apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl +--- apache-couchdb-1.2.2/src/couchdb/couch_app.erl 2013-03-24 00:33:33.000000000 +0400 ++++ apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl 2013-06-21 19:30:30.083579366 +0400 +@@ -20,7 +20,7 @@ + + start(_Type, DefaultIniFiles) -> + IniFiles = get_ini_files(DefaultIniFiles), +- case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of ++ case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of + ok -> + couch_server_sup:start_link(IniFiles); + {error, Reason} -> diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 88d7e2dfd..46ad0cdb8 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92771 2013-06-15 00:51:49Z svenstaro $ +# $Id: PKGBUILD 93104 2013-06-24 11:26:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: philefou # Contributor: lindquist @@ -7,8 +7,8 @@ # Contributor: SpepS pkgname=glfw -pkgver=3.0 -pkgrel=1 +pkgver=3.0.1 +pkgrel=2 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') url="http://www.glfw.org/" @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('415aef32d70af0cc829148c1cc7b1357') +md5sums=('b67fa7191e9cff0cf0caa7f16f80c658') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index aa5b97e46..2d2960ddc 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $ +# $Id: PKGBUILD 93073 2013-06-23 22:18:28Z bgyorgy $ # Maintainer: Balló György pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d') +sha1sums=('f5a29ef1d1e66049bbe5d809d6dbfcf0c1a39b41') build() { cd "$srcdir/$_pkgbase-$pkgver" diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 166c74c70..693101a11 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,38 +1,65 @@ -# $Id: PKGBUILD 87419 2013-03-31 19:18:23Z stephane $ +# $Id: PKGBUILD 93109 2013-06-24 13:55:35Z stativ $ # Maintainer: Lukas Jirkovsky -pkgname=luxrays +pkgname=('luxrays' 'luxmark') pkgver=1.2 _pkgver=475fbf15f0ca -pkgrel=2 +pkgrel=3 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'libcl' 'libgl') -optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' - 'boost-libs: demos (SmallLuxGPU etc.)') -makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ + http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \ + luxmark_scenes_path.diff) +md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315' + 'ae917f025e32e20b1d20ebf8d22204cb' + '1fd2a6f32e2822b5e0f147304292a1b9') build() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" + cd "$srcdir/luxrender-luxrays-$_pkgver" + + # change the path to luxmark scenes + patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DLUXRAYS_DISABLE_OPENCL=OFF \ + -DBUILD_LUXMARK=ON \ . make } -package() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" +package_luxrays() { + optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' + 'boost-libs: demos (SmallLuxGPU etc.)') + + cd "$srcdir/luxrender-luxrays-$_pkgver" install -d -m755 "$pkgdir"/usr/{bin,include,lib} install -m755 bin/* "$pkgdir"/usr/bin install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include + cp -a include "$pkgdir"/usr + + # remove luxmark (packaged separately) + rm "$pkgdir"/usr/bin/luxmark +} + +package_luxmark() { + pkgdesc="OpenCL benchmark tool" + depends+=("${depends[@]}" 'boost-libs' 'qt4') + + cd "$srcdir/luxrender-luxrays-$_pkgver" + install -d -m755 "$pkgdir"/usr/{bin,share} + install -m755 bin/luxmark "$pkgdir"/usr/bin + + # install scenes + cp -a samples/luxmark/scenes "$pkgdir"/usr/share/luxmark + cp -a "$srcdir"/samples/luxmark/scenes/room "$pkgdir"/usr/share/luxmark + # fix the paths + sed -i 's|scenes/|/usr/share/luxmark/|' "$pkgdir"/usr/share/luxmark/*/*.cfg "$pkgdir"/usr/share/luxmark/*/*.scn } # vim:set ts=2 sw=2 et: diff --git a/community/luxrays/luxmark_scenes_path.diff b/community/luxrays/luxmark_scenes_path.diff new file mode 100644 index 000000000..80f909a05 --- /dev/null +++ b/community/luxrays/luxmark_scenes_path.diff @@ -0,0 +1,20 @@ +diff -rup luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h +--- luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h 2013-02-22 22:29:42.000000000 +0100 ++++ luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h 2013-06-24 14:54:12.946992718 +0200 +@@ -36,11 +36,11 @@ + //------------------------------------------------------------------------------ + + // List of supported scenes +-#define SCENE_ROOM "scenes/room/render.cfg" +-#define SCENE_SALA "scenes/sala/render.cfg" +-#define SCENE_LUXBALL_HDR "scenes/luxball/render-hdr.cfg" +-#define SCENE_LUXBALL "scenes/luxball/render.cfg" +-#define SCENE_LUXBALL_SKY "scenes/luxball/render-sunset.cfg" ++#define SCENE_ROOM "/usr/share/luxmark/room/render.cfg" ++#define SCENE_SALA "/usr/share/luxmark/sala/render.cfg" ++#define SCENE_LUXBALL_HDR "/usr/share/luxmark/luxball/render-hdr.cfg" ++#define SCENE_LUXBALL "/usr/share/luxmark/luxball/render.cfg" ++#define SCENE_LUXBALL_SKY "/usr/share/luxmark/luxball/render-sunset.cfg" + + class LuxMarkApp : public QApplication { + Q_OBJECT diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index f5199755e..354f1cafc 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92863 2013-06-17 10:56:02Z spupykin $ +# $Id: PKGBUILD 93086 2013-06-24 09:48:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Andrea Zucchelli # Contributor: Daniel Micay @@ -21,7 +21,10 @@ md5sums=('8552a4479090616f4bc04d8473765fc9') prepare() { cd "$srcdir/$pkgname-${pkgver/_/-}" - sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac + sed -i \ + -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \ + -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \ + configure.ac } build() { diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD index 5acb325e6..9ed4cf4a2 100644 --- a/community/perl-libapreq2/PKGBUILD +++ b/community/perl-libapreq2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71807 2012-06-02 10:31:22Z bluewind $ +# $Id: PKGBUILD 93091 2013-06-24 09:55:33Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Tom K pkgname=perl-libapreq2 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." arch=('i686' 'x86_64') url="http://search.cpan.org/dist/libapreq2" diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index 308221338..f74d2b649 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $ +# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $ # Maintainer: Balló György pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237') +sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce') build() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index b13278c40..e05d189d0 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86603 2013-03-20 15:10:14Z spupykin $ +# $Id: PKGBUILD 93093 2013-06-24 09:56:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Uroš Vampl pkgname=tigervnc pkgver=1.2.0 -pkgrel=12 +pkgrel=13 _xorgver=1.14.0 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.tigervnc.org" license=('GPL') depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl') + 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp') makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 9f2ec6816..738b08c0c 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91584 2013-05-24 18:58:11Z spupykin $ +# $Id: PKGBUILD 93095 2013-06-24 09:56:58Z spupykin $ # Maintainer: Sergej Pupykin pkgname=usb_modeswitch -pkgver=1.2.5 -pkgrel=3 -_pkgdata=20121109 +pkgver=1.2.6 +pkgrel=1 +_pkgdata=20130610 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('c393603908eceab95444c5bde790f6f0' - 'a7d23a03157871013a0d708ab2b1b6df' - '9918bbdc0f68873410688604c80d25c4') +md5sums=('3cd804ad2dd4cb61fbd77a5cc033496c' + '52dff3f54e0c01dad02639d642e089e0' + '13f239816d7c4add8113179f4fb3543c') prepare() { cd $srcdir/usb-modeswitch-$pkgver/ -- cgit v1.2.3-54-g00ecf