From 572a1aa9805971ecae21bd4f315b366b69e92b00 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 27 Jul 2013 01:22:45 -0700 Subject: Sat Jul 27 01:22:29 PDT 2013 --- community/converseen/PKGBUILD | 6 +-- community/nodejs/PKGBUILD | 6 +-- community/parole/PKGBUILD | 8 ++-- community/xmonad-contrib/PKGBUILD | 13 ++---- core/mkinitcpio-busybox/PKGBUILD | 23 ++++----- core/mkinitcpio-busybox/config | 30 +++++++----- extra/akonadi/PKGBUILD | 6 +-- extra/gnutls/PKGBUILD | 20 +++++--- extra/gnutls/tls_fix.diff | 32 +++++++++++++ extra/virtuoso/PKGBUILD | 15 ++---- extra/virtuoso/automake113.patch | 12 ----- kernels/linux-libre-pae/PKGBUILD | 6 +-- kernels/linux-libre-xen/PKGBUILD | 6 +-- libre/icecat-adblock-plus/PKGBUILD | 6 +-- libre/iceweasel-adblock-plus/PKGBUILD | 6 +-- libre/libretools/PKGBUILD | 6 +-- libre/linux-libre/PKGBUILD | 6 +-- libre/soundkonverter-libre/PKGBUILD | 10 ++-- pcr/libav/PKGBUILD | 88 +++++++++++++++++------------------ pcr/python-pygame-hg/PKGBUILD | 72 ++++++++++++++++++++++++++++ 20 files changed, 237 insertions(+), 140 deletions(-) create mode 100644 extra/gnutls/tls_fix.diff delete mode 100644 extra/virtuoso/automake113.patch create mode 100644 pcr/python-pygame-hg/PKGBUILD diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index f7b814f97..45f2c2d8c 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94206 2013-07-16 17:32:49Z giovanni $ +# $Id: PKGBUILD 94544 2013-07-26 15:55:51Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: archtux pkgname=converseen -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('33b0b1e3649c075ab7ad970ee4ed465c') +md5sums=('072cb40a495e539661ea789131555f79') build() { cd "${srcdir}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 11d508c2d..d0f99a15e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93869 2013-07-11 15:37:07Z bpiotrowski $ +# $Id: PKGBUILD 94551 2013-07-26 20:25:44Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.13 +pkgver=0.10.15 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('a102fad260d216b95611ddd57aeb6531c92ad1038508390654423feb1b51c059') +sha256sums=('87345ab3b96aa02c5250d7b5ae1d80e620e8ae2a7f509f7fa18c4aaa340953e8') prepare() { cd node-v$pkgver diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index e7e52123f..c90fbe8fc 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93130 2013-06-25 14:39:40Z spupykin $ +# $Id: PKGBUILD 94522 2013-07-26 10:51:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: TDY pkgname=parole -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/parole/" @@ -21,7 +21,7 @@ conflicts=('parole-media-player-git') options=('!libtool') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('0236073ad67916092a75fcaa59583780') +md5sums=('ab87c3067e310cf200e26a61ed95cdf8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 30b913ea4..cfd092a19 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 89335 2013-04-28 16:53:08Z td123 $ +# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: orbisvicis pkgname=xmonad-contrib -pkgver=0.11 -pkgrel=7 +pkgver=0.11.2 +pkgrel=1 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('415a7ed9449198b0e93d49ab0a4a0f72') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/xmonad-contrib-remove-getatomname.patch - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -33,5 +32,3 @@ package() { runhaskell Setup.lhs copy --destdir=$pkgdir install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE } -md5sums=('05fba258ac6063e49b50786a0869bd1f' - '1d1fab94ae24b2a8f6a5dcd9cd6d9548') diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index f85beb6ea..9252e16f8 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ +# $Id: PKGBUILD 191594 2013-07-26 14:05:32Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Thomas Bächler pkgname=mkinitcpio-busybox -pkgver=1.20.2 +pkgver=1.21.1 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') @@ -14,21 +14,22 @@ options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'glibc-2.16.patch' 'config') -sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' +sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' - 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') + 'cad474e2131c0aa3c2f628f74389b43ca3df8818db73ba8cc18081c3531ff318') -build() { - cd "$srcdir/busybox-$pkgver" +prepare() { + cd "busybox-$pkgver" - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config - patch -Np1 < "$srcdir/glibc-2.16.patch" + patch -Np1 <"$srcdir/glibc-2.16.patch" +} - make +build() { + make -C "busybox-$pkgver" } package() { diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index ed84c5383..0ffb38736 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.0 -# Sun May 13 11:33:40 2012 +# Busybox version: 1.21.0 +# Tue Jan 22 09:04:09 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=0 +CONFIG_SHA3_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +# CONFIG_SHA3SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set # CONFIG_CMP is not set @@ -612,9 +614,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -622,6 +626,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set @@ -701,7 +706,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set @@ -894,6 +899,13 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_PSTREE is not set # CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y @@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set @@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_LOGGER is not set diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 4a3b83cb6..08e717bd1 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191298 2013-07-23 11:52:23Z andrea $ +# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=akonadi -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5b03c46e1e9da439e4ec63bf7b2087c2') +md5sums=('35eb8f76588b1d111f75bc46e3ac784b') prepare() { mkdir build diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index a06f9d2dc..878bf27c5 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191197 2013-07-19 17:34:12Z andyrtr $ +# $Id: PKGBUILD 191598 2013-07-26 15:46:23Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL2.1') @@ -13,12 +13,18 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} + tls_fix.diff) md5sums=('9dd691ad1ccdb7386029809afef6b5ea' - 'SKIP') + 'SKIP' + '1bbf5bfb4e1420fd61c75e14347340fc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + + # fix broken TLS connections + patch -Np1 -i ../tls_fix.diff + ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -28,13 +34,13 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} #make -k check make -j1 check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff new file mode 100644 index 000000000..8277e2b2d --- /dev/null +++ b/extra/gnutls/tls_fix.diff @@ -0,0 +1,32 @@ +diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c +index 198cb34..3caa5ac 100644 +--- a/lib/gnutls_cipher.c ++++ b/lib/gnutls_cipher.c +@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session, + return gnutls_assert_val(ret); + + if (unlikely((unsigned)length_to_decrypt > compressed->size)) +- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ { ++ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n", ++ (unsigned int)length_to_decrypt, (unsigned int)compressed->size); ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ } + + ret = + _gnutls_auth_cipher_decrypt2 (¶ms->read.cipher_state, +diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c +index 993ddb9..4795711 100644 +--- a/lib/gnutls_record.c ++++ b/lib/gnutls_record.c +@@ -1193,8 +1193,8 @@ begin: + /* We allocate the maximum possible to allow few compressed bytes to expand to a + * full record. + */ +- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), +- MAX_RECORD_RECV_SIZE(session)); ++ t.size = _gnutls_get_max_decrypted_data(session); ++ decrypted = _mbuffer_alloc(t.size, t.size); + if (decrypted == NULL) + return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 19f02fa17..5568e46ff 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $ +# $Id: PKGBUILD 191593 2013-07-26 10:24:04Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Massimiliano Torromeo pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') -pkgver=6.1.6 -pkgrel=2 +pkgver=6.1.7 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz" - 'automake113.patch') -md5sums=('3991149c570f3738c3e819ce603e487f' - '570043e1b5f4acd9826732f002941c12') +source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('88885e84e8f7b61e59516f696b1d3be5') prepare() { cd ${pkgbase}-opensource-${pkgver} optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png - - patch -p1 -i "${srcdir}"/automake113.patch } build() { cd ${pkgbase}-opensource-${pkgver} - ./autogen.sh ./configure --with-layout=debian \ --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \ --with-readline diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch deleted file mode 100644 index 5f84b49bc..000000000 --- a/extra/virtuoso/automake113.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ a/configure.in ---- b/configure.in -@@ -36,7 +36,7 @@ - AC_INIT([Virtuoso Open Source Edition], - AC_CONFIG_SRCDIR([libsrc/Dk.h]) - AC_CONFIG_AUX_DIR([binsrc/config]) - AC_CONFIG_MACRO_DIR([binsrc/config]) --AM_CONFIG_HEADER([libsrc/Dk/config.h]) -+AC_CONFIG_HEADER([libsrc/Dk/config.h]) - - dnl - dnl You may need to change the next macro for older versions of automake: diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 55204ff79..badb6d2c6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' 'ead29a0206b79cc56ab97930e5d517ae' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e78f09ee9..5583ffba0 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' 'e2cb9d4092685c2a4216de9bbe8b72f1' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 9508d8e15..3c078997c 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 019d1edd2..81648fbcd 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 231268930..bf31c26bd 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130714 -_libretools_commit=bb42528084058af8dc42c315d5f013af05741bb1 +pkgver=20130727 +_libretools_commit=05463eaf611f4784b3693b74029c3f5a6da1d70b _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('a8c4c3552bde5185dec637471b890256' +md5sums=('49653793e6bff294661043ed38ac6e43' 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 90b6a45c5..64ac53efa 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' '542fc77350e62009bca7af080359b286' 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index b8872fa5d..5e87a1e8c 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $ +# $Id: PKGBUILD 94548 2013-07-26 17:20:11Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Mateusz Herych # Contributor: Eric Belanger @@ -7,7 +7,7 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('1c18d9227bac57a910e2a7b2e18870d8') +md5sums=('8b6684e693bf1af604dec8fab837447b') build() { cd "$srcdir"/$_pkgname-$pkgver @@ -47,6 +47,6 @@ build() { } package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd "$srcdir"/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 782e12a15..c0fb9e062 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,23 +1,15 @@ # Maintainer: Márcio Silva -static=false -_pkgname=libav -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - pkgname=libav-static - pkgflag=-static - staticdesc=', with static library' -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - pkgname=libav -fi -pkgver=9.7 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" +pkgname=libav +pkgver=9.8 +pkgrel=3 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux" arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) -url=http://$_pkgname.org/ +url=http://$pkgname.org/ license=GPL3 depends=( alsa-lib @@ -45,20 +37,33 @@ makedepends=( yasm libvdpau ) -source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz -sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4 +source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz +sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae build() { - cd $_pkgname-$pkgver - - [[ $static == false ]] && sttcv=disable || sttcv=enable - - setarch $CARCH ./configure\ - --prefix=/opt/$pkgname\ + cd $pkgname-$pkgver + if [[ $CARCH == x86_64 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --enable-avx --enable-fma4 --enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42' + elif [[ $CARCH == i686 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --disable-avx --disable-fma4 --disable-sse3 --disable-ssse3 --disable-sse4 --disable-sse42' + else + _asm='--disable-asm' + fi + [[ $_static == false ]] && _stf='--disable-static' + ./configure\ + $_asm $_stf\ + --prefix=/usr\ + --bindir=/opt/$pkgname/bin\ + --incdir=/opt/$pkgname/include\ + --libdir=/opt/$pkgname/lib\ + --shlibdir=/opt/$pkgname/lib\ + --disable-avserver\ --disable-debug\ - --$sttcv-static\ --enable-avresample\ - --enable-avserver\ --enable-dxva2\ --enable-gpl\ --enable-libfreetype\ @@ -77,32 +82,27 @@ build() { --enable-libvpx\ --enable-libx264\ --enable-libxvid\ + --enable-pic\ --enable-runtime-cpudetect\ --enable-shared\ + --enable-vdpau\ --enable-version3\ --enable-x11grab - setarch $CARCH make - setarch $CARCH make tools/qt-faststart - setarch $CARCH make doc/av{conv,play,server}.1 + make + make tools/qt-faststart + make doc/av{conv,play}.1 # doc/avserver.1 } package() { - cd $_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install install-man - install -m755 -d $pkgdir/etc/ld.so.conf.d - install -m755 -d $pkgdir/usr/bin - install -m755 -d $pkgdir/usr/share/man/man1 - install -Dm755 tools/qt-faststart $pkgdir/opt/$pkgname/bin - ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag - ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag - ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag - ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag - ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname - ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 - echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf + cd $pkgname-$pkgver + + make DESTDIR=$pkgdir install install-man + install -vD tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname + + for _bin in conv play probe; do + echo -e "#!/usr/bin/env bash\nLD_LIBRARY_PATH=/opt/$pkgname/lib /opt/$pkgname/bin/av$_bin \$@" > $pkgdir/usr/bin/av$_bin + done + chmod -v +x $pkgdir/usr/bin/* } # vim:set ts=2 sw=2 et: diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD new file mode 100644 index 000000000..c48317b19 --- /dev/null +++ b/pcr/python-pygame-hg/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Márcio Silva + +_pkgname=pygame +_pkgver=1.9.2 +_pyname=python +_py3ver=3.3 +_py2ver=2.7 +_pkg3name=$_pyname-$_pkgname +_pkg2name=${_pyname}2-$_pkgname +_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d) + +pkgbase=$_pyname-$_pkgname +pkgname=( + $_pkg3name-hg + $_pkg2name-hg +) +pkgver=$_pkgver$_srcver +pkgrel=1 +pkgdesc="${_pyname^} game library" +arch=( + mips64el + x86_64 + i686 +) +url=http://www.$_pkgname.org/ +license=LGPL2.1 +depends=( + ffmpeg + portmidi + python + python2 + #sdl_gfx + sdl_image + sdl_mixer + sdl_ttf +) +makedepends=mercurial +source=hg+https://bitbucket.org/$_pkgname/$_pkgname +sha512sums=SKIP + +package_python-pygame-hg() { + # disabled, due which conflicts with $_pkg2name + #provides=("$_pkg3name=$_pkgver") + #conflicts=$_pkg3name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} + + $_pyname config.py -auto + $_pyname setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests +} + +package_python2-pygame-hg() { + provides=("$_pkg2name=$_pkgver") + conflicts=$_pkg2name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} + + ${_pyname}2 config.py -auto + ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests +} -- cgit v1.2.3-54-g00ecf