aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-01-05 08:02:23 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-01-05 08:02:23 +0000
commit66e089fb6abadfbb3f2ee5053d61f3d508832d01 (patch)
treeb963962baae518957e48deca84c6fd3e1c61cf5a /audio
parentf527264ec69c17265abe7b5d7db6c29d8da1e893 (diff)
downloadports-66e089fb6abadfbb3f2ee5053d61f3d508832d01.tar.gz
ports-66e089fb6abadfbb3f2ee5053d61f3d508832d01.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms-jack/Makefile7
-rw-r--r--audio/xmms-jack/distinfo6
-rw-r--r--audio/xmms-jack/files/patch-bio2jack.c33
3 files changed, 22 insertions, 24 deletions
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index ca48f17ccb65..3d98283029f9 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= jack
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.17
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmms-jack
@@ -17,7 +16,8 @@ MAINTAINER= dyeske@yahoo.com
COMMENT= XMMS plugin for jack
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
- jack.0:${PORTSDIR}/audio/jack
+ jack.0:${PORTSDIR}/audio/jack \
+ samplerate.1:${PORTSDIR}/audio/libsamplerate
WRKSRC= ${WRKDIR}/xmms-jack
@@ -25,6 +25,7 @@ USE_X_PREFIX= yes
USE_GNOME= gtk12 gnometarget
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
PLIST_FILES= lib/xmms/Output/libjackout.a \
lib/xmms/Output/libjackout.la \
diff --git a/audio/xmms-jack/distinfo b/audio/xmms-jack/distinfo
index 1eddf7acb3dd..fc434e627540 100644
--- a/audio/xmms-jack/distinfo
+++ b/audio/xmms-jack/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms-jack-0.9.tar.gz) = d7500fd15e7b58e8ad5b6a655e9b37cf
-SHA256 (xmms-jack-0.9.tar.gz) = 2d11cd2bf8d486c5ad0c2cee8c2ad65d50f044ac62a0c88a89e68413ec994845
-SIZE (xmms-jack-0.9.tar.gz) = 652989
+MD5 (xmms-jack-0.17.tar.gz) = 6e4ba99afaf675bbc667755f3a741c92
+SHA256 (xmms-jack-0.17.tar.gz) = 2fbf6205fdfe08d01e57cd31c11efb677acb43e0fb50a8ffe2f2430720c5c176
+SIZE (xmms-jack-0.17.tar.gz) = 527149
diff --git a/audio/xmms-jack/files/patch-bio2jack.c b/audio/xmms-jack/files/patch-bio2jack.c
index 6b0b71f14d55..30bde94be237 100644
--- a/audio/xmms-jack/files/patch-bio2jack.c
+++ b/audio/xmms-jack/files/patch-bio2jack.c
@@ -1,19 +1,16 @@
---- bio2jack.c.orig Thu Apr 8 10:03:08 2004
-+++ bio2jack.c Thu Apr 8 10:07:28 2004
-@@ -585,6 +585,7 @@
- /* and transition to STOPPED */
- if(this->state == RESET)
- {
-+ wave_header_t *wh;
- this->written_client_bytes = 0;
- this->played_client_bytes = 0; /* number of the clients bytes that jack has played */
+--- bio2jack.c.orig Sat Jun 17 18:58:16 2006
++++ bio2jack.c Thu Dec 7 12:51:17 2006
+@@ -2512,11 +2512,12 @@
+ {
+ drv = &outDev[x];
+
++ memset(drv, 0, sizeof(jack_driver_t));
++
+ pthread_mutex_init(&drv->mutex, NULL);
+
+ getDriver(x);
+
+- memset(drv, 0, sizeof(jack_driver_t));
+ drv->volumeEffectType = linear;
+ drv->deviceID = x;
-@@ -598,7 +599,7 @@
- /* free up all of the buffers of audio that are queued */
- /* NOTE: this needs to be done inside of the callback because */
- /* the callback could be using any of these buffers */
-- wave_header_t *wh = this->pPlayPtr;
-+ wh = this->pPlayPtr;
- while(wh)
- {
- wh = wh->pNext;