================================ pulseaudio:source=0.9.19-1 (previous: 0.9.15-1) cvc rdiff pulseaudio -1 /weasel.rpath.org@wgl:3-devel/0.9.19-1 ================================ 0.9.19-1 Filip Brcic (brcha@xxxxxxx) Sun Jan 17 12:14:25 2010 version bump + metadata pulseaudio-0.9.19-fweb.patch: new --- /dev/null +++ pulseaudio-0.9.19-fweb.patch @@ -0,0 +59 @@ +From 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@xxxxxxxxx> +Date: Wed, 7 Oct 2009 19:31:11 +0200 +Subject: [PATCH] Fix build when using -fweb, accept both register and memory constraints. + +This was reported as Gentoo bug #287391 by Torsten Kaiser, and the fix was +suggested by Mike Frysinger. +--- + src/pulsecore/svolume_mmx.c | 4 ++-- + src/pulsecore/svolume_sse.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c +index 1768eb5..745c7de 100644 +--- a/src/pulsecore/svolume_mmx.c ++++ b/src/pulsecore/svolume_mmx.c +@@ -152,7 +152,7 @@ pa_volume_s16ne_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi + " emms \n\t" + + : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) +- : "X" ((pa_reg_x86)channels) ++ : "rm" ((pa_reg_x86)channels) + : "cc" + ); + } +@@ -228,7 +228,7 @@ pa_volume_s16re_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi + " emms \n\t" + + : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) +- : "X" ((pa_reg_x86)channels) ++ : "rm" ((pa_reg_x86)channels) + : "cc" + ); + } +diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c +index ab9394f..1cc4e0a 100644 +--- a/src/pulsecore/svolume_sse.c ++++ b/src/pulsecore/svolume_sse.c +@@ -149,7 +149,7 @@ pa_volume_s16ne_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns + "8: \n\t" + + : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) +- : "X" ((pa_reg_x86)channels) ++ : "rm" ((pa_reg_x86)channels) + : "cc" + ); + } +@@ -237,7 +237,7 @@ pa_volume_s16re_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns + "8: \n\t" + + : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) +- : "X" ((pa_reg_x86)channels) ++ : "rm" ((pa_reg_x86)channels) + : "cc" + ); + } +-- +1.6.5.rc2 + pulseaudio-0.9.19.tar.gz: new pulseaudio.recipe: changed Index: pulseaudio.recipe ==================================================================== contents(size sha1) inode(mtime) --- pulseaudio.recipe /weasel.rpath.org@wgl:3-devel/0.9.15-1 +++ pulseaudio.recipe /weasel.rpath.org@wgl:3-devel/0.9.19-1 @@ -1,36 +1,38 @@ # -# Copyright (c) 2009 Filip Brcic <brcha@xxxxxxx> +# Copyright (c) 2009-2010 Filip Brcic <brcha@xxxxxxx> # Distributed under the terms of the GNU General Public License v3 # class Pulseaudio(AutoPackageRecipe): name = 'pulseaudio' - version = '0.9.15' + version = '0.9.19' buildRequires = [ - 'GConf:devel', 'alsa-lib:devel', 'avahi:devel', 'bluez:devel', 'dbus:devel', - 'gdbm:devel', 'gettext:runtime', 'glib:devel', 'hal:devel', 'intltool:runtime', - 'libICE:devel', 'libSM:devel', 'libX11:devel', 'libXtst:devel', 'libasyncns:devel', - 'libcap:devel', 'liboil:devel', 'libsndfile:devel', 'libtool:devel', 'm4:runtime', - 'openssl:devel', 'pkg-config:devel', 'speex:devel', 'tcp_wrappers:devel', - 'udev:devel', + 'alsa-lib:devel', 'avahi:devel', 'dbus:devel', 'gdbm:devel', + 'gettext:runtime', 'glib:devel', 'hal:devel', + 'intltool:runtime', 'libICE:devel', 'libSM:devel', + 'libX11:devel', 'libXtst:devel', 'libasyncns:devel', + 'libcap:devel', 'libsamplerate:devel', 'libsndfile:devel', + 'libtool:devel', 'm4:runtime', 'openssl:devel', + 'pkg-config:devel', 'speex:devel', 'tcp_wrappers:devel', + 'udev:devel', 'util-linux-ng:devel', 'zlib:devel' ] + shortDesc = 'A networked sound server with an advanced plugin system' + longDesc = 'A networked sound server with an advanced plugin system' + url = 'http://www.pulseaudio.org/' + licenses = [ 'LGPL-2', 'GPL-2' ] + categories = [ 'Media/Sound' ] + def unpack(r): - r.Description(shortDesc='A networked sound server with an advanced plugin system', - longDesc='A networked sound server with an advanced plugin system') - r.PackageURL('http://www.pulseaudio.org/') - r.Licenses('LGPL-2', 'GPL-2') r.addArchive('http://0pointer.de/lennart/projects/%(name)s/') - r.addPatch('pulseaudio-0.9.15-bsd.patch') - r.addPatch('pulseaudio-0.9.15-CVE-2009-1894.patch') + r.addPatch('pulseaudio-0.9.19-fweb.patch') - r.addAction(r"sed -i -e '/\(mix\|resampler\)-test/d' src/Makefile.am") - - r.addAction('autoreconf -f -i') - - r.extraConfig = ( + def configure(r): + r.macros.ldflags += ' -Wl,--no-as-needed' + + r.Configure( ' --enable-largefile' ' --enable-glib2' ' --disable-solaris' @@ -42,38 +44,21 @@ ' --enable-avahi' ' --enable-hal' ' --enable-dbus' - ' --enable-gconf' -# ' --enable-samplerate' # once libsamplerate is built - ' --enable-bluez' - ' --disable-polkit' +# ' --enable-gconf' # once gconf is built + ' --enable-samplerate' +# ' --enable-bluez' # once bluez is built ' --enable-x11' + ' --enable-udev' + ' --enable-ipv6' ' --with-caps' ' --with-realtime-group=realtime' ' --disable-per-user-esound-socket' ) - if Arch.x86_64: - # First build 32bit version - macros32 = r.macros.copy() - macros32.cc = '"gcc -m32"' - macros32.cxx = '"g++ -m32"' - macros32.libdir = '%(prefix)s/lib' - - r.Run('cp -a %(builddir)s %(builddir)s/../32bit') - - r.Configure(r.extraConfig, dir='../32bit', overrideMacros=macros32, - preConfigure='USE_ARCH=32') - r.Make(dir='../32bit', overrideMacros=macros32, preMake='USE_ARCH=32') - r.MakeInstall(dir='../32bit', overrideMacros=macros32, preMake='USE_ARCH=32') - - r.NormalizePkgConfig(exceptions='.*') - - def configure(r): - r.Configure(r.extraConfig) - def policy(r): - r.Run(r"sed -i -e '/module-zeroconf-publish/s:^#::' %(destdir)s/%(sysconfdir)s/pulse/default.pa") - r.Doc('doc/*', dir='%(thisdocdir)s/html/') + r.Replace('^#', '', + '%(sysconfdir)s/pulse/default.pa', + lines='module-zeroconf-publish') r.MakeDirs('%(localstatedir)s/run/pulse') r.ExcludeDirectories(exceptions='%(localstatedir)s/run/pulse') pulseaudio-0.9.15.tar.gz: removed Committed by: brcha