diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-26 23:46:21 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-26 23:46:21 +0000 |
commit | 24885637f10ce5f2fcbca1e983583e86f026f750 (patch) | |
tree | 818943fb55d2a9443eda5e445946d101fc6902af /audio | |
parent | b49524071e98cadb674e9d171a33b2b50995e673 (diff) | |
download | freebsd-ports-24885637f10ce5f2fcbca1e983583e86f026f750.zip |
Chase audio/arts removal
Diffstat (limited to 'audio')
-rw-r--r-- | audio/Makefile | 1 | ||||
-rw-r--r-- | audio/artswrapper/Makefile | 34 | ||||
-rw-r--r-- | audio/artswrapper/files/artswrapper.c | 118 | ||||
-rw-r--r-- | audio/artswrapper/pkg-descr | 3 | ||||
-rw-r--r-- | audio/cmus/Makefile | 13 | ||||
-rw-r--r-- | audio/cmus/pkg-plist | 1 | ||||
-rw-r--r-- | audio/ecasound/Makefile | 11 | ||||
-rw-r--r-- | audio/linuxsampler/Makefile | 10 | ||||
-rw-r--r-- | audio/mhwaveedit/Makefile | 19 | ||||
-rw-r--r-- | audio/openal/Makefile | 15 | ||||
-rw-r--r-- | audio/tse3/Makefile | 8 | ||||
-rw-r--r-- | audio/zinf/Makefile | 15 | ||||
-rw-r--r-- | audio/zinf/pkg-plist | 1 |
13 files changed, 25 insertions, 224 deletions
diff --git a/audio/Makefile b/audio/Makefile index c238eaaf2d35..1edbba97bc24 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -40,7 +40,6 @@ SUBDIR += ardour SUBDIR += ario SUBDIR += arss - SUBDIR += artswrapper SUBDIR += ascd SUBDIR += asmix SUBDIR += asmixer diff --git a/audio/artswrapper/Makefile b/audio/artswrapper/Makefile deleted file mode 100644 index 70df99da4ce6..000000000000 --- a/audio/artswrapper/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: artsrapper -# Date created: 2004-03-04 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# -# $FreeBSD$ -# - -PORTNAME= artswrapper -PORTVERSION= 1.5.3 -CATEGORIES= audio -DISTNAME= # none -EXTRACT_SUFX= # none - -MAINTAINER= ports@FreeBSD.org -COMMENT= Setuid wrapper for arts - -NO_WRKSUBDIR= yes -PLIST_FILES= bin/artswrapper - -.if defined(KDE_PREFIX) -PREFIX= ${KDE_PREFIX} -.endif - -do-fetch: - -.include <bsd.port.pre.mk> - -do-build: - ${CC} ${CFLAGS} -DHAVE_REALTIME_SCHED -DEXECUTE=\"${PREFIX}/bin/artsd\" -o ${WRKSRC}/artswrapper ${FILESDIR}/artswrapper.c - -do-install: - ${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m 4555 ${WRKSRC}/artswrapper ${PREFIX}/bin - -.include <bsd.port.post.mk> diff --git a/audio/artswrapper/files/artswrapper.c b/audio/artswrapper/files/artswrapper.c deleted file mode 100644 index ee6814e9d080..000000000000 --- a/audio/artswrapper/files/artswrapper.c +++ /dev/null @@ -1,118 +0,0 @@ -#include <stdio.h> -#include <sys/stat.h> -#include <sys/resource.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <stdlib.h> - -/* - * adjust_priority - * - * sets realtime priority - */ - -#ifdef HAVE_REALTIME_SCHED -#include <sched.h> - -void adjust_priority() -{ - int sched = sched_getscheduler(0); - if(sched == SCHED_FIFO || sched == SCHED_RR) - { - printf(">> since the scheduling policy is not standard, I assume\n"); - printf(" it has been adjusted to fit the needs of realtime audio\n"); - } - else - { - struct sched_param sp; - long priority = (sched_get_priority_max(SCHED_FIFO) + - sched_get_priority_min(SCHED_FIFO))/2; - - sp.sched_priority = priority; - - if(sched_setscheduler(0, SCHED_FIFO, &sp) != -1) - { - printf(">> running as realtime process now (priority %ld)\n", - priority); - putenv("STARTED_THROUGH_ARTSWRAPPER=1"); - } - else - { - /* can't set realtime priority */ - putenv("STARTED_THROUGH_ARTSWRAPPER=2"); - } - } -} -#else -void adjust_priority() -{ - int prio; - - prio = getpriority(PRIO_PROCESS,getpid()); - if(prio > -10) - { - setpriority(PRIO_PROCESS,getpid(),-17); - prio = getpriority(PRIO_PROCESS,getpid()); - } - - /* no system support for realtime priority */ - putenv("STARTED_THROUGH_ARTSWRAPPER=3"); - - if(prio > -10) { - printf(">> synthesizer priority is %d (which is unacceptable,",prio); - printf(" try running as root)\n"); - } - else { - printf(">> synthesizer priority is %d (which is the best\n",prio); - printf(" we can get out of a non realtime system)\n"); - } -} -#endif - -int main(int argc, char **argv) -{ - if(argc == 2) - { - if(strcmp(argv[1],"check") == 0) - { - /* backward compatibility with old artswrapper */ - printf("okay\n"); - return 0; - } - } - - adjust_priority(); - - /* drop root privileges if running setuid root - (due to realtime priority stuff) */ - if (geteuid() != getuid()) - { -#if defined (HAVE_SETEUID) && !defined (HAVE_SETEUID_FAKE) - seteuid(getuid()); -#else - setreuid(-1, getuid()); -#endif - if (geteuid() != getuid()) { - perror("setuid()"); - return 2; - } - } - - if(argc == 0) - return 1; - -/* - * Real-time status is passed to artsd via the environment variable - * STARTED_THROUGH_ARTSWRAPPER. It has one of the following values: - * - * unset - not running as real-time - * 1 - running as real-time - * 2 - no privileges to set real-time scheduling - * 3 - no support for real-time scheduling - */ - argv[0] = EXECUTE; - execv(EXECUTE,argv); - perror(EXECUTE); - return 1; -} diff --git a/audio/artswrapper/pkg-descr b/audio/artswrapper/pkg-descr deleted file mode 100644 index 7447dcd1e497..000000000000 --- a/audio/artswrapper/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This program launches artsd (from the audio/arts port), optionally with -elevated priority. To do this, it needs superuser privileges and is installed -setuid root. diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 4784e5140d94..a976e2592f98 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -20,11 +20,13 @@ CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \ exampledir=${EXAMPLESDIR} \ CONFIG_ALSA=n CONFIG_ROAR=n -OPTIONS_DEFINE= AAC AO ARTS CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \ +OPTIONS_DEFINE= AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \ MODPLUG MP4 MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK OPTIONS_DEFAULT=FLAC MAD VORBIS DISCID_DESC= DISCID support +CONFIGURE_ARGS=CONFIG_ARTS=n + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFLAC} @@ -142,15 +144,6 @@ CONFIGURE_ARGS+=CONFIG_PULSE=n PLIST_SUB+= PULSEAUDIO="@comment " .endif -.if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts -CONFIGURE_ARGS+=CONFIG_ARTS=y -PLIST_SUB+= ARTS="" -.else -CONFIGURE_ARGS+=CONFIG_ARTS=n -PLIST_SUB+= ARTS="@comment " -.endif - .if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO} LIB_DEPENDS+= cddb:${PORTSDIR}/audio/libcddb CONFIGURE_ARGS+=CONFIG_CDDB=y diff --git a/audio/cmus/pkg-plist b/audio/cmus/pkg-plist index 6778e10e3486..fcf864431d79 100644 --- a/audio/cmus/pkg-plist +++ b/audio/cmus/pkg-plist @@ -16,7 +16,6 @@ lib/cmus/ip/wav.so lib/cmus/op/oss.so %%AO%%lib/cmus/op/ao.so %%PULSEAUDIO%%lib/cmus/op/pulse.so -%%ARTS%%lib/cmus/op/arts.so %%DATADIR%%/cyan.theme %%DATADIR%%/default.theme %%DATADIR%%/gray-88.theme diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile index 79fb6ff56304..c963e1b5a3b2 100644 --- a/audio/ecasound/Makefile +++ b/audio/ecasound/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -OPTIONS_DEFINE= ALSA ARTS AUDIOFILE JACK LO OIL PYTHON SAMPLERATE +OPTIONS_DEFINE= ALSA AUDIOFILE JACK LO OIL PYTHON SAMPLERATE OPTIONS_DEFAULT=PYTHON AUDIOFILE_DESC= Enable libaudiofile support LO_DESC= Enable liblo support @@ -27,7 +27,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-liblilv \ --disable-rubyecasound \ - --enable-sys-readline + --enable-sys-readline \ + --disable-arts USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes @@ -47,12 +48,6 @@ LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib CONFIGURE_ARGS+= --disable-alsa .endif -.if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts -.else -CONFIGURE_ARGS+= --disable-arts -.endif - .if ${PORT_OPTIONS:MAUDIOFILE} LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile .else diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index b0f0ec04e1e4..565175f0dd06 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -17,7 +17,7 @@ RESTRICTED= no commercial use ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "not yet ported" -OPTIONS_DEFINE= JACK ALSA ARTS DSSI LV2CORE +OPTIONS_DEFINE= JACK ALSA DSSI LV2CORE OPTIONS_DEFAULT= JACK DSSI_DESC= Enable DSSI support LV2CORE_DESC= Enable LV2 support @@ -36,6 +36,8 @@ MAN1= linuxsampler.1 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS+=--disable-arts-driver + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJACK} @@ -50,12 +52,6 @@ LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib CONFIGURE_ARGS+=--disable-alsa-driver .endif -.if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts -.else -CONFIGURE_ARGS+=--disable-arts-driver -.endif - .if ${PORT_OPTIONS:MDSSI} BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile index 470284afe9df..924c9f9822b0 100644 --- a/audio/mhwaveedit/Makefile +++ b/audio/mhwaveedit/Makefile @@ -19,7 +19,9 @@ WANT_SDL= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --disable-optimization --without-alsalib +CONFIGURE_ARGS= --disable-optimization --without-alsalib \ + --without-arts + PLIST_FILES= bin/mhwaveedit \ share/locale/de/LC_MESSAGES/mhwaveedit.mo \ @@ -38,7 +40,7 @@ PLIST_DIRS= share/applications MAN1= mhwaveedit.1 OPTIONS_DEFINE= DOUBLE_SAMPLES SNDFILE SAMPLERATE OSS \ - PORTAUDIO SDL ARTS JACK \ + PORTAUDIO SDL JACK \ ESD PULSEAUDIO LADSPA DOUBLE_SAMPLES_DESC= increase quality for 24/32-bit samplerates @@ -47,7 +49,6 @@ SAMPLERATE_DESC= libsamplerate support OSS_DESC= OSS sound driver PORTAUDIO_DESC= PortAudio sound driver SDL_DESC= SDL sound driver -ARTS_DESC= arts sound driver JACK_DESC= JACK sound driver ESD_DESC= EsounD sound driver PULSEAUDIO_DESC= PULSEAUDIO support @@ -55,14 +56,12 @@ LADSPA_DESC= LADSPA support OPTIONS_DEFAULT=SNDFILE SAMPLERATE OSS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif -.include <bsd.port.options.mk> - .if ${PORT_OPTIONS:MDOUBLE_SAMPLES} CONFIGURE_ARGS+= --with-double-samples .endif @@ -95,12 +94,6 @@ USE_SDL+= sdl CONFIGURE_ARGS+= --without-sdl .endif -.if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts -.else -CONFIGURE_ARGS+= --without-arts -.endif - .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .else @@ -133,4 +126,4 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/AM_CFLAGS=/s|-g||g' ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 7e90ed847eef..b7659cebff70 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -17,13 +17,13 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --enable-capture -USE_GMAKE= yes -USES= pathfix pkgconfig +CONFIGURE_ARGS= --enable-capture \ + --disable-arts +USES= pathfix pkgconfig gmake WANT_SDL= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= ARTS ESOUND SDL VORBIS SMPEG +OPTIONS_DEFINE= ESOUND SDL VORBIS SMPEG OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT_i386= ASM SMPEG_DESC= smpeg support @@ -34,13 +34,6 @@ SMPEG_DESC= smpeg support WITH_SDL= yes # smpeg requires SDL .endif -.if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts -CONFIGURE_ARGS+=--enable-arts -.else -CONFIGURE_ARGS+=--disable-arts -.endif - .if ${PORT_OPTIONS:MESD} USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile index 583f18fff475..0270e010b4a2 100644 --- a/audio/tse3/Makefile +++ b/audio/tse3/Makefile @@ -14,7 +14,8 @@ LICENSE= GPLv2 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --without-doc-install +CONFIGURE_ARGS= --without-doc-install \ + --without-aRts USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes @@ -24,10 +25,7 @@ LDFLAGS+= ${PTHREAD_LIBS} MAN1= tse3play.1 MAN3= tse3.3 -OPTIONS_DEFINE= ARTS DOCS - -ARTS_LIB_DEPENDS= artsmidi:${PORTSDIR}/multimedia/kdemultimedia3 -ARTS_CONFIGURE_OFF= --without-aRts +OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile index aac26939f7d5..91780ccfb0d8 100644 --- a/audio/zinf/Makefile +++ b/audio/zinf/Makefile @@ -13,13 +13,13 @@ COMMENT= GTK-based MP3 player LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ gdbm.4:${PORTSDIR}/databases/gdbm -USES= pathfix gettext +USES= pathfix gettext gmake USE_GNOME= gtk20 lthack WANT_GNOME= yes USE_PERL5= yes -USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-ipv6 +CONFIGURE_ARGS= --enable-ipv6 \ + --disable-arts CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -45,14 +45,6 @@ CONFIGURE_ARGS+= --disable-esd PLIST_SUB+= ESOUND="@comment " .endif -.if defined(WITH_LIBARTS) || defined(WITH_ALL_PLUGINS) -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts -PLIST_SUB+= LIBARTS="" -.else -CONFIGURE_ARGS+= --disable-arts -PLIST_SUB+= LIBARTS="@comment " -.endif - .if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS) LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis PLIST_SUB+= VORBIS="" @@ -65,7 +57,6 @@ pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} - @${ECHO_MSG} "WITH_LIBARTS=yes build with libArts output plugin" @${ECHO_MSG} "WITHOUT_GNOME=esound do NOT build with esd support" @${ECHO_MSG} "WITHOUT_VORBIS=yes do NOT build with Ogg/Vorbis codec plugin" @${ECHO_MSG} diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist index 40d670501713..74af921ba167 100644 --- a/audio/zinf/pkg-plist +++ b/audio/zinf/pkg-plist @@ -1,7 +1,6 @@ bin/zinf etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.zinf lib/zinf/plugins/albumart.ui -%%LIBARTS%%lib/zinf/plugins/arts.pmo lib/zinf/plugins/cd.lmc lib/zinf/plugins/cd.pmo lib/zinf/plugins/cmdline.ui |