diff --git a/srcpkgs/alsa-plugins/patches/fix-jack-blocking-pipe.patch b/srcpkgs/alsa-plugins/patches/fix-jack-blocking-pipe.patch deleted file mode 100644 index aa4823f1ed6..00000000000 --- a/srcpkgs/alsa-plugins/patches/fix-jack-blocking-pipe.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- jack/pcm_jack.c.old 2011-11-05 00:39:14.238794519 -0600 -+++ jack/pcm_jack.c 2011-11-05 00:43:07.936817855 -0600 -@@ -307,6 +307,19 @@ - return 0; - } - -+static int make_nonblock(int fd) -+{ -+ int fl; -+ -+ if ((fl = fcntl(fd, F_GETFL)) < 0) -+ return fl; -+ -+ if (fl & O_NONBLOCK) -+ return 0; -+ -+ return fcntl(fd, F_SETFL, fl | O_NONBLOCK); -+} -+ - static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, - snd_config_t *playback_conf, - snd_config_t *capture_conf, -@@ -363,6 +376,9 @@ - - socketpair(AF_LOCAL, SOCK_STREAM, 0, fd); - -+ make_nonblock(fd[0]); -+ make_nonblock(fd[1]); -+ - jack->fd = fd[0]; - - jack->io.version = SND_PCM_IOPLUG_VERSION; diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 9664ee497c4..2b38d6626c8 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,13 +1,12 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins -version=1.0.24 # NOTE: Remove fix-jack-blocking-pipe.patch on next release! -revision=6 +version=1.0.25 distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--disable-maemo-plugin --with-speex=lib" short_desc="Advanced Linux Sound Architecture (ALSA) extra plugins" maintainer="Juan RP " -checksum=fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263 +checksum=a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab long_desc=" The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system. @@ -15,7 +14,6 @@ long_desc=" This package includes some ALSA extra plugins for PulseAudio, Speex, FFmpeg's libavcodec library and libsamplerate." - Add_dependency build pkg-config Add_dependency build alsa-lib-devel Add_dependency build speex-devel