summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2004-03-24 08:02:27 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2004-03-24 08:02:27 +0000
commitc29d04a048f9bbbb5b3b8a04b3ca9cb201c59cbf (patch)
treeee9eda11eae9fd23fdc16216806cc5c5ad12d9d3
parentUpdate to 0.98 (diff)
Fix another Memory Leak.
Submitted by: author
-rw-r--r--audio/jack/Makefile2
-rw-r--r--audio/jack/files/patch-aa12
2 files changed, 10 insertions, 4 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index ca925138d9e0..940611ab4bba 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= jackit
PORTVERSION= 0.94.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= jackit
diff --git a/audio/jack/files/patch-aa b/audio/jack/files/patch-aa
index 2974aa39c2e6..9f178de94dc0 100644
--- a/audio/jack/files/patch-aa
+++ b/audio/jack/files/patch-aa
@@ -47,8 +47,8 @@ diff -urN jack-audio-connection-kit-0.94.0.orig/drivers/oss/Makefile.am drivers/
+noinst_HEADERS = oss_driver.h
diff -urN jack-audio-connection-kit-0.94.0.orig/drivers/oss/oss_driver.c drivers/oss/oss_driver.c
--- jack-audio-connection-kit-0.94.0.orig/drivers/oss/oss_driver.c 1970-01-01 02:00:00.000000000 +0200
-+++ drivers/oss/oss_driver.c 2004-03-15 21:35:09.000000000 +0200
-@@ -0,0 +1,1189 @@
++++ drivers/oss/oss_driver.c 2004-03-23 23:27:15.000000000 +0200
+@@ -0,0 +1,1195 @@
+/*
+
+ OSS driver for Jack
@@ -72,6 +72,8 @@ diff -urN jack-audio-connection-kit-0.94.0.orig/drivers/oss/oss_driver.c drivers
+*/
+
+
++#include <config.h>
++
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
@@ -1058,7 +1060,7 @@ diff -urN jack-audio-connection-kit-0.94.0.orig/drivers/oss/oss_driver.c drivers
+ return NULL;
+ }
+ strcpy(desc->name, driver_client_name);
-+ desc->nparams = 8;
++ desc->nparams = OSS_DRIVER_N_PARAMS;
+
+ params = calloc(desc->nparams, sizeof(jack_driver_param_desc_t));
+ memcpy(params, oss_params,
@@ -1164,6 +1166,10 @@ diff -urN jack-audio-connection-kit-0.94.0.orig/drivers/oss/oss_driver.c drivers
+
+ driver->finish = driver_finish;
+
++ if (driver->indev == NULL)
++ driver->indev = strdup(OSS_DRIVER_DEF_DEV);
++ if (driver->outdev == NULL)
++ driver->outdev = strdup(OSS_DRIVER_DEF_DEV);
+ driver->infd = -1;
+ driver->outfd = -1;
+ switch (driver->bits)