Remove a couple of useless patches.
Add a BUILD_DEPENDS on devel/check for regression tests. Re-order loading of the sndio(7) module in the configuration file.
This commit is contained in:
parent
73395bcd4a
commit
220e7d4d0c
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.36 2013/01/01 14:12:36 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.37 2013/01/02 16:28:19 ajacoutot Exp $
|
||||
|
||||
# XXX
|
||||
# fix autospawn lock (patch-src_daemon_main_c)
|
||||
@ -20,6 +20,7 @@ COMMENT= cross-platform networked sound server
|
||||
VERSION= 3.0
|
||||
DISTNAME= pulseaudio-${VERSION}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
REVISION= 0
|
||||
|
||||
SHARED_LIBS += pulse 2.0 # .15.3
|
||||
SHARED_LIBS += pulse-simple 0.0 # .0.3
|
||||
@ -55,6 +56,9 @@ LIBTOOL_FLAGS= --tag=disable-static
|
||||
|
||||
BUILD_DEPENDS= archivers/gtar
|
||||
|
||||
# needed for tests
|
||||
BUILD_DEPENDS += devel/check
|
||||
|
||||
LIB_DEPENDS= audio/libsndfile \
|
||||
audio/speex \
|
||||
databases/gdbm \
|
||||
|
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-src_daemon_default_pa_in,v 1.7 2013/01/01 14:12:36 ajacoutot Exp $
|
||||
$OpenBSD: patch-src_daemon_default_pa_in,v 1.8 2013/01/02 16:28:19 ajacoutot Exp $
|
||||
--- src/daemon/default.pa.in.orig Mon Dec 3 06:57:23 2012
|
||||
+++ src/daemon/default.pa.in Tue Jan 1 11:58:22 2013
|
||||
@@ -63,17 +63,19 @@ ifelse(@HAVE_MKFIFO@, 1, [dnl
|
||||
#load-module module-pipe-sink
|
||||
])dnl
|
||||
|
||||
+++ src/daemon/default.pa.in Wed Jan 2 16:22:49 2013
|
||||
@@ -47,6 +47,7 @@ load-module module-augment-properties
|
||||
### Load audio drivers statically
|
||||
### (it's probably better to not load these drivers manually, but instead
|
||||
### use module-udev-detect -- see below -- for doing this automatically)
|
||||
+load-module module-sndio.so record="false"
|
||||
+
|
||||
### Automatically load driver modules depending on the hardware available
|
||||
ifelse(@HAVE_UDEV@, 1, [dnl
|
||||
.ifexists module-udev-detect@PA_SOEXT@
|
||||
ifelse(@HAVE_ALSA@, 1, [dnl
|
||||
#load-module module-alsa-sink
|
||||
#load-module module-alsa-source device=hw:1,0
|
||||
@@ -69,11 +70,11 @@ ifelse(@HAVE_UDEV@, 1, [dnl
|
||||
load-module module-udev-detect
|
||||
.else
|
||||
], [dnl
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-src_daemon_pulseaudio_desktop_in,v 1.2 2013/01/01 14:12:36 ajacoutot Exp $
|
||||
|
||||
From 1a6c9dc0a4f695764d48f06ac17ced42b7432499 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Tue, 15 May 2012 23:06:17 +0000
|
||||
Subject: gnome: start PA early in the gnome session
|
||||
|
||||
--- src/daemon/pulseaudio.desktop.in.orig Wed Sep 26 13:27:01 2012
|
||||
+++ src/daemon/pulseaudio.desktop.in Tue Jan 1 11:56:56 2013
|
||||
@@ -9,3 +9,4 @@ Type=Application
|
||||
Categories=
|
||||
GenericName=
|
||||
X-GNOME-Autostart-Phase=Initialization
|
||||
+X-GNOME-Autostart-Phase=Initialization
|
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-src_pulsecore_pstream_c,v 1.3 2012/05/14 17:45:16 ajacoutot Exp $
|
||||
|
||||
- Fix a lock-up.
|
||||
|
||||
--- src/pulsecore/pstream.c.orig Thu Mar 1 10:02:19 2012
|
||||
+++ src/pulsecore/pstream.c Mon May 14 16:18:28 2012
|
||||
@@ -177,14 +177,17 @@ static void do_something(pa_pstream *p) {
|
||||
p->mainloop->defer_enable(p->defer_event, 0);
|
||||
|
||||
if (!p->dead && pa_iochannel_is_readable(p->io)) {
|
||||
- if (do_read(p) < 0)
|
||||
+ if (do_read(p) < 0) {
|
||||
goto fail;
|
||||
- } else if (!p->dead && pa_iochannel_is_hungup(p->io))
|
||||
+ }
|
||||
+ } else if (!p->dead && pa_iochannel_is_hungup(p->io)) {
|
||||
goto fail;
|
||||
+ }
|
||||
|
||||
if (!p->dead && pa_iochannel_is_writable(p->io)) {
|
||||
- if (do_write(p) < 0)
|
||||
+ if (do_write(p) < 0) {
|
||||
goto fail;
|
||||
+ }
|
||||
}
|
||||
|
||||
pa_pstream_unref(p);
|
Loading…
x
Reference in New Issue
Block a user