summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-08-03 07:35:51 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-08-03 07:35:51 +0000
commite9c2111ea204df06d84413f282f3086406bfbaba (patch)
treeca67a35ed96ec7b7312a0fc8c47290ce47f4e868
parent- Rename editors/koffice-i18n-sr@Latn -> editors/koffice-i18n-sr_Latn (diff)
Remove two patch hunks which cause issues with starting pulseaudio when
the default configuration file is used.
-rw-r--r--audio/pulseaudio/Makefile2
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_default.pa.in9
-rw-r--r--audio/pulseaudio/files/patch-ubuntu-bundle12
3 files changed, 1 insertions, 22 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 6064209564c2..afe7f1849faa 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pulseaudio
PORTVERSION= 0.9.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index b8291f56dda2..0ca5a64e5ba6 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -15,12 +15,3 @@
.fail
-@@ -101,7 +101,7 @@ load-module module-rescue-streams
- load-module module-always-sink
-
- ### Automatically suspend sinks/sources that become idle for too long
--load-module module-suspend-on-idle
-+#load-module module-suspend-on-idle
-
- ### If autoexit on idle is enabled we want to make sure we only quit
- ### when no local session needs us anymore.
diff --git a/audio/pulseaudio/files/patch-ubuntu-bundle b/audio/pulseaudio/files/patch-ubuntu-bundle
index 65df94565aef..c1511d705711 100644
--- a/audio/pulseaudio/files/patch-ubuntu-bundle
+++ b/audio/pulseaudio/files/patch-ubuntu-bundle
@@ -879,15 +879,3 @@ Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in
-; default-fragment-size-msec = 25
+default-fragments = 8
+default-fragment-size-msec = 10
-===================================================================
---- src/daemon/default.pa.in 2009-02-13 19:12:33.000000000 -0500
-+++ src/daemon/default.pa.in 2009-02-13 19:13:03.000000000 -0500
-@@ -58,7 +58,7 @@
-
- ### Automatically load driver modules depending on the hardware available
- .ifexists module-hal-detect@PA_SOEXT@
--load-module module-hal-detect
-+load-module module-hal-detect tsched=0
- .else
- ### Alternatively use the static hardware detection module (for systems that
- ### lack HAL support)