jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'dave/master'

Browse source 
* dave/master:
  alsa-plugins: add patch (from alsa git) to fix JACK problem
This commit is contained in:
Juan RP 2011-11-05 12:34:10 +01:00
commit 77b27263ec
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
srcpkgs/alsa-plugins/patches/fix-jack-blocking-pipe.patch Normal file
View file

@ -0,0 +1,32 @@
--- 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;

4
srcpkgs/alsa-plugins/template
View file

@ -1,7 +1,7 @@
# Template build file for 'alsa-plugins'. # Template build file for 'alsa-plugins'.
pkgname=alsa-plugins pkgname=alsa-plugins
version=1.0.24 version=1.0.24 # NOTE: Remove fix-jack-blocking-pipe.patch on next release!
revision=3 revision=4
distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2" distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-maemo-plugin --with-speex=lib" configure_args="--disable-maemo-plugin --with-speex=lib"