Browse Source

First step at deorbitting esound:

remove esound options where it is possible to
main
Baptiste Daroussin 3 years ago
parent
commit
ab0bb2410a
  1. 7
      audio/boodler/Makefile
  2. 10
      audio/festival/Makefile
  3. 10
      audio/libao/Makefile
  4. 6
      audio/mhwaveedit/Makefile
  5. 7
      audio/mp3blaster/Makefile
  6. 9
      audio/openal/Makefile
  7. 9
      audio/timidity++/Makefile
  8. 9
      audio/zinf/Makefile
  9. 6
      emulators/xsystem35/Makefile
  10. 11
      games/fkiss/Makefile
  11. 11
      games/xabacus/Makefile
  12. 10
      polish/gnugadu2/Makefile
  13. 1
      polish/gnugadu2/pkg-plist

7
audio/boodler/Makefile

@ -3,7 +3,7 @@
PORTNAME= boodler
PORTVERSION= 1.5.3
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://www.eblong.com/zarf/boodler/
DISTFILES= boodler-153.tar.gz boodler-snd-021902.tar.gz
@ -30,14 +30,11 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
OPTIONS_DEFINE= DOCS
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ESOUND FILE OSS
OPTIONS_SINGLE_AUDIO= FILE OSS
OPTIONS_DEFAULT= OSS
AUDIO_DESC= Audio backend
ESOUND_LIB_DEPENDS= libesd.so:audio/esound
ESOUND_CONFIGURE_ON= --driver esd
FILE_DESC= Write raw PCM data to a file
FILE_CONFIGURE_ON= --driver file

10
audio/festival/Makefile

