diff options
Diffstat (limited to 'multilib')
-rw-r--r-- | multilib/lib32-alsa-lib/PKGBUILD | 6 | ||||
-rw-r--r-- | multilib/lib32-alsa-oss/PKGBUILD | 8 | ||||
-rw-r--r-- | multilib/lib32-alsa-plugins/PKGBUILD | 11 | ||||
-rw-r--r-- | multilib/lib32-glibc/PKGBUILD | 26 | ||||
-rw-r--r-- | multilib/lib32-glibc/glibc-2.15-regex.patch | 16 | ||||
-rw-r--r-- | multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch | 48 | ||||
-rw-r--r-- | multilib/lib32-udev/PKGBUILD | 6 |
7 files changed, 98 insertions, 23 deletions
diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD index 8dff0f1d3..5f25c3e12 100644 --- a/multilib/lib32-alsa-lib/PKGBUILD +++ b/multilib/lib32-alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40235 2011-02-22 08:22:12Z heftig $ +# $Id: PKGBUILD 62814 2012-01-27 09:25:15Z bluewind $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> _pkgbasename=alsa-lib pkgname=lib32-${_pkgbasename} -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32 bit)" arch=('x86_64') @@ -29,4 +29,4 @@ package() { # Clean up lib32 package rm -rf "${pkgdir}"/usr/{bin,include,share} } -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD index bcb47a8e7..51273a145 100644 --- a/multilib/lib32-alsa-oss/PKGBUILD +++ b/multilib/lib32-alsa-oss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57964 2011-11-04 22:23:42Z lcarlier $ +# $Id: PKGBUILD 62816 2012-01-27 09:25:54Z bluewind $ # Maintainer: judd <jvinet@zeroflux.org> _pkgbasename=alsa-oss pkgname=lib32-${_pkgbasename} -pkgver=1.0.17 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="OSS compatibility library (32 bit)" arch=(x86_64) license=('GPL') @@ -12,7 +12,7 @@ url="http://www.alsa-project.org" options=(!libtool) depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss') source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('1b1850c2fc91476a73d50f537cbd402f') +md5sums=('922ea177db15c72f1b5037181c73f934') build() { cd $srcdir/${_pkgbasename}-$pkgver diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD index 4a0ce214d..87d8c90f9 100644 --- a/multilib/lib32-alsa-plugins/PKGBUILD +++ b/multilib/lib32-alsa-plugins/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 40238 2011-02-22 08:27:39Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 62831 2012-01-27 15:59:19Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> _pkgbasename=alsa-plugins pkgname=lib32-$_pkgbasename -pkgver=1.0.24 +pkgver=1.0.25 pkgrel=1 pkgdesc="Extra alsa plugins (32-bit)" arch=(x86_64) url="http://www.alsa-project.org" license=(GPL) depends=(lib32-alsa-lib $_pkgbasename) -makedepends=(lib32-{libpulse,jack,speex,libsamplerate} gcc-multilib) +makedepends=(lib32-libpulse lib32-jack lib32-speex lib32-libsamplerate gcc-multilib) optdepends=('lib32-libpulse: PulseAudio plugin' 'lib32-jack: Jack plugin' 'lib32-libsamplerate: libsamplerate resampling plugin' 'lib32-speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') +md5sums=('038c023eaa51171f018fbf7141255185') build() { cd "$srcdir/$_pkgbasename-$pkgver" @@ -32,4 +32,5 @@ build() { package() { cd "$srcdir/$_pkgbasename-$pkgver" make DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/share" } diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 9b962e426..5f73ba36f 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 62206 2012-01-18 10:47:20Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 62829 2012-01-27 15:39:54Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=3.1 +pkgrel=4 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -27,9 +27,10 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-math64crash.patch + glibc-2.15-strcmp-disable-avx.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -40,9 +41,10 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' + '7a44dd821835e4984aa75ad44fad3baf' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -79,6 +81,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch @@ -87,9 +93,13 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # revert optimized math routines that can cause crashes (FS#27736, FS#27743) - # obviously not a real fix... - patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* cd ${srcdir} mkdir glibc-build diff --git a/multilib/lib32-glibc/glibc-2.15-regex.patch b/multilib/lib32-glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index a99efb154..e6637987a 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62609 2012-01-22 19:02:33Z lcarlier $ +# $Id: PKGBUILD 62861 2012-01-27 21:31:29Z lcarlier $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=('lib32-udev') -pkgver=178 +pkgver=179 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -14,7 +14,7 @@ options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev') makedepends=('gcc-multilib' 'gperf') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') build() { export CC="gcc -m32" |