diff options
-rw-r--r-- | MOVED | 2 | ||||
-rw-r--r-- | audio/Makefile | 2 | ||||
-rw-r--r-- | audio/libjackasyn/Makefile | 58 | ||||
-rw-r--r-- | audio/libjackasyn/distinfo | 3 | ||||
-rw-r--r-- | audio/libjackasyn/files/patch-Makefile.in | 38 | ||||
-rw-r--r-- | audio/libjackasyn/files/patch-configure | 20 | ||||
-rw-r--r-- | audio/libjackasyn/files/patch-libjackasyn.c | 22 | ||||
-rw-r--r-- | audio/libjackasyn/files/patch-libjackoss.c | 46 | ||||
-rw-r--r-- | audio/libjackasyn/files/patch-libjackoss.h | 23 | ||||
-rw-r--r-- | audio/libjackasyn/files/pkg-message.in | 35 | ||||
-rw-r--r-- | audio/libjackasyn/pkg-descr | 19 | ||||
-rw-r--r-- | audio/libjackasyn/pkg-plist | 5 | ||||
-rw-r--r-- | audio/xmms-jackasyn/Makefile | 47 | ||||
-rw-r--r-- | audio/xmms-jackasyn/distinfo | 3 | ||||
-rw-r--r-- | audio/xmms-jackasyn/files/patch-jack.h | 11 | ||||
-rw-r--r-- | audio/xmms-jackasyn/files/pkg-message.in | 5 | ||||
-rw-r--r-- | audio/xmms-jackasyn/pkg-descr | 5 |
17 files changed, 2 insertions, 342 deletions
@@ -1534,3 +1534,5 @@ graphics/ray++||2011-02-04|Has expired: Does not compile on supported versions o japanese/oleo||2011-02-04|Has expired: Does not compile on supported versions of FreeBSD lang/dylan||2011-02-04|Has expired: does not build multimedia/jahshaka||2011-02-04|Has expired: Does not compile on supported versions of FreeBSD +audio/libjackasyn|audio/jack|2011-02-11|Has expired: development has ceased; try audio/jack instead +audio/xmms-jackasyn|audio/xmms-jack|2011-02-11|Has expired: development has ceased; try audio/xmms-jack instead diff --git a/audio/Makefile b/audio/Makefile index f5f94ee8d553..5f8fa39080a6 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -375,7 +375,6 @@ SUBDIR += libgme SUBDIR += libgpod SUBDIR += libid3tag - SUBDIR += libjackasyn SUBDIR += liblastfm SUBDIR += liblo SUBDIR += liblscp @@ -844,7 +843,6 @@ SUBDIR += xmms-gbsplay SUBDIR += xmms-infopipe SUBDIR += xmms-jack - SUBDIR += xmms-jackasyn SUBDIR += xmms-kde SUBDIR += xmms-kj SUBDIR += xmms-ladspa diff --git a/audio/libjackasyn/Makefile b/audio/libjackasyn/Makefile deleted file mode 100644 index 8fb19d7146c2..000000000000 --- a/audio/libjackasyn/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# New ports collection makefile for: libjackasyn -# Date created: 2006-03-06 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# -# $FreeBSD$ -# - -PORTNAME= libjackasyn -PORTVERSION= 0.13 -PORTREVISION= 1 -CATEGORIES= audio devel -MASTER_SITES= http://gige.xdv.org/soft/libjackasyn/download/ - -MAINTAINER= acm@FreeBSD.org -COMMENT= Allow use any sound program for the OSS system as a JACK client - -LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ - samplerate.1:${PORTSDIR}/audio/libsamplerate - -DEPRECATED= development has ceased; try audio/jack instead -EXPIRATION_DATE=2011-02-11 - -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CXXFLAGS+= -I${LOCALBASE}/include - -CONFIGURE_ENV+= CC="${CC}" LDFLAGS="${LDFLAGS}" -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}" - -CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CXXFLAGS}" -MAKE_JOBS_UNSAFE= yes - -SUB_FILES= pkg-message -MAN1= jacklaunch.1 - -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's|%%PTHREAD%%|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/libjackasyn.so.${PORTVERSION} ${PREFIX}/lib/libjackasyn.so.0 - ${INSTALL_PROGRAM} ${WRKSRC}/libjackasyn.a ${PREFIX}/lib - ${INSTALL_SCRIPT} ${WRKSRC}/jacklaunch ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/libjackoss.h ${PREFIX}/include - -post-install: - @cd ${PREFIX}/lib && \ - ${LN} -s libjackasyn.so.0 libjackasyn.so - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1/ - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/audio/libjackasyn/distinfo b/audio/libjackasyn/distinfo deleted file mode 100644 index a68e84e1d036..000000000000 --- a/audio/libjackasyn/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (libjackasyn-0.13.tar.gz) = 7f82157b64aa4936e695b923a75df291 -SHA256 (libjackasyn-0.13.tar.gz) = 77cf477815a054d508b0bdd34ffcedfe22c091bfbd4367c55c7e33e29089a902 -SIZE (libjackasyn-0.13.tar.gz) = 74041 diff --git a/audio/libjackasyn/files/patch-Makefile.in b/audio/libjackasyn/files/patch-Makefile.in deleted file mode 100644 index 19dfe61cacb5..000000000000 --- a/audio/libjackasyn/files/patch-Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- Makefile.in Mon Mar 6 07:40:18 2006 -+++ Makefile.in Tue Mar 28 08:19:51 2006 -@@ -8,8 +8,9 @@ - SRC_FILES = libjackasyn.c libjackoss.c clientfuncs.c - OBJ_FILES = $(SRC_FILES:.c=.o) libjackoss_pl.o - HEADERS = libjackasyn.h libjackoss.h --CFLAGS = -O2 -Wall -I. -fPIC -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@ --LIBS = -lc @LIBS@ -+CFLAGS = -Wall ${CPPFLAGS} -I. -fPIC -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@ -+LIBS = -lc @LIBS@ ${LDFLAGS} -+CC? = ${CC} - - - prefix = @prefix@ -@@ -22,7 +23,7 @@ - ar cr libjackasyn.a *.o - - shared: -- gcc -shared -Wl,-soname=libjackasyn.so.0 -o libjackasyn.so.$(VERSION) *.o $(LIBS) -+ ${CC} -shared -Wl,-soname=libjackasyn.so.0 -o libjackasyn.so.$(VERSION) *.o $(LIBS) - - install: - -rm $(prefix)/lib/libjackasyn.so* -@@ -34,7 +35,7 @@ - install -m 755 jacklaunch $(prefix)/bin - - test: -- gcc -o test test.c libjackasyn.a -ljack -ldl -lm -+ ${CC} -o test test.c libjackasyn.a -ljack -ldl -lm - - clean: - -rm *~ $(OBJ_FILES) -@@ -55,4 +56,4 @@ - $(OBJ_FILES) : $(HEADERS) - - libjackoss_pl.o: libjackoss.c -- gcc -c $(CFLAGS) -DLD_PRELOAD -o $@ $< -+ ${CC} -c $(CFLAGS) -DLD_PRELOAD -o $@ $< diff --git a/audio/libjackasyn/files/patch-configure b/audio/libjackasyn/files/patch-configure deleted file mode 100644 index 807f1ccc43b4..000000000000 --- a/audio/libjackasyn/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure Tue Aug 24 08:42:36 2004 -+++ configure Mon Mar 6 11:08:00 2006 -@@ -2506,7 +2506,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ljack $LIBS" -+LIBS="-ljack %%PTHREAD%% $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -2562,7 +2562,7 @@ - #define HAVE_LIBJACK 1 - _ACEOF - -- LIBS="-ljack $LIBS" -+ LIBS="-ljack %%PTHREAD%% $LIBS" - - else - echo please install jack jackit.sf.net;exit diff --git a/audio/libjackasyn/files/patch-libjackasyn.c b/audio/libjackasyn/files/patch-libjackasyn.c deleted file mode 100644 index 98bf9760a123..000000000000 --- a/audio/libjackasyn/files/patch-libjackasyn.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libjackasyn.c Tue Aug 24 08:29:32 2004 -+++ libjackasyn.c Thu Apr 6 12:09:57 2006 -@@ -47,9 +47,9 @@ - fprintf(stderr,"libjackasyn: cannot get application name\n"); - return NULL; - } -- n = namefield + strlen("Name: "); -+ n = namefield; - len=0; -- while (*(n+len) != '\n' && len < 255) len++; -+ while (*(n+len) != ' ' && len < 255) len++; - if (len >= 255) { - fprintf(stderr,"libjackasyn: cannot get process name\n"); - return NULL; -@@ -58,7 +58,7 @@ - pname = malloc(len+2); - n[len]='\0'; - sprintf(pname,"%s_%d",n,num); -- -+ - return pname; - } diff --git a/audio/libjackasyn/files/patch-libjackoss.c b/audio/libjackasyn/files/patch-libjackoss.c deleted file mode 100644 index 64e32c0f4525..000000000000 --- a/audio/libjackasyn/files/patch-libjackoss.c +++ /dev/null @@ -1,46 +0,0 @@ ---- libjackoss.c Mon Mar 6 08:17:57 2006 -+++ libjackoss.c Tue Aug 15 17:36:31 2006 -@@ -32,7 +32,9 @@ - #define REAL_LIBC ((void *) -1L) - #endif - -- -+#if defined (__FreeBSD__) -+#define O_LARGEFILE 0 -+#endif - - #if 1 - int (*_select)(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); -@@ -119,7 +121,7 @@ - } - - va_start (args, flags); -- mode = va_arg (args, mode_t); -+ mode = va_arg (args, int); - va_end (args); - - if ((strncmp(name,"/dev/dsp",8) && strncmp(name,"/dev/audio",8)) -@@ -198,7 +200,7 @@ - DEBUG(fprintf(stderr,"%s\n",__FUNCTION__)); - if (oflag & O_CREAT) { - va_start(args, oflag); -- mode = va_arg(args, mode_t); -+ mode = va_arg(args, int); - va_end(args); - } - return jackoss_open(file, oflag | O_LARGEFILE, mode); -@@ -386,10 +388,10 @@ - UNIMPLEMENTED( SNDCTL_DSP_MAPOUTBUF); - UNIMPLEMENTED( SNDCTL_DSP_SETSYNCRO); - UNIMPLEMENTED( SNDCTL_DSP_SETDUPLEX); -- UNIMPLEMENTED( SNDCTL_DSP_GETCHANNELMASK); -- UNIMPLEMENTED( SNDCTL_DSP_BIND_CHANNEL); -- UNIMPLEMENTED( SNDCTL_DSP_SETSPDIF); -- UNIMPLEMENTED( SNDCTL_DSP_GETSPDIF); -+// UNIMPLEMENTED( SNDCTL_DSP_GETCHANNELMASK); -+// UNIMPLEMENTED( SNDCTL_DSP_BIND_CHANNEL); -+// UNIMPLEMENTED( SNDCTL_DSP_SETSPDIF); -+// UNIMPLEMENTED( SNDCTL_DSP_GETSPDIF); - - default: - fprintf(stderr,"unknown ioctl\n"); diff --git a/audio/libjackasyn/files/patch-libjackoss.h b/audio/libjackasyn/files/patch-libjackoss.h deleted file mode 100644 index b04d019c847c..000000000000 --- a/audio/libjackasyn/files/patch-libjackoss.h +++ /dev/null @@ -1,23 +0,0 @@ ---- libjackoss.h Mon Mar 6 07:14:48 2006 -+++ libjackoss.h Thu Mar 23 22:22:42 2006 -@@ -2,6 +2,11 @@ - #define __LIBJACKOSS_H__ - #include <sys/types.h> - #include <sys/poll.h> -+#include <sys/param.h> -+ -+#if __FreeBSD_version < 500000 -+typedef unsigned int nfds_t; -+#endif - - #ifdef __cplusplus - extern "C" { -@@ -15,7 +20,7 @@ - int jackoss_select(int n, fd_set *readfds, - fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout); -- int jackoss_poll (struct pollfd *__fds, nfds_t __nfds, int __timeout); -+ int jackoss_poll(struct pollfd *__fds, nfds_t __nfds, int __timeout); - /* these are mainly need for sox */ - - FILE * jackoss_fopen (const char *pathname, const char *mode); diff --git a/audio/libjackasyn/files/pkg-message.in b/audio/libjackasyn/files/pkg-message.in deleted file mode 100644 index d3c5b424deb0..000000000000 --- a/audio/libjackasyn/files/pkg-message.in +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################### - -1) To use libjackasyn as a jack's client, you need to set LD_PRELOAD. - - csh: - setenv LD_PRELOAD %%PREFIX%%/lib/libjackasyn.so - - bash: - export LD_PRELOAD=%%PREFIX%%/lib/libjackasyn.so - - And start jackd (only works using root account) - - # jackd -d oss - -2) You need procfs mounted. - - # mount_procfs procfs /proc - - Also you could edit your /etc/fstab file and add this line - - proc /proc procfs rw 0 0 - - This to load procfs on boot time, or typing - - # mount /proc - -3) Run your program (using root account, jackd and xmms must have the same uid). - - Example: xmms + xmms-jackasyn - - # xmms - - If jackd isn't running, the libjackasyn will use normal oss device - -############################################################################## diff --git a/audio/libjackasyn/pkg-descr b/audio/libjackasyn/pkg-descr deleted file mode 100644 index 8a9924b5bfa9..000000000000 --- a/audio/libjackasyn/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -libjackasyn is a library that allows you to use programs written for the OSS -sound API with the JACK audio server (jackit.sf.net). libjackasyn is a library -that can be used for two purposes. - -First it can be loaded via the LD_PRELOAD variable, turning OSS applications -automatically into JACK-aware applications. - -Second, it can be used to link against the program during build time, making it -trivial to turn an OSS aware sound application into a JACK aware sound -application in a short time. - -libjackasyn got its name from the asynchronous manner in which it communicates -with the JACK server, which means by using libjackasyn you will introduce an -additional delay exactly the size of one JACK audiobuffer (1024 samples or 44 -ms with the JACK default settings). This delay can be reduced by reducing the -JACK buffersize. It should not matter for sound generating applications, but -it might introduce phasing effects when doing sound processing. - -WWW: http://gige.xdv.org/libjackasyn/ diff --git a/audio/libjackasyn/pkg-plist b/audio/libjackasyn/pkg-plist deleted file mode 100644 index c84f76bec07a..000000000000 --- a/audio/libjackasyn/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/jacklaunch -include/libjackoss.h -lib/libjackasyn.a -lib/libjackasyn.so -lib/libjackasyn.so.0 diff --git a/audio/xmms-jackasyn/Makefile b/audio/xmms-jackasyn/Makefile deleted file mode 100644 index 357f028c056e..000000000000 --- a/audio/xmms-jackasyn/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: xmms-jackasyn -# Date created: 2006-03-09 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# -# $FreeBSD$ -# - -PORTNAME= jackasyn -PORTVERSION= 0.3 -PORTREVISION= 3 -CATEGORIES= audio -MASTER_SITES= http://gige.xdv.org/libjackasyn/download/ -PKGNAMEPREFIX= xmms- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} - -MAINTAINER= acm@FreeBSD.org -COMMENT= XMMS plugin for jack using libjackasyn - -LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ - jackasyn.0:${PORTSDIR}/audio/libjackasyn - -DEPRECATED= development has ceased; try audio/xmms-jack instead -EXPIRATION_DATE=2011-02-11 - -USE_GNOME= gtk12 gnometarget -USE_GMAKE= yes -GNU_CONFIGURE= yes - -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CXXFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CXXFLAGS}" - -SUB_FILES= pkg-message -PLIST_FILES= lib/xmms/Output/libjackxmms.so - -post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|OSS Driver configuration|Jackasyn Driver configuration|g' ${WRKSRC}/configure.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/libjackxmms.so \ - ${PREFIX}/lib/xmms/Output/libjackxmms.so - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/audio/xmms-jackasyn/distinfo b/audio/xmms-jackasyn/distinfo deleted file mode 100644 index 505d42faadbe..000000000000 --- a/audio/xmms-jackasyn/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xmms-jackasyn-0.3.tar.gz) = 5a068b370a0cda4423e7a57988a97da8 -SHA256 (xmms-jackasyn-0.3.tar.gz) = 5e3a8869bb5f775f3e5245b227f2506c82b1a0f0665c2653c7043976f64be01d -SIZE (xmms-jackasyn-0.3.tar.gz) = 311968 diff --git a/audio/xmms-jackasyn/files/patch-jack.h b/audio/xmms-jackasyn/files/patch-jack.h deleted file mode 100644 index 95f5a0b2ed44..000000000000 --- a/audio/xmms-jackasyn/files/patch-jack.h +++ /dev/null @@ -1,11 +0,0 @@ ---- jack.h Thu Apr 6 12:12:30 2006 -+++ jack.h Thu Apr 6 12:13:02 2006 -@@ -18,6 +18,8 @@ - #ifndef JACK_H - #define JACK_H - -+#define HAVE_NEWPCM -+ - #include "config.h" - - #include <gtk/gtk.h> diff --git a/audio/xmms-jackasyn/files/pkg-message.in b/audio/xmms-jackasyn/files/pkg-message.in deleted file mode 100644 index 7c00d29f156b..000000000000 --- a/audio/xmms-jackasyn/files/pkg-message.in +++ /dev/null @@ -1,5 +0,0 @@ -############################################################################### - -1) Please, read information from audio/libjackasyn/files/pkg-message.in file - -############################################################################### diff --git a/audio/xmms-jackasyn/pkg-descr b/audio/xmms-jackasyn/pkg-descr deleted file mode 100644 index b8c71673215a..000000000000 --- a/audio/xmms-jackasyn/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This plugin enables xmms to playback sound via the JACK audio server. The -plugin is actually a port of the xmms OSS sound output plugin to JACK, using -libjackasyn. - -WWW: http://gige.xdv.org/libjackasyn/xmms.php |