diff options
33 files changed, 672 insertions, 315 deletions
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 79504f0ea..0932eb4d4 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106819 2014-03-08 17:14:28Z giovanni $ +# $Id: PKGBUILD 110762 2014-05-06 14:12:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.6.8 +pkgver=0.7.0 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('35d9c5d2e3a4aacbf12d92fe552c9539') +md5sums=('20e30c334fa358d75df11b5737f59485') build() { cd "${srcdir}" diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD index 0a07f615d..5b1672368 100644 --- a/community/lcdproc/PKGBUILD +++ b/community/lcdproc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106179 2014-02-24 19:17:26Z idevolder $ +# $Id: PKGBUILD 110778 2014-05-06 17:57:07Z idevolder $ # Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com> # Contributor: Bernhard Walle <bernhard.walle@gmx.de> pkgname=lcdproc -pkgver=0.5.6 -pkgrel=5 +pkgver=0.5.7 +pkgrel=1 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices" arch=('i686' 'x86_64') url="http://lcdproc.omnipotent.net/" @@ -25,8 +25,6 @@ source=( "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'lcdd.service' ) -sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a' - '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') build() { cd "$pkgname-$pkgver" @@ -47,3 +45,5 @@ package() { sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf" install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service" } +sha256sums=('843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804' + '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') diff --git a/community/lwqq/PKGBUILD b/community/lwqq/PKGBUILD index 6a36367ae..1d259f865 100644 --- a/community/lwqq/PKGBUILD +++ b/community/lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109651 2014-04-17 11:14:59Z fyan $ +# $Id: PKGBUILD 110768 2014-05-06 17:17:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=lwqq -pkgver=0.2.4.20140417 -#_gitver="tag=$pkgver" -_gitver='commit=afe08eef972aaabff5c043a72af0b63e2bb23f2d' +pkgver=0.3.0 +_gitver="tag=v$pkgver" +#_gitver='commit=afe08eef972aaabff5c043a72af0b63e2bb23f2d' pkgrel=1 pkgdesc="A library for webqq protocol" arch=('i686' 'x86_64') diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index 2ce437990..29d0f6da3 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 108214 2014-03-24 21:38:05Z seblu $ +# $Id: PKGBUILD 110732 2014-05-05 22:12:01Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=116 +pkgver=117 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD index 02fba2e49..88bf488ea 100644 --- a/community/mate-desktop/PKGBUILD +++ b/community/mate-desktop/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer : Martin Wimpress <code@flexion.org> pkgname=mate-desktop -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="Library with common API for various MATE modules" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -14,10 +14,9 @@ optdepends=('lightdm-gtk2-greeter: A lightweight display manager' 'onboard: On-screen keyboard useful for mobility impaired users' 'orca: Screen reader for blind or visually impaired individuals' 'yelp: for reading MATE help documents') -options=('!emptydirs') groups=('mate') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1e722d18a198751b209fcf255ad5d3653cb8f6e6') +sha1sums=('e3e92eec0cf0443d6a0ca18ad2f88b2ddd54f833') install=${pkgname}.install prepare() { diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 015f7fe9b..f4a8d5beb 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109312 2014-04-13 09:23:07Z fyan $ +# $Id: PKGBUILD 110766 2014-05-06 17:08:14Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') @@ -47,7 +47,7 @@ check() { cd mongodb-src-r${pkgver} - #scons smokeAll --smokedbprefix="$srcdir" + scons smokeAll --smokedbprefix="$srcdir" || : } package() { @@ -72,7 +72,7 @@ package() { install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('60747ebd2fce9cffdb6b5ea3472a4efa46cd7e1ee38aee2a806a15667b5d86a61da89bf176876553ab348c0f3b3b925125921330b333a8349275e6ce79ccd337' +sha512sums=('a07168a8fa609d2a22b04db6b761e486e58fb63c66ea4974e5cc53a1255d514cd065a84b4dc62efbb27c39a6e3881d98a3f7025c2391a78d91d5cd515b8a2e56' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' - 'SKIP') + '868e5f93ba3c087f80982ffbe01411644d01329a51e4a1811cf8dd6de5e155f604a924be933623b70903fb4dabb27eed100a7eb6f6edcf4bb7a0fdfddd485270') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 9caf9e42e..63f566449 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110530 2014-05-02 15:49:31Z fyan $ +# $Id: PKGBUILD 110758 2014-05-06 12:26:13Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -10,12 +10,13 @@ pkgname=nodejs pkgver=0.10.28 -pkgrel=1 +pkgrel=3 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') depends=('openssl') +provides=('nodejs-node-gyp') makedepends=('python2') optdepends=('python2: for node-gyp') checkdepends=('curl') @@ -48,7 +49,7 @@ build() { check() { cd node-v$pkgver - make test || true + make test || : } package() { @@ -63,6 +64,9 @@ package() { install -D -m644 LICENSE \ "$pkgdir"/usr/share/licenses/nodejs/LICENSE + + # Why the hell wasn't this installed?! FS#40221 + ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp } # vim:set ts=2 sw=2 et: diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index 4ff3b7606..fdfc89752 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99115 2013-10-24 15:22:27Z speps $ +# $Id: PKGBUILD 110760 2014-05-06 13:16:48Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: TDY <tdy@gmx.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=pd -pkgver=0.45.3 +pkgver=0.45.5 _ver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="The Pure Data real-time music and multimedia environment" @@ -15,7 +15,7 @@ depends=('jack' 'fftw' 'tk') provides=('puredata') source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz" "enable-fftw3.patch") -md5sums=('461a3d0d558a4f45c49943234baa9ca8' +md5sums=('b10b30940f971a2511c176661d85165e' 'bb907907a9b33f6c63312274c8523d40') prepare() { diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index 97db8ac28..0f0f10c89 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jarek Sedlacek <jareksedlacek@gmail.com> pkgname=php-mongo -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") @@ -26,6 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } - -sha256sums=('883aad17c44e8f053b10c8e31d7ff6487d5b5660ea8bd17a7b62976e988c4ea4' +sha256sums=('98ae2994445763d7bac19c418d9f1773592fd3a4a10ff1e36498383a52fb54e7' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index ea16500df..c146b7301 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109718 2014-04-18 09:35:36Z fyan $ +# $Id: PKGBUILD 110770 2014-05-06 17:34:41Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2d.20140417 -#_gitver="tag=$pkgver" -_gitver='commit=9537d7053a91d2813e15f834075688097818c7c8' +pkgver=0.3.0 +_gitver="tag=v$pkgver" +#_gitver='commit=9537d7053a91d2813e15f834075688097818c7c8' pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 4aa216d58..62631e3d1 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 105934 2014-02-19 12:29:36Z arodseth $ +# $Id: PKGBUILD 110730 2014-05-05 22:09:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20131024 -pkgrel=4 +pkgver=20140306 +pkgrel=1 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' @@ -18,7 +18,7 @@ install='plan9.install' options=('!zipman' 'staticlibs') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz" 'plan9.sh') -sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f' +sha256sums=('cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb' '8768c080a8ceb0a52a3f866bd8ffc4b26f9deb97c6877ceea78ec0b316325a6b') package() { @@ -46,12 +46,6 @@ package() { rm -f config install.log install.sum install.txt configure Makefile INSTALL \ LICENSE - # The old method for fixing hardcoded paths - #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do - # echo -n "\t$f" - # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true - #done - # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \ @@ -71,7 +65,6 @@ package() { done # Once more - #grep --null -l -r "$pkgdir/usr/local/plan9" | xargs --null sed -i "s!$pkgdir/usr/local/plan9!${PLAN9}!g" grep --null -l -r "$pkgdir$PLAN9" | xargs --null sed -i "s!$pkgdir$PLAN9!${PLAN9}!g" || true grep --null -l -r "/build/plan9port/pkg/plan9port/$PLAN9" | xargs --null sed -i "s!/build/plan9port/pkg/plan9port/$PLAN9!${PLAN9}!g" || true } diff --git a/community/python-coverage/PKGBUILD b/community/python-coverage/PKGBUILD new file mode 100644 index 000000000..d954a2fbf --- /dev/null +++ b/community/python-coverage/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 110741 2014-05-06 01:07:19Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Clément Démoulins <clement@archivel.fr> +# Contributor: Fazlul Shahriar <fshahriar@gmail.com> + +pkgname=(python-coverage python2-coverage) +pkgver=3.7.1 +pkgrel=3 +pkgdesc="A tool for measuring code coverage of Python programs" +arch=('i686' 'x86_64') +url="http://nedbatchelder.com/code/coverage/" +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools') +checkdepends=('python-mock' 'python2-mock' 'python-nose' 'python2-nose') +source=("http://pypi.python.org/packages/source/c/coverage/coverage-$pkgver.tar.gz") +md5sums=('c47b36ceb17eaff3ecfab3bcd347d0df') + +prepare() { + cp -a coverage-$pkgver{,-py2} +} + +build() { + cd "$srcdir/coverage-$pkgver" + python3 setup.py build + + cd "$srcdir/coverage-$pkgver-py2" + python2 setup.py build +} + +check() { + cd "$srcdir/coverage-$pkgver" + #python3 igor.py zip_mods install_egg remove_extension + #python3 igor.py test_with_tracer py + #python3 setup.py --quiet build_ext --inplace + #python3 igor.py test_with_tracer c +} + +package_python-coverage() { + depends=('python') + + cd coverage-$pkgver + python3 setup.py install --root="$pkgdir" --optimize=1 +} + +package_python2-coverage() { + depends=('python2') + + cd coverage-$pkgver + python2 setup.py install --root="$pkgdir" --optimize=1 + + mv "$pkgdir/usr/bin/coverage" "$pkgdir/usr/bin/coverage2" +} diff --git a/community/python-tornado/PKGBUILD b/community/python-tornado/PKGBUILD index 527774e25..e77d5a08d 100644 --- a/community/python-tornado/PKGBUILD +++ b/community/python-tornado/PKGBUILD @@ -1,46 +1,57 @@ -# $Id: PKGBUILD 108507 2014-03-27 14:48:32Z fyan $ +# $Id: PKGBUILD 110749 2014-05-06 04:31:01Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=('python-tornado' 'python2-tornado') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc='open source version of the scalable, non-blocking web server and tools' arch=('i686' 'x86_64') url='http://www.tornadoweb.org/' license=('Apache') -makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname') -source=("https://github.com/facebook/tornado/archive/v${pkgver}.tar.gz") +makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname' 'git') +checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'twisted') +source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver") +sha512sums=('SKIP') -build() { - cp -r tornado-${pkgver} python2-tornado-${pkgver} +prepare() { + cp -a tornado{,-py2} - cd tornado-${pkgver} + # python -> python2 rename + find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \; +} +build() { + cd tornado python setup.py build - cd ../python2-tornado-${pkgver} + cd ../tornado-py2 + python2 setup.py build +} - # python -> python2 rename - find -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \; +check() { + cd tornado + python -m tornado.test.runtests || : + python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || : + python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || : - python2 setup.py build + cd ../tornado-py2 + python2 -m tornado.test.runtests || : + python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || : + python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || : } package_python-tornado() { depends=('python') - cd tornado-${pkgver} - + cd tornado python setup.py install --root="${pkgdir}" --optimize=1 } package_python2-tornado() { depends=('python2' 'python2-backports.ssl_match_hostname') - cd python2-tornado-${pkgver} - + cd tornado-py2 python2 setup.py install --root="${pkgdir}" --optimize=1 } -sha512sums=('1703178be34060a6c36e9e0aa742b87ad905dfb0f565e43a1158edfe5c7800fe35aff9168b60aabd3b831b339af6ef95aaa144a9fb167c5d93f548eb59fc2557') diff --git a/community/shairplay/PKGBUILD b/community/shairplay/PKGBUILD new file mode 100644 index 000000000..d1ad1c1a6 --- /dev/null +++ b/community/shairplay/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 110774 2014-05-06 17:52:11Z idevolder $ +# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> +# Contributor: winlu + +pkgname=shairplay +_gitname=shairplay +pkgver=20140422 +pkgrel=1 +pkgdesc='Apple airplay and raop protocol server' +arch=('i686' 'x86_64') +url='https://github.com/juhovh/shairplay' +license=('custom') +depends=('libao') +optdepends=('avahi: to run the server') +makedepends=('git') +source=("$_gitname::git://github.com/juhovh/shairplay.git#commit=64d59e3087f829006d091fa0d114efb50972a2bf" + 'shairplay.service') +sha256sums=('SKIP' + 'f0a176539a6c5be46dc832d054be2f18c3256e5fd34c5f1416c9463bd75c82b3') +options=(!libtool) +provides=('libshairport') +conflicts=('libshairport') + +build() { + cd $_gitname + + # installing airport.key to /etc/shairplay/ + sed 's/airport.key/\/etc\/shairplay\/airport.key/' -i "$srcdir/$_gitname"/src/shairplay.c + + ./autogen.sh + ./configure --prefix=/usr/ + make +} + + +package() { + cd $_gitname + make DESTDIR="$pkgdir" install + + # install systemd service file + install -Dm644 "$srcdir/shairplay.service" "$pkgdir/usr/lib/systemd/system/shairplay.service" + + # install key file + install -Dm644 airport.key "$pkgdir/etc/shairplay/airport.key" + + # install license file + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # install documentation + install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md" +} diff --git a/community/shairplay/shairplay.service b/community/shairplay/shairplay.service new file mode 100644 index 000000000..a62438412 --- /dev/null +++ b/community/shairplay/shairplay.service @@ -0,0 +1,13 @@ +[Unit] +Description=Apple airplay and raop protocol server +Requires=network.target sound.target +Wants=avahi-daemon.service +After=avahi-daemon.service + +[Service] +Type=simple +ExecStart=/usr/bin/shairplay -a %H +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD index c035ae09c..aa46c8c14 100644 --- a/community/vagrant/PKGBUILD +++ b/community/vagrant/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109994 2014-04-22 19:49:32Z jsteel $ +# $Id: PKGBUILD 110787 2014-05-06 20:58:28Z jsteel $ # Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: Ido Rosen <ido@kernel.org> # Contributor: Brett Hoerner <brett@bretthoerner.com> @@ -10,7 +10,7 @@ # Contributor: Steven Nance <steven@devtrw.com> pkgname=vagrant -pkgver=1.5.4 +pkgver=1.6.0 pkgrel=1 pkgdesc="Build and distribute virtualized development environments" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!emptydirs') depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump') source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip) -md5sums=('f6c22ddf494b3bcd860a751e38a8ef1c') +md5sums=('c3d23bc5573e0790eaebfc08e59f0384') [[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4' [[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b' diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index fdc385446..dafe8812d 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106919 2014-03-10 11:29:59Z tredaelli $ +# $Id: PKGBUILD 110754 2014-05-06 09:29:25Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.6 +pkgver=1.10.7 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +13,7 @@ makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' url='http://www.wireshark.org/' source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 wireshark-1.10.5-fix-flow-crash.patch) -sha256sums=('a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d' +sha256sums=('d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6' 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') prepare() { @@ -39,7 +39,7 @@ build() { package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') + depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') install=wireshark.install conflicts=(wireshark) diff --git a/community/znc/01-sec-correctly-handle-channel-names.patch b/community/znc/01-sec-correctly-handle-channel-names.patch new file mode 100644 index 000000000..cc48d13c9 --- /dev/null +++ b/community/znc/01-sec-correctly-handle-channel-names.patch @@ -0,0 +1,72 @@ +From 8756be513ab6663dcd64087006b257ff34e8e487 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter <psychon@znc.in> +Date: Sun, 13 Apr 2014 20:36:55 +0200 +Subject: [PATCH] webadmin/add channel: Correctly handle channel names + +The CChan constructor makes sure that the channel name begins with a valid +channel prefix. Thus, this could change the name of the resulting channel. + +When you edited an irc network which already had a channel "#foo", were +connected to IRC (so ZNC knows which prefixes are valid) and added a channel +"foo", this would lead to a problem: + +Webadmin checks and sees that there is no channel "foo" yet. Webadmin creates a +new CChan instance for "foo". The CChan constructor notices that "f" is not a +valid channel prefix and instead calls itself "#foo". Then, +CIRCNetwork::AddChan() would see that this channel already exists, delete the +given channel and return false. + +However, webadmin didn't check this result and would continue changing settings +on an already destroyed CChan instance. + +Fix this by checking if the channel exists after CChan had its chance to mess +with the channel name. Also handle failures from CIRCNetwork::AddChan(). + +Fixes #528. + +Signed-off-by: Uli Schlachter <psychon@znc.in> +(cherry picked from commit 5e6e3be32acfeadeaf1fb3bb17bada08aec6432f) +--- + modules/webadmin.cpp | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp +index ec67508..2a03367 100644 +--- a/modules/webadmin.cpp ++++ b/modules/webadmin.cpp +@@ -667,13 +667,19 @@ class CWebAdminMod : public CModule { + return true; + } + +- if (pNetwork->FindChan(sChanName.Token(0))) { +- WebSock.PrintErrorPage("Channel [" + sChanName.Token(0) + "] already exists"); ++ // This could change the channel name and e.g. add a "#" prefix ++ pChan = new CChan(sChanName, pNetwork, true); ++ ++ if (pNetwork->FindChan(pChan->GetName())) { ++ WebSock.PrintErrorPage("Channel [" + pChan->GetName() + "] already exists"); ++ delete pChan; + return true; + } + +- pChan = new CChan(sChanName, pNetwork, true); +- pNetwork->AddChan(pChan); ++ if (!pNetwork->AddChan(pChan)) { ++ WebSock.PrintErrorPage("Could not add channel [" + pChan->GetName() + "]"); ++ return true; ++ } + } + + pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin()); +@@ -699,7 +705,7 @@ class CWebAdminMod : public CModule { + + CTemplate TmplMod; + TmplMod["User"] = pUser->GetUserName(); +- TmplMod["ChanName"] = sChanName; ++ TmplMod["ChanName"] = pChan->GetName(); + TmplMod["WebadminAction"] = "change"; + FOR_EACH_MODULE(it, pNetwork) { + (*it)->OnEmbeddedWebRequest(WebSock, "webadmin/channel", TmplMod); +-- +1.9.1 + diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD deleted file mode 100644 index ebc703e1d..000000000 --- a/community/znc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 108519 2014-03-27 14:48:42Z fyan $ -# Maintainer: Sébastien Luttringer -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: mickael9 <mickael9 at gmail dot com> - -pkgname=znc -pkgver=1.2 -pkgrel=2 -pkgdesc='An IRC bouncer with modules & scripts support' -url='http://en.znc.in/wiki/index.php/ZNC' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('libsasl') -makedepends=('tcl' 'python' 'perl') -optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') -install=$pkgname.install -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") -md5sums=('ef18e5402a82cc3fcab5c2ac5c2e6f3b') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-cyrus \ - --enable-python \ - --enable-perl \ - --enable-tcl \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/znc/znc.install b/community/znc/znc.install deleted file mode 100644 index e5dd6575a..000000000 --- a/community/znc/znc.install +++ /dev/null @@ -1,29 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - getent group znc >/dev/null || groupadd -g 136 znc - getent passwd znc >/dev/null || useradd -r -d /var/lib/znc -u 136 -g 136 znc - [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc - echo "==> Use 'znc --makeconf' as user znc to generate your first config" - true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "`vercmp $2 1.0-4`" -lt 0 ]; then - [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc - usermod -d /var/lib/znc znc 2>/dev/null && echo '==> znc home directory has moved to /var/lib/znc' - fi - true -} - -# arg 1: the old package version -post_remove() { - userdel -f znc >/dev/null 2>&1 - groupdel znc >/dev/null 2>&1 - true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/extra/ffmpeg/0001-libx265-Support-API-version-9.patch b/extra/ffmpeg/0001-libx265-Support-API-version-9.patch deleted file mode 100644 index 3b6a6e24c..000000000 --- a/extra/ffmpeg/0001-libx265-Support-API-version-9.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001 -From: Derek Buitenhuis <derek.buitenhuis@gmail.com> -Date: Thu, 6 Mar 2014 20:01:17 +0000 -Subject: [PATCH] libx265: Support API version 9 - -Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> ---- - configure | 4 ++-- - libavcodec/libx265.c | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure b/configure -index d3f5f33..4d7382a 100755 ---- a/configure -+++ b/configure -@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 & - { check_cpp_condition x264.h "X264_BUILD >= 118" || - die "ERROR: libx264 version must be >= 0.118."; } - enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode && -- { check_cpp_condition x265.h "X265_BUILD >= 7" || -- die "ERROR: libx265 version must be >= 7."; } -+ { check_cpp_condition x265.h "X265_BUILD >= 9" || -+ die "ERROR: libx265 version must be >= 9."; } - enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs - enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore - enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || -diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c -index 961fc74..a6e4193 100644 ---- a/libavcodec/libx265.c -+++ b/libavcodec/libx265.c -@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) - av_reduce(&sar_num, &sar_den, - avctx->sample_aspect_ratio.num, - avctx->sample_aspect_ratio.den, 4096); -- ctx->params->bEnableVuiParametersPresentFlag = 1; -- ctx->params->bEnableAspectRatioIdc = 1; -- ctx->params->aspectRatioIdc = 255; -- ctx->params->sarWidth = sar_num; -- ctx->params->sarHeight = sar_den; -+ ctx->params->vui.bEnableVuiParametersPresentFlag = 1; -+ ctx->params->vui.bEnableAspectRatioIdc = 1; -+ ctx->params->vui.aspectRatioIdc = 255; -+ ctx->params->vui.sarWidth = sar_num; -+ ctx->params->vui.sarHeight = sar_den; - - if (x265_max_bit_depth == 8) - ctx->params->internalBitDepth = 8; --- -1.7.10.4 - diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 6bcb3e7b8..312e32c4f 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212060 2014-05-05 19:27:06Z bpiotrowski $ +# $Id: PKGBUILD 212064 2014-05-06 08:27:42Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> diff --git a/extra/liblastfm/PKGBUILD b/extra/liblastfm/PKGBUILD index fc4e68b66..fff5a34c1 100644 --- a/extra/liblastfm/PKGBUILD +++ b/extra/liblastfm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181867 2013-04-05 02:24:25Z eric $ +# $Id: PKGBUILD 212062 2014-05-06 02:04:21Z fyan $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: XazZ <xazz.xazz [AT] googlemail.com> pkgname=liblastfm -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="A Qt4 C++ library for the Last.fm webservices" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('qt4' 'fftw' 'libsamplerate') makedepends=('cmake') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgname}/tarball/${pkgver}") -sha1sums=('b679bf76272b05373efcc2a8f3ee809599607853') +sha1sums=('6bfa30962cdabe175bba0abadbf6772fbbece199') build() { mkdir build diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index a6d65edf1..8d4deedb1 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 209812 2014-04-04 16:31:16Z giovanni $ +# $Id: PKGBUILD 212078 2014-05-06 14:16:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2014.03.25 +pkgver=2014.04.23 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('b2e1946260716252054cf2a81e061ed3') +md5sums=('f549f364374e2eec1000bc0ce31d6e74') build() { cd ${srcdir}/live diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index b28c023cd..4f4f057a1 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203529 2014-01-12 20:24:07Z foutrelis $ +# $Id: PKGBUILD 212082 2014-05-06 14:39:43Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -12,7 +12,7 @@ pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer' 'clang-tools-extra') pkgver=3.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -23,6 +23,8 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz clang-3.3-use-gold-linker.patch + clang-3.4-max_align_t.patch + llvm-3.4-provide-cmake-modules.patch llvm-Config-config.h llvm-Config-llvm-config.h) sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628' @@ -30,6 +32,8 @@ sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628' 'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4' 'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c' '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' + '0f0cbff69af54e83383385abbdeb1fee23e6e69427f8530060c492c0b07c2bbe' + 'b6bb154d5ec998328e818bb09acfc6229e41367ba45cea7cc5b2dd2a7c835cf5' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') @@ -50,6 +54,16 @@ prepare() { # Make -flto work; use ld.gold instead of the default linker patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch" + + # Teach Clang to provide ::max_align_t in C11 and C++11 modes (FS#40229) + # http://reviews.llvm.org/rL201729 + patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-max_align_t.patch" + + # Provide CMake modules (FS#38705) + # http://reviews.llvm.org/rL201047 + # http://reviews.llvm.org/rL201048 + # http://reviews.llvm.org/rL201053 + patch -Np0 -i "$srcdir/llvm-3.4-provide-cmake-modules.patch" } build() { @@ -200,6 +214,21 @@ package_clang() { python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" + # Install clang-format editor integration files (FS#38485) + # Destination paths are copied from clang-format/CMakeLists.txt + install -d "$pkgdir/usr/share/$pkgname" + ( + cd tools/clang-format + cp \ + clang-format-diff.py \ + clang-format-sublime.py \ + clang-format.el \ + clang-format.py \ + "$pkgdir/usr/share/$pkgname/" + cp git-clang-format "$pkgdir/usr/bin/" + sed -i 's|/usr/bin/python$|&2|' "$pkgdir/usr/bin/git-clang-format" + ) + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/llvm/clang-3.4-max_align_t.patch b/extra/llvm/clang-3.4-max_align_t.patch new file mode 100644 index 000000000..a41f37e93 --- /dev/null +++ b/extra/llvm/clang-3.4-max_align_t.patch @@ -0,0 +1,36 @@ +Index: lib/Headers/stddef.h +=================================================================== +--- lib/Headers/stddef.h (revision 201728) ++++ lib/Headers/stddef.h (revision 201729) +@@ -84,6 +84,16 @@ + #endif + #endif + ++#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L ++typedef struct { ++ long long __clang_max_align_nonce1 ++ __attribute__((__aligned__(__alignof__(long long)))); ++ long double __clang_max_align_nonce2 ++ __attribute__((__aligned__(__alignof__(long double)))); ++} max_align_t; ++#define __CLANG_MAX_ALIGN_T_DEFINED ++#endif ++ + #define offsetof(t, d) __builtin_offsetof(t, d) + + #endif /* __STDDEF_H */ +Index: test/Headers/c11.c +=================================================================== +--- test/Headers/c11.c (revision 201728) ++++ test/Headers/c11.c (revision 201729) +@@ -22,6 +22,10 @@ + #define __STDC_WANT_LIB_EXT1__ 1 + #include <stddef.h> + rsize_t x = 0; ++_Static_assert(sizeof(max_align_t) >= sizeof(long long), ""); ++_Static_assert(alignof(max_align_t) >= alignof(long long), ""); ++_Static_assert(sizeof(max_align_t) >= sizeof(long double), ""); ++_Static_assert(alignof(max_align_t) >= alignof(long double), ""); + + // If we are freestanding, then also check RSIZE_MAX (in a hosted implementation + // we will use the host stdint.h, which may not yet have C11 support). diff --git a/extra/llvm/llvm-3.4-provide-cmake-modules.patch b/extra/llvm/llvm-3.4-provide-cmake-modules.patch new file mode 100644 index 000000000..1b1244885 --- /dev/null +++ b/extra/llvm/llvm-3.4-provide-cmake-modules.patch @@ -0,0 +1,319 @@ +Index: cmake/modules/LLVMConfig.cmake.in +=================================================================== +--- cmake/modules/LLVMConfig.cmake.in (revision 201046) ++++ cmake/modules/LLVMConfig.cmake.in (revision 201047) +@@ -41,16 +41,6 @@ + set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) + set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") + +-# We try to include using the current setting of CMAKE_MODULE_PATH, +-# which suppossedly was filled by the user with the directory where +-# this file was installed: +-include( LLVM-Config OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED ) +- +-# If failed, we assume that this is an un-installed build: +-if( NOT LLVMCONFIG_INCLUDED ) +- set(CMAKE_MODULE_PATH +- ${CMAKE_MODULE_PATH} +- "@LLVM_SOURCE_DIR@/cmake/modules") +- include( LLVM-Config ) +-endif() +- ++get_filename_component(_SELF_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) ++include(${_SELF_DIR}/LLVM-Config.cmake) ++unset(_SELF_DIR) +Index: cmake/modules/LLVMConfig.cmake.in +=================================================================== +--- cmake/modules/LLVMConfig.cmake.in (revision 201047) ++++ cmake/modules/LLVMConfig.cmake.in (revision 201048) +@@ -1,5 +1,7 @@ + # This file provides information and services to the final user. + ++@LLVM_CONFIG_CODE@ ++ + set(LLVM_VERSION_MAJOR @LLVM_VERSION_MAJOR@) + set(LLVM_VERSION_MINOR @LLVM_VERSION_MINOR@) + set(LLVM_PACKAGE_VERSION @PACKAGE_VERSION@) +@@ -36,11 +38,9 @@ + set(LLVM_ON_UNIX @LLVM_ON_UNIX@) + set(LLVM_ON_WIN32 @LLVM_ON_WIN32@) + +-set(LLVM_INSTALL_PREFIX "@LLVM_INSTALL_PREFIX@") +-set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include) +-set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) ++set(LLVM_INCLUDE_DIRS "@LLVM_CONFIG_INCLUDE_DIRS@") ++set(LLVM_LIBRARY_DIRS "@LLVM_CONFIG_LIBRARY_DIRS@") + set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") ++set(LLVM_CMAKE_DIR "@LLVM_CONFIG_CMAKE_DIR@") + +-get_filename_component(_SELF_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) +-include(${_SELF_DIR}/LLVM-Config.cmake) +-unset(_SELF_DIR) ++include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake) +Index: utils/llvm-build/llvmbuild/main.py +=================================================================== +--- utils/llvm-build/llvmbuild/main.py (revision 201052) ++++ utils/llvm-build/llvmbuild/main.py (revision 201053) +@@ -573,6 +573,40 @@ + + f.close() + ++ def write_cmake_exports_fragment(self, output_path): ++ """ ++ write_cmake_exports_fragment(output_path) -> None ++ ++ Generate a CMake fragment which includes LLVMBuild library ++ dependencies expressed similarly to how CMake would write ++ them via install(EXPORT). ++ """ ++ ++ dependencies = list(self.get_fragment_dependencies()) ++ ++ # Write out the CMake exports fragment. ++ make_install_dir(os.path.dirname(output_path)) ++ f = open(output_path, 'w') ++ ++ f.write("""\ ++# Explicit library dependency information. ++# ++# The following property assignments tell CMake about link ++# dependencies of libraries imported from LLVM. ++""") ++ for ci in self.ordered_component_infos: ++ # We only write the information for libraries currently. ++ if ci.type_name != 'Library': ++ continue ++ ++ f.write("""\ ++set_property(TARGET %s PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES %s)\n""" % ( ++ ci.get_prefixed_library_name(), " ".join(sorted( ++ dep.get_prefixed_library_name() ++ for dep in self.get_required_libraries_for_component(ci))))) ++ ++ f.close() ++ + def write_make_fragment(self, output_path): + """ + write_make_fragment(output_path) -> None +@@ -780,6 +814,10 @@ + dest="write_cmake_fragment", metavar="PATH", + help="Write the CMake project information to PATH", + action="store", default=None) ++ group.add_option("", "--write-cmake-exports-fragment", ++ dest="write_cmake_exports_fragment", metavar="PATH", ++ help="Write the CMake exports information to PATH", ++ action="store", default=None) + group.add_option("", "--write-make-fragment", + dest="write_make_fragment", metavar="PATH", + help="Write the Makefile project information to PATH", +@@ -861,6 +899,8 @@ + # Write out the cmake fragment, if requested. + if opts.write_cmake_fragment: + project_info.write_cmake_fragment(opts.write_cmake_fragment) ++ if opts.write_cmake_exports_fragment: ++ project_info.write_cmake_exports_fragment(opts.write_cmake_exports_fragment) + + # Configure target definition files, if requested. + if opts.configure_target_def_files: +Index: Makefile.rules +=================================================================== +--- Makefile.rules (revision 201052) ++++ Makefile.rules (revision 201053) +@@ -78,6 +78,12 @@ + + # The files we are going to generate using llvm-build. + LLVMBuildMakeFrag := $(PROJ_OBJ_ROOT)/Makefile.llvmbuild ++LLVMBuildCMakeFrag := $(PROJ_OBJ_ROOT)/LLVMBuild.cmake ++LLVMBuildCMakeExportsFrag := $(PROJ_OBJ_ROOT)/cmake/modules/LLVMBuildExports.cmake ++LLVMBuildMakeFrags := \ ++ $(LLVMBuildMakeFrag) \ ++ $(LLVMBuildCMakeFrag) \ ++ $(LLVMBuildCMakeExportsFrag) + LLVMConfigLibraryDependenciesInc := \ + $(PROJ_OBJ_ROOT)/tools/llvm-config/LibraryDependencies.inc + +@@ -94,8 +100,8 @@ + # + # We include a dependency on this Makefile to ensure that changes to the + # generation command get picked up. +-$(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules \ +- $(PROJ_OBJ_ROOT)/Makefile.config ++$(LLVMBuildMakeFrags): $(PROJ_SRC_ROOT)/Makefile.rules \ ++ $(PROJ_OBJ_ROOT)/Makefile.config + $(Echo) Constructing LLVMBuild project information. + $(Verb)$(PYTHON) $(LLVMBuildTool) \ + --native-target "$(TARGET_NATIVE_ARCH)" \ +@@ -102,10 +108,12 @@ + --enable-targets "$(TARGETS_TO_BUILD)" \ + --enable-optional-components "$(OPTIONAL_COMPONENTS)" \ + --write-library-table $(LLVMConfigLibraryDependenciesInc) \ +- --write-make-fragment $(LLVMBuildMakeFrag) ++ --write-make-fragment $(LLVMBuildMakeFrag) \ ++ --write-cmake-fragment $(LLVMBuildCMakeFrag) \ ++ --write-cmake-exports-fragment $(LLVMBuildCMakeExportsFrag) + + # For completeness, let Make know how the extra files are generated. +-$(LLVMConfigLibraryDependenciesInc): $(LLVMBuildMakeFrag) ++$(LLVMConfigLibraryDependenciesInc): $(LLVMBuildMakeFrags) + + # Include the generated Makefile fragment. + # +@@ -120,7 +128,7 @@ + + # Clean the generated makefile fragment at the top-level. + clean-local:: +- -$(Verb) $(RM) -f $(LLVMBuildMakeFrag) ++ -$(Verb) $(RM) -f $(LLVMBuildMakeFrags) + endif + -include $(LLVMBuildMakeFrag) + +Index: Makefile +=================================================================== +--- Makefile (revision 201052) ++++ Makefile (revision 201053) +@@ -15,7 +15,7 @@ + # 3. Build IR, which builds the Intrinsics.inc file used by libs. + # 4. Build libs, which are needed by llvm-config. + # 5. Build llvm-config, which determines inter-lib dependencies for tools. +-# 6. Build tools and docs. ++# 6. Build tools, docs, and cmake modules. + # + # When cross-compiling, there are some things (tablegen) that need to + # be build for the build system first. +@@ -31,7 +31,7 @@ + OPTIONAL_DIRS := tools/clang/utils/TableGen + else + DIRS := lib/Support lib/TableGen utils lib/IR lib tools/llvm-shlib \ +- tools/llvm-config tools docs unittests ++ tools/llvm-config tools docs cmake unittests + OPTIONAL_DIRS := projects bindings + endif + +Index: cmake/modules/Makefile +=================================================================== +--- cmake/modules/Makefile (revision 0) ++++ cmake/modules/Makefile (revision 201053) +@@ -0,0 +1,106 @@ ++##===- cmake/modules/Makefile ------------------------------*- Makefile -*-===## ++# ++# The LLVM Compiler Infrastructure ++# ++# This file is distributed under the University of Illinois Open Source ++# License. See LICENSE.TXT for details. ++# ++##===----------------------------------------------------------------------===## ++ ++LEVEL = ../.. ++ ++LINK_COMPONENTS := all ++ ++include $(LEVEL)/Makefile.common ++ ++PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake ++ ++OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake ++ ++# TODO: Teach LLVM-Config.cmake to work without explicit terminfo libs. ++TERMINFO_LIBS := tinfo terminfo curses ncurses ncursesw ++TERMINFO_LIBS := $(filter $(TERMINFO_LIBS),$(subst -l,,$(LIBS))) ++ ++$(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) ++ $(Echo) 'Generating LLVM CMake package config file' ++ $(Verb) ( \ ++ cat $< | sed \ ++ -e 's/@LLVM_CONFIG_CODE@/set(LLVM_INSTALL_PREFIX "'"$(subst /,\/,$(PROJ_prefix))"'")/' \ ++ -e 's/@LLVM_VERSION_MAJOR@/'"$(LLVM_VERSION_MAJOR)"'/' \ ++ -e 's/@LLVM_VERSION_MINOR@/'"$(LLVM_VERSION_MINOR)"'/' \ ++ -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ ++ -e 's/@LLVM_COMMON_DEPENDS@//' \ ++ -e 's/"@llvm_libs@"/'"$(subst -l,,$(LLVMConfigLibs))"'/' \ ++ -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ ++ -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ ++ -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ ++ -e 's/@TARGET_TRIPLE@/'"$(TARGET_TRIPLE)"'/' \ ++ -e 's/@LLVM_ENABLE_TERMINFO@/'"$(ENABLE_TERMINFO)"'/' \ ++ -e 's/@LLVM_ENABLE_THREADS@/'"$(ENABLE_THREADS)"'/' \ ++ -e 's/@LLVM_ENABLE_ZLIB@/'"$(ENABLE_ZLIB)"'/' \ ++ -e 's/@LLVM_NATIVE_ARCH@/'"$(LLVM_NATIVE_ARCH)"'/' \ ++ -e 's/@LLVM_ENABLE_PIC@/'"$(ENABLE_PIC)"'/' \ ++ -e 's/@HAVE_TERMINFO@/'"$(HAVE_TERMINFO)"'/' \ ++ -e 's/@TERMINFO_LIBS@/'"$(TERMINFO_LIBS)"'/' \ ++ -e 's/@HAVE_LIBDL@/'"$(HAVE_DLOPEN)"'/' \ ++ -e 's/@HAVE_LIBPTHREAD@/'"$(HAVE_PTHREAD)"'/' \ ++ -e 's/@HAVE_LIBZ@/'"$(HAVE_LIBZ)"'/' \ ++ -e 's/@LLVM_ON_UNIX@/'"$(LLVM_ON_UNIX)"'/' \ ++ -e 's/@LLVM_ON_WIN32@/'"$(LLVM_ON_WIN32)"'/' \ ++ -e 's/@LLVM_CONFIG_INCLUDE_DIRS@/'"$(subst /,\/,$(PROJ_includedir))"'/' \ ++ -e 's/@LLVM_CONFIG_LIBRARY_DIRS@/'"$(subst /,\/,$(PROJ_libdir))"'/' \ ++ -e 's/@LLVM_CONFIG_CMAKE_DIR@/'"$(subst /,\/,$(PROJ_cmake))"'/' \ ++ -e 's/@LLVM_CONFIG_EXPORTS_FILE@/$${LLVM_CMAKE_DIR}\/LLVMExports.cmake/' \ ++ -e 's/@all_llvm_lib_deps@//' \ ++ && \ ++ # TODO: Teach LLVM-Config.cmake to use builtin CMake features \ ++ # for library dependencies. For now add the generated fragments. \ ++ grep '^set_property.*LLVMBUILD_LIB_DEPS_' "$(LLVMBuildCMakeFrag)" \ ++ ) > $@ ++ ++$(PROJ_OBJ_DIR)/LLVMConfigVersion.cmake: LLVMConfigVersion.cmake.in ++ $(Echo) 'Generating LLVM CMake package version file' ++ $(Verb) cat $< | sed \ ++ -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ ++ > $@ ++ ++$(PROJ_OBJ_DIR)/LLVMExports.cmake: $(LLVMBuildCMakeExportsFrag) ++ $(Echo) 'Generating LLVM CMake target exports file' ++ $(Verb) ( \ ++ echo '# LLVM CMake target exports. Do not include directly.' && \ ++ for lib in $(subst -l,,$(LLVMConfigLibs)); do \ ++ echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ ++ echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ ++ done && \ ++ cat "$(LLVMBuildCMakeExportsFrag)" \ ++ ) > $@ ++ ++all-local:: $(addprefix $(PROJ_OBJ_DIR)/, $(OBJMODS)) ++ ++SKIPSRCMODS := \ ++ CheckAtomic.cmake \ ++ GetHostTriple.cmake \ ++ LLVMBuildExports.cmake \ ++ LLVMConfig.cmake \ ++ LLVMConfigVersion.cmake \ ++ LLVMExports.cmake \ ++ VersionFromVCS.cmake ++ ++SRCMODS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cmake)) ++SRCMODS := $(filter-out $(SKIPSRCMODS),$(SRCMODS)) ++INSTSRCMODS := $(addprefix $(PROJ_cmake)/, $(SRCMODS)) ++INSTOBJMODS := $(addprefix $(PROJ_cmake)/, $(OBJMODS)) ++ ++$(PROJ_cmake): ++ $(Echo) Making install directory: $@ ++ $(Verb) $(MKDIR) $@ ++ ++$(INSTSRCMODS): $(PROJ_cmake)/%.cmake: $(PROJ_SRC_DIR)/%.cmake | $(PROJ_cmake) ++ $(Echo) Installing cmake modules: $(notdir $<) ++ $(Verb) $(DataInstall) $< $(PROJ_cmake) ++ ++$(INSTOBJMODS): $(PROJ_cmake)/%.cmake: $(PROJ_OBJ_DIR)/%.cmake | $(PROJ_cmake) ++ $(Echo) Installing cmake modules: $(notdir $<) ++ $(Verb) $(DataInstall) $< $(PROJ_cmake) ++ ++install-local:: $(INSTSRCMODS) $(INSTOBJMODS) +Index: cmake/Makefile +=================================================================== +--- cmake/Makefile (revision 0) ++++ cmake/Makefile (revision 201053) +@@ -0,0 +1,12 @@ ++##===- cmake/Makefile --------------------------------------*- Makefile -*-===## ++# ++# The LLVM Compiler Infrastructure ++# ++# This file is distributed under the University of Illinois Open Source ++# License. See LICENSE.TXT for details. ++# ++##===----------------------------------------------------------------------===## ++LEVEL = .. ++DIRS := modules ++ ++include $(LEVEL)/Makefile.common diff --git a/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch b/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch deleted file mode 100644 index 6cae41238..000000000 --- a/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9d635fa7f46f000d23663e0be3a900d2c51a3ed8 Mon Sep 17 00:00:00 2001 -From: dormando <dormando@rydia.net> -Date: Sat, 19 Apr 2014 12:15:29 -0700 -Subject: [PATCH 1/2] don't drop to a condition without holding the lock - -I am a moran. How do you even thread. ---- - items.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/items.c b/items.c -index 688ad03..3e2f71f 100644 ---- a/items.c -+++ b/items.c -@@ -764,6 +764,7 @@ static void item_crawler_evaluate(item *search, uint32_t hv, int i) { - static void *item_crawler_thread(void *arg) { - int i; - -+ pthread_mutex_lock(&lru_crawler_lock); - if (settings.verbose > 2) - fprintf(stderr, "Starting LRU crawler background thread\n"); - while (do_run_lru_crawler_thread) { -@@ -827,8 +828,8 @@ static void *item_crawler_thread(void *arg) { - STATS_LOCK(); - stats.lru_crawler_running = false; - STATS_UNLOCK(); -- pthread_mutex_unlock(&lru_crawler_lock); - } -+ pthread_mutex_unlock(&lru_crawler_lock); - if (settings.verbose > 2) - fprintf(stderr, "LRU crawler thread stopping\n"); - --- -1.9.2 - diff --git a/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch b/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch deleted file mode 100644 index f6767362f..000000000 --- a/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d8b1047620a54443f6bdca7f0dc5ee3b4d99378e Mon Sep 17 00:00:00 2001 -From: dormando <dormando@rydia.net> -Date: Sat, 19 Apr 2014 16:03:28 -0700 -Subject: [PATCH 2/2] flag crawler as running during the request to run - -... so there's no race to tell if it's running if you check after the command -exits. ---- - items.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/items.c b/items.c -index 3e2f71f..6261503 100644 ---- a/items.c -+++ b/items.c -@@ -769,9 +769,6 @@ static void *item_crawler_thread(void *arg) { - fprintf(stderr, "Starting LRU crawler background thread\n"); - while (do_run_lru_crawler_thread) { - pthread_cond_wait(&lru_crawler_cond, &lru_crawler_lock); -- STATS_LOCK(); -- stats.lru_crawler_running = true; -- STATS_UNLOCK(); - - while (crawler_count) { - item *search = NULL; -@@ -918,6 +915,9 @@ enum crawler_result_type lru_crawler_crawl(char *slabs) { - } - pthread_mutex_unlock(&cache_lock); - pthread_cond_signal(&lru_crawler_cond); -+ STATS_LOCK(); -+ stats.lru_crawler_running = true; -+ STATS_UNLOCK(); - pthread_mutex_unlock(&lru_crawler_lock); - return CRAWLER_OK; - } --- -1.9.2 - diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 063ce095c..4286dc01e 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 211562 2014-04-20 01:24:48Z dan $ +# $Id: PKGBUILD 212084 2014-05-06 15:28:08Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.18 +pkgver=1.4.19 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64) @@ -13,18 +13,12 @@ depends=('libevent') optdepends=('perl: for memcached-tool usage') install=memcached.install source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz - memcached.service - 0001-don-t-drop-to-a-condition-without-holding-the-lock.patch - 0002-flag-crawler-as-running-during-the-request-to-run.patch) -sha256sums=('6a5cc8d0874f13c5043d741af83fbdc4c681316d32b8313c0dbc82ca96f97439' - 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d' - 'dc25b5128e4b5f21d2a2d6186517139281e2e3bfc6142eaa72ef5840dbfc1236' - '07f959563571125248914392fb2a1e3f75a8692f5724c7ed98f0f16737801527') + memcached.service) +sha256sums=('5e18eac2e5b557d7a98b5e866b01ff5fd0f7ceac7356f7b9fffbf8ddbea4a58d' + 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 < ../0001-don-t-drop-to-a-condition-without-holding-the-lock.patch - patch -Np1 < ../0002-flag-crawler-as-running-during-the-request-to-run.patch ./configure --prefix=/usr make } diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 9bb5be5b8..3e949d673 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,29 +1,20 @@ -# $Id: PKGBUILD 211882 2014-04-28 15:42:49Z lcarlier $ +# $Id: PKGBUILD 212068 2014-05-06 08:35:05Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=10.1.1 -pkgrel=2 +pkgver=10.1.2 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - workaround-for-robustness-and-reset-with-intel.patch) -md5sums=('1fde7ed079df7aeb9b6a744ca033de8d' - '5c65a0fe315dd347e09b1f2826a1df5a' - 'b6b744a948b0de9cd14a2a971b7472de') - -prepare () { - cd ${srcdir}/?esa-* - - # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723 - patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch -} + LICENSE) +md5sums=('28b60d15ac9f364da1e0155911eaf44e' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* diff --git a/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch b/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch deleted file mode 100644 index dc4a213bb..000000000 --- a/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c -index e113654..5790680 100644 ---- a/src/mesa/drivers/dri/i965/brw_context.c -+++ b/src/mesa/drivers/dri/i965/brw_context.c -@@ -645,7 +645,7 @@ brwCreateContext(gl_api api, - - brw_init_driver_functions(brw, &functions); - -- if (notify_reset) -+ if (notify_reset && brw->gen >= 6) - functions.GetGraphicsResetStatus = brw_get_graphics_reset_status; - - struct gl_context *ctx = &brw->ctx; - - diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD index 62dbbbb27..b555dcb78 100644 --- a/extra/x265/PKGBUILD +++ b/extra/x265/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210087 2014-04-09 19:14:05Z bpiotrowski $ +# $Id: PKGBUILD 212066 2014-05-06 08:29:13Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: kfgz <kfgz at interia pl> pkgname=x265 -pkgver=0.9 +pkgver=1.0 pkgrel=1 pkgdesc='Open Source H265/HEVC video encoder' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gcc-libs') makedepends=('yasm' 'cmake') url='https://bitbucket.org/multicoreware/x265' source=($url/get/$pkgver.tar.bz2) -md5sums=('0cc0b0189cf9ed7422aad98633c6de8f') +md5sums=('80efe963d3460caa051fe0b10d36bc10') build() { cd multicoreware-x265-*/build/linux |