@ -3,6 +3,7 @@
PORTNAME= festival
PORTVERSION= 2.4
PORTREVISION= 1
CATEGORIES= audio accessibility
MASTER_SITES= FESTIVAL
DISTFILES= ${DISTNAME}-release.tar.gz \
@ -25,9 +26,8 @@ PATCH_SITES= ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patch
MAINTAINER= mi@aldan.algebra.com
COMMENT= Multi-lingual speech synthesis system
OPTIONS_DEFINE= NAS ESD
OPTIONS_DEFAULT=NAS ESD
ESD_DESC= ${ESOUND_DESC}
OPTIONS_DEFINE= NAS
OPTIONS_DEFAULT=NAS
CXXFLAGS+= -DFTLIBDIR=${LOCALBASE}/share/festival/lib
CONFIGURE_WRKSRC=${WRKDIR}/festival
@ -62,8 +62,8 @@ post-patch::
${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/*/config/systems/default.mak
.for m in nas esd
${m:tu}_LIB_DEPENDS= lib${m:nas=audio}.so:audio/${m:esd=esound}
.for m in nas
${m:tu}_LIB_DEPENDS= lib${m:nas=audio}.so:audio/${m}
post-patch-${m:tu}-on:
${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \
${WRKDIR}/*/config/config.in

10
audio/libao/Makefile

@ -3,7 +3,7 @@
PORTNAME= libao
PORTVERSION= 1.2.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/ao/
@ -17,13 +17,14 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static \
--disable-alsa \
--disable-arts
--disable-arts \
--disable-esd
INSTALL_TARGET= install-strip
# do not install
MAKE_ARGS= ckport_DATA=""
OPTIONS_DEFINE= DOCS ESOUND NAS PULSEAUDIO SNDIO
OPTIONS_DEFINE= DOCS NAS PULSEAUDIO SNDIO
OPTIONS_SUB= yes
NAS_LIB_DEPENDS=libaudio.so:audio/nas
@ -32,9 +33,6 @@ NAS_CONFIGURE_ENABLE= nas
PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE= pulse
ESOUND_CONFIGURE_ENABLE=esd
ESOUND_USE= GNOME=esound
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_USES= localbase

6
audio/mhwaveedit/Makefile

@ -3,6 +3,7 @@
PORTNAME= mhwaveedit
PORTVERSION= 1.4.24
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= audio
@ -20,21 +21,20 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-alsalib \
--without-arts \
--without-esound \
--with-build-date="-" \
--with-build-time="-"
BROKEN_powerpc64= fails to compile on powerpc64: convert_inc.c: conflicting types for 'C_FLOAT_PCM32SBEPM'
BROKEN_sparc64= fails to compile on sparc64
OPTIONS_DEFINE= DOUBLE_SAMPLES ESOUND JACK LADSPA OSS PORTAUDIO \
OPTIONS_DEFINE= DOUBLE_SAMPLES JACK LADSPA OSS PORTAUDIO \
PULSEAUDIO SAMPLERATE SDL SNDFILE NLS
OPTIONS_DEFAULT= OSS SAMPLERATE SNDFILE
OPTIONS_SUB= yes
DOUBLE_SAMPLES_DESC= Increase quality for 24/32-bit samplerates
DOUBLE_SAMPLES_CONFIGURE_WITH= double-samples
ESOUND_USE= gnome=esound
ESOUND_CONFIGURE_WITH= esound
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CONFIGURE_WITH= jack
LADSPA_BUILD_DEPENDS= ladspa>0:audio/ladspa

7
audio/mp3blaster/Makefile

@ -3,7 +3,7 @@
PORTNAME= mp3blaster
PORTVERSION= 3.2.6
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake localbase:ldflags ncurses
GNU_CONFIGURE= yes
OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS
OPTIONS_DEFAULT= SIDPLAY VORBIS
SIDPLAY_DESC= Sidplayer support
@ -39,9 +39,6 @@ NAS_LIB_DEPENDS= libaudio.so:audio/nas
NAS_LDFLAGS= -laudio
NAS_USE= XORG=x11,xt,ice,sm
ESOUND_CONFIGURE_WITH= esd
ESOUND_USE= GNOME=esound
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
${WRKSRC}/doc/sample.mp3blasterrc

9
audio/openal/Makefile

@ -3,7 +3,7 @@
PORTNAME= openal
PORTVERSION= 20060211
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= audio
MASTER_SITES= GENTOO
DISTNAME= ${PORTNAME}-0.0.8
@ -20,17 +20,16 @@ CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -Wno-return-type
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-capture \
--disable-arts
--disable-arts \
--disable-esd
USES= pathfix pkgconfig gmake libtool:keepla
USE_LDCONFIG= yes
OPTIONS_DEFINE= ESOUND SDL VORBIS SMPEG ALSA
OPTIONS_DEFINE= SDL VORBIS SMPEG ALSA
OPTIONS_DEFINE_i386= ASM
OPTIONS_DEFAULT_i386= ASM
SMPEG_DESC= smpeg support
ESOUND_USE= GNOME=esound
ESOUND_CONFIGURE_ENABLE=esd
SDL_USE= SDL=sdl
SDL_CONFIGURE_ENABLE= sdl
VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis

9
audio/timidity++/Makefile

@ -3,7 +3,7 @@
PORTNAME= timidity++
PORTVERSION= 2.14.0
PORTREVISION?= 3
PORTREVISION?= 4
CATEGORIES+= audio
MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
DISTNAME= TiMidity++-${PORTVERSION}
@ -30,14 +30,11 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,--export-dynamic
PLIST_SUB+= TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}"
.if !defined(PKGNAMESUFFIX)
OPTIONS_DEFINE= DOCS EAWPLUS ESOUND X11
OPTIONS_DEFINE= DOCS EAWPLUS X11
OPTIONS_DEFAULT= X11
CONFIGURE_ARGS+= --enable-audio=oss,vorbis
EAWPLUS_DESC= Collection of Gravis Ultrasound MIDI patches
EAWPLUS_RUN_DEPENDS= eawplus>0:audio/eawplus
ESOUND_USE= gnome=esound
ESOUND_CONFIGURE_ON= --enable-audio=oss,esd,vorbis
ESOUND_CONFIGURE_OFF= --enable-audio=oss,vorbis
X11_LIB_DEPENDS= libpng.so:graphics/png
X11_USE= xorg=x11,xext
X11_CONFIGURE_ON= --with-x --enable-spectrogram --enable-wrd \

9
audio/zinf/Makefile

@ -3,7 +3,7 @@
PORTNAME= zinf
PORTVERSION= 2.2.5
PORTREVISION= 23
PORTREVISION= 24
CATEGORIES= audio ipv6
MASTER_SITES= SF
@ -18,19 +18,18 @@ USE_CXXSTD= gnu++98
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ipv6 \
--disable-arts
--disable-arts \
--disable-esd
CPPFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -D_WANT_SEMUN
LDFLAGS+= -lpthread -L${LOCALBASE}/lib
LDFLAGS_i386= -Wl,-znotext
OPTIONS_DEFINE= ESOUND VORBIS
OPTIONS_DEFINE= VORBIS
OPTIONS_DEFAULT=VORBIS
OPTIONS_SUB= yes
ESOUND_CONFIGURE_OFF= --disable-esd
ESOUND_USE= GNOME=esound
INSTALL_TARGET= install-strip
VORBIS_CONFIGURE_OFF= --disable-vorbis

6
emulators/xsystem35/Makefile

