diff options
35 files changed, 347 insertions, 270 deletions
diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD index 5236301dc..ba034ff76 100644 --- a/community/dwm/PKGBUILD +++ b/community/dwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45679 2011-04-27 08:57:46Z spupykin $ +# $Id: PKGBUILD 51492 2011-07-10 19:48:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dag Odenhall <dag.odenhall@gmail.com> # Contributor: Grigorios Bouzakis <grbzks@gmail.com> pkgname=dwm -pkgver=5.8.2 -pkgrel=2 +pkgver=5.9 +pkgrel=1 pkgdesc="A dynamic window manager for X" url="http://dwm.suckless.org" arch=('i686' 'x86_64') @@ -16,24 +16,24 @@ install=dwm.install source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz config.h dwm.desktop) -md5sums=('f0b422bfeaa812d66c6dd15c3cc92a6b' +md5sums=('2799f885c05817ca112d521bb247f797' 'f0ba59bf77a53e3a2fc8596740ee5cb8' '939f403a71b6e85261d09fc3412269ee') build() { cd $srcdir/$pkgname-$pkgver - cp $srcdir/config.h config.h - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk sed -i 's/^CFLAGS = -g/#CFLAGS += -g/g' config.mk sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 - make PREFIX=/usr DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make PREFIX=/usr DESTDIR=$pkgdir install install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README install -m644 -D $srcdir/dwm.desktop $pkgdir//etc/X11/sessions/dwm.desktop diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD index 7ec7e79ce..7f19b59f5 100644 --- a/community/kaudiocreator/PKGBUILD +++ b/community/kaudiocreator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24995 2010-08-30 09:56:37Z andrea $ +# $Id: PKGBUILD 51505 2011-07-10 22:05:47Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=kaudiocreator -pkgver=1.2.90 +pkgver=1.2.95 pkgrel=1 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" arch=('i686' 'x86_64') @@ -13,12 +13,14 @@ depends=('kdemultimedia-kioslave' 'taglib' 'libdiscid') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://www.kde-apps.org/CONTENT/content-files/107645-${pkgname}-${pkgver}.tar.bz2") -md5sums=('3d86f19700ace837093a134876314862') +md5sums=('5449607bb940b7b9522f5c47c6149f99') build() { cd ${srcdir} + mkdir build cd build + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -27,5 +29,6 @@ build() { package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 20af83ec8..b10a7dde9 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9168 +pkgver=9179 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('MIT') makedepends=('pkgconfig') depends=('gtk2') source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") -md5sums=('15ec7483b579bd61edd972e81f3902b9') +md5sums=('f724413049ff2a3cc00799793190b1d0') build() { cd ${srcdir}/${pkgname}-r${pkgver} diff --git a/community/scilab/PKGBUILD b/community/scilab/PKGBUILD index 563d44f1d..a1996a774 100644 --- a/community/scilab/PKGBUILD +++ b/community/scilab/PKGBUILD @@ -4,7 +4,7 @@ pkgname=scilab pkgver=5.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Scilab is a scientific software package for numerical computations.' arch=('i686' 'x86_64') url='http://www.scilab.org/' @@ -14,30 +14,32 @@ depends=('libxml2' 'pcre' 'lapack' 'java-batik' 'java-flexdock>=0.5.2' 'ocaml' 'javahelp2' 'jgraphx=1_4_1_0' 'jlatexmath>=0.9.4' 'jlatexmath-fop>=0.9.4' 'junit' 'java-skinlf' 'xalan-java' 'java-commons-logging' 'hdf5') -makedepends=('apache-ant' 'antlr2') +makedepends=('apache-ant' 'antlr2' 'gcc-fortran' 'java-avalon-framework' 'xorg-fonts-type1') [[ $CARCH == x86_64 ]] && \ source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \ "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-x86_64-src.tar.gz" \ - 'scilab.desktop' 'classpath.xml') + 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch') [[ $CARCH == i686 ]] && \ source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \ "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-src.tar.gz" \ - 'scilab.desktop' 'classpath.xml') + 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch') [[ $CARCH == x86_64 ]] && md5sums=('0002653e670efabb8faf9e6403367134' '7c9bda373d8dfd75a4f8227a08ced588' 'ad6286f324891fe8b86c60e4012a36b7' - 'efe6e8d06968ba5e1a3e5ab540a79667') + 'efe6e8d06968ba5e1a3e5ab540a79667' + '7bf1a2149521db9e1c9a2ed684f9ce52') [[ $CARCH == i686 ]] && md5sums=('0002653e670efabb8faf9e6403367134' - '7545859e4078d3b77436b7f322967f26' + '7545859e4078d3b77436b7f322967f26' 'ad6286f324891fe8b86c60e4012a36b7' - 'efe6e8d06968ba5e1a3e5ab540a79667') + 'efe6e8d06968ba5e1a3e5ab540a79667' + '7bf1a2149521db9e1c9a2ed684f9ce52') options=('!libtool' '!emptydirs') build() { - # we do not want thigs we already have in Arch Linux + # we do not want things we already have in Arch Linux cd ${pkgname}-${pkgver}/thirdparty rm avalon* batik* commons-* flexdock* gluegen-rt* jeuclid* jgraphx* \ jhall* jlatexmath* jogl* jrosetta* junit* looks-2.1.1.jar xalan* \ @@ -47,6 +49,9 @@ build() { # begin configuring and building cd .. + # dirty hack to remove non-working hdf5 version check from configure + patch -Np0 -i ${srcdir}/configure-hdf5-vercheck.patch + ./configure \ --prefix=/usr \ --enable-build-localization \ @@ -56,7 +61,6 @@ build() { --with-fftw \ --with-hdf5 \ --with-gfortran # Needed for 64 bits, don't hurt for 32 bits - make all doc } diff --git a/community/scilab/configure-hdf5-vercheck.patch b/community/scilab/configure-hdf5-vercheck.patch new file mode 100644 index 000000000..0f1d875f3 --- /dev/null +++ b/community/scilab/configure-hdf5-vercheck.patch @@ -0,0 +1,24 @@ +--- configure.bak 2011-07-10 11:28:35.833136771 +0200 ++++ configure 2011-07-10 11:28:45.023136232 +0200 +@@ -19495,21 +19495,6 @@ + // #line 19495 "configure" + import ncsa.hdf.hdf5lib.H5; + +-public class conftest { +- public static void main(String[] argv) { +- String minVersion="1.8.4"; +- int[] vers = new int[3]; +- try { H5.H5get_libversion(vers); } +- catch (Throwable ex) {System.exit(-1);} +- String ver = vers[0] + "."+ vers[1] +"."+vers[2]; +- +- System.out.println(ver); +- if (minVersion.compareTo(ver) > 0) { +- System.exit(-1); +- } +- +- } +-} + EOF + + CLASSPATH=$ac_java_classpath diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index cc857b27b..c2c1efe37 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40748 2011-02-26 13:51:26Z spupykin $ +# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=tmux -pkgver=1.4 -pkgrel=3 +pkgver=1.5 +pkgrel=1 pkgdesc="A terminal multiplexer" url="http://tmux.sourceforge.net/" arch=('i686' 'x86_64') @@ -13,19 +13,23 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('0bfc7dd9a5bab192406167589c716a21' +md5sums=('3d4b683572af34e83bc8b183a8285263' '71601bc37fa44e4395580b321963018e') build() { cd "$srcdir/tmux-$pkgver" - ./configure - make PREFIX=/usr - make install PREFIX=/usr DESTDIR=$pkgdir + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/tmux-$pkgver" + make install DESTDIR=$pkgdir install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim" install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE" install -dm755 "$pkgdir/usr/share/tmux/" install -m644 examples/* "$pkgdir/usr/share/tmux/" - mv $pkgdir/usr/man $pkgdir/usr/share/ +# mv $pkgdir/usr/man $pkgdir/usr/share/ mkdir -p $pkgdir/etc/bash_completion.d/ mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/etc/bash_completion.d/tmux } diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 15d191ead..a2a11ec9e 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ +# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') + 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') build() { cd $srcdir/$pkgname-${pkgver} diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index e84bc6ed7..54aaa2236 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -6,7 +6,8 @@ run_hook () /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 25a2ae45c..13174ec06 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { if [ -z "${CRYPTO_MODULES}" ]; then MODULES=" dm-crypt $(all_modules "/crypto/") " @@ -9,7 +9,6 @@ install () fi FILES="" SCRIPT="encrypt" - add_dir "/dev/mapper" [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup" diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 118b43474..5af91a2ec 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 116764 2011-03-25 20:30:44Z tpowa $ +# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=1 +pkgrel=2 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" +conflicts=('mkinitcpio<0.7') depends=('device-mapper>=2.0.54') arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +17,8 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'd01908b414e1686c0f3233ff37de78a5' - '0a748b6e78b156f2f9dda45fc629651f') + 'bf6c61a11dbbb40d5152835075c9f438' + '2a1ef82fb32f065ee560dceef736475e') build() { cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname diff --git a/core/dmraid/dmraid_hook b/core/dmraid/dmraid_hook index d4e758c34..6219a718a 100644 --- a/core/dmraid/dmraid_hook +++ b/core/dmraid/dmraid_hook @@ -5,7 +5,8 @@ run_hook () /sbin/modprobe -q dm-mirror >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi msg ":: Activating dmraid arrays..." # prevent any event monitoring calls with -I diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index a20960aed..eeb9e0893 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -1,12 +1,11 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-mirror " BINARIES="/sbin/dmraid /sbin/dmsetup" FILES="" SCRIPT="dmraid" - add_dir "/dev/mapper" add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules" diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 39e3b4561..0e13adba9 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ +# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,25 +6,24 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.85 _pkgverlvm=${pkgver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install lvm2_hook Be-quiet-on-removing-cache-on-read-only-fs.diff 11-dm-initramfs.rules) md5sums=('91785ca438e5ce679dd3a386b183d552' - '9fbe01c6e3fca4634b4a38ecdc2f562f' - 'cf05f2c7281e24269ea9dcc6b4e106ba' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' '6db89da27928d2415a8e26cd0a842712' '69e40679cd8b3658bfc619e48baae125') sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' - '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' - '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' '6d7dd04be291d7537235704c816a701fd5beacc0' 'f6a554eea9557c3c236df2943bb6e7e723945c41') @@ -54,7 +53,7 @@ package_device-mapper() { package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') + conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index 86d2ea582..874b91d06 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -4,7 +4,8 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi # If the lvmwait= parameter has been specified on the command line diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index 0df69f81b..94175b523 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -1,13 +1,12 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-snapshot dm-mirror" BINARIES="" FILES="" SCRIPT="lvm2" - add_dir "/dev/mapper" add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" add_file "/lib/udev/rules.d/10-dm.rules" diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 0455dce6e..0f9d96fc8 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120375 2011-04-23 07:42:14Z tpowa $ +# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm -pkgver=3.2.1 -pkgrel=3 +pkgver=3.2.2 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" groups=('base') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 @@ -17,13 +17,19 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook - segfault-3.2.1.patch) + disable-werror.patch) install=mdadm.install replaces=('raidtools') +md5sums=('12ee2fbf3beddb60601fb7a4c4905651' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '4bb000166fb13e82ceaa2422fdfaac7e' + '36f7cc564ed3267888d90208e0eb7adc' + '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../segfault-3.2.1.patch + patch -Np0 -i ../disable-werror.patch make CXFLAGS="$CFLAGS" } @@ -36,13 +42,4 @@ package() { install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm # symlink for backward compatibility ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid - # build static mdassemble for Arch's initramfs - make MDASSEMBLE_AUTO=1 mdassemble - install -D -m755 mdassemble $pkgdir/sbin/mdassemble } -md5sums=('d1e2549202bd79d9e99f1498d1109530' - '6df172c8f77b280018cf87eb3d313f29' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb' - '2fd25605bd1836a33c689ac442cb73ed') diff --git a/core/mdadm/disable-werror.patch b/core/mdadm/disable-werror.patch new file mode 100644 index 000000000..50a33f19d --- /dev/null +++ b/core/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 57799d3b8..1d217a5a8 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -39,6 +39,4 @@ run_hook () esac done fi - # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble -}
\ No newline at end of file +} diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index b7a57ea4e..f351cb292 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " BINARIES="" @@ -11,7 +11,7 @@ install () echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdassemble" + add_binary "/sbin/mdadm" add_file "/lib/udev/rules.d/64-md-raid.rules" } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 558bd5fde..edbf8dc94 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') 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 2c145b640..e0cad9930 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') 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 f4fbd8cbf..ca76e08e4 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') @@ -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 033966009..5e3bb7af1 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') 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 675a154d2..d44420d1f 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) 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() { diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD new file mode 100644 index 000000000..97a0fd198 --- /dev/null +++ b/libre/file-roller-libre/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +_pkgname=file-roller +pkgname=file-roller-libre +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Archive manipulator for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') +makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') +optdepends=('ununrar: interface to unarchiver, the free RAR uncompression program' + 'zip: creates PKZIP-compatible .zip files' + 'unzip: unpacks .zip archives' + 'p7zip: 7zip compression utility' + 'xz: managing LZMA and XZ compressed files' + 'arj: ARJ archiver') +groups=('gnome-extra') +provides=("$_pkgname=$pkgver") +replaces=("$_pkgname") +conflicts=("$_pkgname") +options=('!libtool' '!emptydirs') +install=file-roller.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2) +sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/file-roller \ + --localstatedir=/var --disable-static \ + --disable-scrollkeeper --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install new file mode 100644 index 000000000..182126c39 --- /dev/null +++ b/libre/file-roller-libre/file-roller.install @@ -0,0 +1,23 @@ +pkgname=file-roller + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} + diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD new file mode 100644 index 000000000..ee6544db5 --- /dev/null +++ b/libre/file-roller-libre/rePKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> +source PKGBUILD +CARCH=x86_64 +unset build package md5sums source +_repo=extra # Put the repo here +_mirror=http://mirrors.kernel.org/archlinux # Put mirror here +source=(PKGBUILD + "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" + # files for pkg modifications below this line + ) +options=(!strip) + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} + # put actions for package modifications below this line + +} + +package() { + find ${srcdir} -maxdepth 1 -type l -delete + cp -a ${srcdir}/* ${pkgdir} +} + + +# vim:set ts=2 sw=2 et: diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 4bbc90bea..bdff9b357 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.39 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -239,14 +239,8 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('4ddca7df15f92537b1914ab115cb4f8b' - '252cbddfd9a8bb97181c087fdd5e2377' - 'd5c6c675662d98011513f6cbc81d66db' - '00e8553b44dac65fc093db60a1cde842' - '25584700a0a679542929c4bed31433b6' - 'fdfed5e8b46f289617ee6def01978090') -md5sums=('4ddca7df15f92537b1914ab115cb4f8b' - '609210a972ea86260ef395d9b59e3b2f' +md5sums=('ed628f2c07a63b8f06ff2a7dff573119' + 'adb567a66bf34fd80c5339818a345f49' 'd5c6c675662d98011513f6cbc81d66db' '00e8553b44dac65fc093db60a1cde842' '25584700a0a679542929c4bed31433b6' diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 32667675a..d616def9e 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51304 2011-07-06 17:52:30Z lcarlier $ +# $Id: PKGBUILD 51484 2011-07-10 09:40:09Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,45 +10,36 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110706 + #pkgver=7.10.99.git20110709 + pkgver=7.11rc1 else - pkgver=7.10.3 + pkgver=7.11rc1 fi pkgrel=1 arch=(x86_64) -makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') +makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' +'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - md5sums=('6d655a2573037838844019275dce66af') + #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') + source=("MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2") else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch) - md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4') + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip") fi +md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f') build() { export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + # for our llvm-config for 32 bit :( + export PATH="/usr/lib32/llvm:$PATH" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - # for our llvm-config for 32 bit :( - export PATH="/usr/lib32/llvm:$PATH" - # fix linking with llvmpipe driver - sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - if [ "${_git}" != "true" ]; then - patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" - fi + cd ${srcdir}/?esa-* + autoreconf -vfi if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ @@ -72,19 +63,18 @@ build() { else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ + --enable-gallium-llvm \ + --enable-gallium-egl \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl \ + --enable-texture-float \ + --enable-shared-dricore \ --enable-32-bit \ --libdir=/usr/lib32 fi @@ -93,29 +83,18 @@ build() { } package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') + depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib32" install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - if [ "${_git}" = "true" ]; then - bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" - fi + bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" + bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so" ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" @@ -128,12 +107,7 @@ package_lib32-libgles() { depends=('libgles') pkgdesc="Mesa GLES libraries (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib32" install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" @@ -148,20 +122,14 @@ package_lib32-libegl() { depends=('lib32-udev' 'libegl') pkgdesc="Mesa libEGL libraries (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" - fi + cd ${srcdir}/?esa-* + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib32" install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" + install -m755 -d "${pkgdir}/usr/lib32/egl" bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - if [ "${_git}" != "true" ]; then - install -m755 -d "${pkgdir}/usr/lib32/egl" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" - fi + bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" @@ -169,18 +137,12 @@ package_lib32-libegl() { } package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa') + depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.26' 'lib32-gcc-libs>=4.6.1' 'mesa') pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - + cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/lib32/libGL.so"* rm -f "${pkgdir}/usr/lib32/libGLESv"* rm -f "${pkgdir}/usr/lib32/libEGL"* @@ -197,36 +159,21 @@ package_lib32-ati-dri() { pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" conflicts=('xf86-video-ati<6.9.0-6') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C radeon DESTDIR="${pkgdir}" install make -C r200 DESTDIR="${pkgdir}" install # DRI drivers for r300 and r600 are removed # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install } package_lib32-intel-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C i810 DESTDIR="${pkgdir}" install make -C i915 DESTDIR="${pkgdir}" install make -C i965 DESTDIR="${pkgdir}" install @@ -236,12 +183,7 @@ package_lib32-unichrome-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C unichrome DESTDIR="${pkgdir}" install } @@ -250,12 +192,7 @@ package_lib32-mach64-dri() { pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" conflicts=('xf86-video-mach64<6.8.2') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C mach64 DESTDIR="${pkgdir}" install } @@ -264,12 +201,7 @@ package_lib32-mga-dri() { pkgdesc="Mesa DRI drivers for Matrox (32-bit)" conflicts=('xf86-video-mga<1.4.11') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C mga DESTDIR="${pkgdir}" install } @@ -278,12 +210,7 @@ package_lib32-r128-dri() { pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" conflicts=('xf86-video-r128<6.8.1') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C r128 DESTDIR="${pkgdir}" install } @@ -292,12 +219,7 @@ package_lib32-savage-dri() { pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" conflicts=('xf86-video-savage<2.3.1') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C savage DESTDIR="${pkgdir}" install } @@ -306,12 +228,7 @@ package_lib32-sis-dri() { pkgdesc="Mesa DRI drivers for SiS (32-bit)" conflicts=('xf86-video-sis<0.10.2') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C sis DESTDIR="${pkgdir}" install } @@ -320,12 +237,7 @@ package_lib32-tdfx-dri() { pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" conflicts=('xf86-video-tdfx<1.4.3') - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri make -C tdfx DESTDIR="${pkgdir}" install } @@ -333,19 +245,10 @@ package_lib32-nouveau-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - + cd ${srcdir}/?esa-*/src/mesa/drivers/dri # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so make -C nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD index 77dd1d86f..9ef03573d 100644 --- a/social/bitcoin-daemon/PKGBUILD +++ b/social/bitcoin-daemon/PKGBUILD @@ -4,28 +4,24 @@ pkgname=bitcoin-daemon _pkgname=bitcoin -pkgver=0.3.22 -_bcver=0.3.22 +pkgver=0.3.24 +_bcver=0.3.24 pkgrel=1 -pkgdesc="Bitcoin is a peer-to-peer network based digital currency." +pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)." arch=('i686' 'x86_64') url="http://www.bitcoin.org/" depends=('expat' 'boost-libs>=1.43' 'miniupnpc') makedepends=('boost' 'openssl') -conflicts=('bitcoin-bin' 'bitcoin') +conflicts=('bitcoin') license=('MIT') install="bitcoin-daemon.install" source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/bitcoin-$pkgver-linux.tar.gz makefile.parabola bitcoin-daemon.install rc.bitcoind) -md5sums=('87ed8d95dd0c94635d5237dc1490bb0d' - 'dc3d207309d11e285ece6b3bdf61d90b' - 'a388684057de2bb543cb7f795dc693cf' - '4a9ab4997487bb5f8e3c6b1d580045af') build() { - cd $srcdir/${_pkgname}-${pkgver}/src/src + cd $srcdir/$_pkgname-$_bcver/src/src # copy correct makefile to src dir cp $srcdir/makefile.parabola Makefile @@ -39,14 +35,14 @@ build() { } package() { - cd $srcdir/${_pkgname}-${pkgver}/src/src + cd $srcdir/$_pkgname-$_bcver/src/src mkdir -p $pkgdir/{usr/bin,usr/share/licenses/$pkgname,etc/rc.d,var/lib/$pkgname} install -D -m755 ./bitcoind $pkgdir/usr/bin/ install -D -m755 $srcdir/rc.bitcoind $pkgdir/etc/rc.d/bitcoind - install -D -m 644 $srcdir/$_pkgname-$pkgver/COPYING \ + install -D -m 644 $srcdir/$_pkgname-$_bcver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/ # strip shit from executables @@ -56,3 +52,11 @@ package() { chown -R 8333:8333 $pkgdir/var/lib/$pkgname chmod -R 700 $pkgdir/var/lib/$pkgname } +md5sums=('7a9e5d45cccd21ef88b8cbbe20946599' + 'dc3d207309d11e285ece6b3bdf61d90b' + 'a388684057de2bb543cb7f795dc693cf' + '7faa439885f3adbba5847ae75aac5484') +md5sums=('7a9e5d45cccd21ef88b8cbbe20946599' + '3172bdbc0096cb277971a26e0ca9adb6' + 'a388684057de2bb543cb7f795dc693cf' + '7faa439885f3adbba5847ae75aac5484') diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola index 1f8236b66..9d7d5cffe 100644 --- a/social/bitcoin-daemon/makefile.parabola +++ b/social/bitcoin-daemon/makefile.parabola @@ -53,8 +53,10 @@ OBJS= \ obj/main.o \ obj/rpc.o \ obj/init.o \ + obj/wallet.o \ + obj/keystore.o \ cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o + cryptopp/obj/cpu.o all: bitcoin diff --git a/social/bitcoin-daemon/rc.bitcoind b/social/bitcoin-daemon/rc.bitcoind index 98d713ffd..be09251d1 100644 --- a/social/bitcoin-daemon/rc.bitcoind +++ b/social/bitcoin-daemon/rc.bitcoind @@ -6,7 +6,7 @@ case "$1" in start) stat_busy "Starting bitcoind" - su -s /bin/bash -c "nohup bitcoind -gen -datadir=/var/lib/bitcoin-daemon &" bitcoin > /dev/null 2>&1 + su -s /bin/bash -c "nohup bitcoind -gen=0 -datadir=/var/lib/bitcoin-daemon &" bitcoin > /dev/null 2>&1 if [ $? -gt 0 ]; then stat_fail else diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 4d729c481..07cc07301 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131009 2011-07-09 13:03:33Z andyrtr $ +# $Id: PKGBUILD 131079 2011-07-10 09:28:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -14,13 +14,13 @@ if [ "${_git}" = "true" ]; then else pkgver=7.11rc1 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE) +source=(LICENSE git_fixes.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') @@ -30,12 +30,14 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + '62b7e9591737846ff0e98f970ffc8b78' '2246d97eb0cfb1f6d2bf8a54b533d07f') build() { cd ${srcdir}/?esa-* if [ "${_git}" = "true" ]; then + patch -Np1 -i ${srcdir}/git_fixes.patch autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ diff --git a/testing/mesa/git_fixes.patch b/testing/mesa/git_fixes.patch new file mode 100644 index 000000000..22372b328 --- /dev/null +++ b/testing/mesa/git_fixes.patch @@ -0,0 +1,36 @@ +From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Fri, 08 Jul 2011 22:30:48 +0000 +Subject: i965/gen4: Fix GPU hangs since the program streaming change. + +This was tricky. We were doing a use-before-initialize of +grf_reg_count, but the value usually got overwritten anyway -- when we +didn't have to do a relocation (typical), or on gen5 when we didn't +have relocations at all. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771 +Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> +(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7) +--- +diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c +index d5010a2..179ca19 100644 +--- a/src/mesa/drivers/dri/i965/brw_vs_state.c ++++ b/src/mesa/drivers/dri/i965/brw_vs_state.c +@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw) + memset(vs, 0, sizeof(*vs)); + + /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */ ++ vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1; + vs->thread0.kernel_start_pointer = + brw_program_reloc(brw, + brw->vs.state_offset + +@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw) + brw->vs.prog_offset + + (vs->thread0.grf_reg_count << 1)) >> 6; + +- vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1; + vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754; + /* Choosing multiple program flow means that we may get 2-vertex threads, + * which will have the channel mask for dwords 4-7 enabled in the thread, +-- +cgit v0.8.3-6-g21f6 |