summaryrefslogtreecommitdiffstats
path: root/audio/libcanberra
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-12-18 15:06:39 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-12-18 15:06:39 +0800
commita1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be (patch)
tree341e97fdfd4419b8863a3a84f9d30cda7253ec44 /audio/libcanberra
parente054f68f30da9d1f985ad771c7f9657d88d1f491 (diff)
downloadmarcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar.gz
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar.bz2
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar.lz
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar.xz
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.tar.zst
marcuscom-ports-a1841e46d4a0c50d5c42812b6bf9f3f7d1e5c5be.zip
Fix a logic error that prevented playing stereo sound files.
Reported by: Alexander Logvinov <freebsd@akavia.ru> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11825 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/libcanberra')
-rw-r--r--audio/libcanberra/Makefile1
-rw-r--r--audio/libcanberra/files/patch-src_oss.c13
2 files changed, 12 insertions, 2 deletions
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 6bb927c85..847f5b8cd 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libcanberra
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c
index 5b478d22c..0bd453854 100644
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@@ -1,5 +1,14 @@
---- src/oss.c.orig 2008-09-07 12:54:12.000000000 -0400
-+++ src/oss.c 2008-09-07 12:54:18.000000000 -0400
+--- src/oss.c.orig 2008-08-20 22:11:17.000000000 -0400
++++ src/oss.c 2008-12-18 02:04:42.000000000 -0500
+@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+ ca_return_val_if_fail(out, CA_ERROR_INVALID);
+- ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED);
++ ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
+
+ p = PRIVATE(c);
+
@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc
val = AFMT_S16_NE;
break;