@ -3,7 +3,7 @@
PORTNAME= xsystem35
DISTVERSION= 1.7.3-pre5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= emulators games
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${DISTVERSION}.orig
@ -17,12 +17,10 @@ LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \
libltdl.so:devel/libltdl \
libfreetype.so:print/freetype2
OPTIONS_DEFINE= ESOUND DOCS EXAMPLES
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_DEFINE_i386= MMX
OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MMMX}
ESOUND_USE= GNOME=esound
ESOUND_CONFIGURE_ON=--enable-audio=oss,esd --with-default-output=esd
MMX_BUILD_DEPENDS=nasm:devel/nasm
MMX_CONFIGURE_ENABLE=mmx

11
games/fkiss/Makefile

@ -3,7 +3,7 @@
PORTNAME= fkiss
PORTVERSION= 0.33a
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www2s.biglobe.ne.jp/~yav/soft/fkiss/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a//}
@ -34,14 +34,7 @@ PLIST_FILES= bin/fkiss man/man1/fkiss.1.gz
PORTDOCS= *
PORTEXAMPLES= *
OPTIONS_DEFINE= DOCS EXAMPLES ESOUND
ESOUND_USES= pkgconfig
ESOUND_USE= GNOME=esound
ESOUND_CPPFLAGS= `pkgconf --cflags-only-I esound`
ESOUND_LDFLAGS= `pkgconf --libs-only-L esound `
ESOUND_CONFIGURE_ENV_OFF= ac_cv_lib_esd_esd_open_sound=no \
ac_cv_header_esd_h=no
OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
@${REINPLACE_CMD} -e 's|= @X_LIBS@|= @LDFLAGS@ @X_LIBS@|g' \

11
games/xabacus/Makefile

@ -3,6 +3,7 @@
PORTNAME= xabacus
PORTVERSION= 8.0.2
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.tux.org/~bagleyd/abacus/ \
http://ftp.tux.org/pub/tux/bagleyd/xabacus/
@ -17,19 +18,15 @@ USES= tar:bzip2
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults
CONFIGURE_ARGS= --without-nas
CONFIGURE_ARGS= --without-nas --with-rplay --without-esound
INSTALLS_ICONS= yes
DESKTOP_ENTRIES="XAbacus" "" "abacus" "${PORTNAME}" "" ""
OPTIONS_DEFINE= ESOUND MOTIF
OPTIONS_DEFINE= MOTIF
OPTIONS_DEFAULT= MOTIF
ESOUND_LIB_DEPENDS_OFF= librplay.so:audio/rplay
ESOUND_USE= gnome=esound
ESOUND_CONFIGURE_ON= --without-rplay --with-esound
ESOUND_CONFIGURE_OFF= --with-rplay --without-esound
ESOUND_LDFLAGS= -L${LOCALBASE}/lib -laudiofile
LIB_DEPENDS= librplay.so:audio/rplay
MOTIF_USES= motif
MOTIF_CONFIGURE_WITH= motif

10
polish/gnugadu2/Makefile

@ -3,7 +3,7 @@
PORTNAME= gnugadu2
PORTVERSION= 2.3.0
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= polish net-im
MASTER_SITES= SF/ggadu/gg2/${PORTVERSION}
DISTNAME= gg2-${PORTVERSION}
@ -43,9 +43,10 @@ CONFIGURE_ARGS= --disable-esdtest \
--without-arts \
--without-gnutls \
--without-perl \
--without-remote
--without-remote \
--without-esd
OPTIONS_DEFINE= DBUS DOCKAPP DOCKLET ESOUND \
OPTIONS_DEFINE= DBUS DOCKAPP DOCKLET \
GTKSPELL JABBER TLEN XOSD
OPTIONS_DEFAULT=DOCKLET
OPTIONS_SUB= yes
@ -76,9 +77,6 @@ DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus \
DBUS_CONFIGURE_WITH= dbus
DBUS_CONFIGURE_ON= --with-dbus-dir=${PREFIX}/share/dbus-1/services
ESOUND_USE= GNOME=esound
ESOUND_CONFIGURE_WITH= esd
XOSD_LIB_DEPENDS= libxosd.so:misc/xosd
XOSD_USE= XORG=xext,xinerama
XOSD_CONFIGURE_WITH= xosd

1
polish/gnugadu2/pkg-plist

@ -11,7 +11,6 @@ lib/gg2/libhistory_external_plugin.so
lib/gg2/libignore_main_plugin.so
%%JABBER%%lib/gg2/libjabber_plugin.so
lib/gg2/libsms_plugin.so
%%ESOUND%%lib/gg2/libsound_esd_plugin.so
lib/gg2/libsound_external_plugin.so
lib/gg2/libsound_oss_plugin.so
%%TLEN%%lib/gg2/libtlen_plugin.so

Loading…
Cancel
Save