[Midnightbsd-cvs] mports [18717] trunk/audio/alsa-plugins/Makefile: try modernizing

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 1 19:31:37 EDT 2015


Revision: 18717
          http://svnweb.midnightbsd.org/mports/?rev=18717
Author:   laffer1
Date:     2015-05-01 19:31:37 -0400 (Fri, 01 May 2015)
Log Message:
-----------
try modernizing

Modified Paths:
--------------
    trunk/audio/alsa-plugins/Makefile

Modified: trunk/audio/alsa-plugins/Makefile
===================================================================
--- trunk/audio/alsa-plugins/Makefile	2015-05-01 23:31:18 UTC (rev 18716)
+++ trunk/audio/alsa-plugins/Makefile	2015-05-01 23:31:37 UTC (rev 18717)
@@ -11,16 +11,18 @@
 
 LICENSE=	lgpl2.1
 
-LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
 GNU_CONFIGURE=	yes
 USES=		libtool:keepla pkgconfig tar:bzip2
+EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
+INSTALL_TARGET=	install-strip
+CPPFLAGS+=	-I${.CURDIR}/../alsa-lib/files
 LDFLAGS+=	-L${LOCALBASE}/lib
-EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
 
-OPTIONS_DEFAULT=BUFSZ_P2 IO_PTR
+OPTIONS_DEFAULT=IO_PTR
 OPTIONS_DEFINE=	JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
-OPTIONS_SUB=	${OPTIONS_DEFINE}
+OPTIONS_SUB=	yes
 
 OPTIONS_GROUP=	OSS
 OPTIONS_GROUP_OSS=IO_PTR BLKCNT_P2 BUFSZ_P2 VERBOSE
@@ -27,73 +29,37 @@
 
 IO_PTR_DESC=	Precise playback/recording pointer
 BLKCNT_P2_DESC=	Restrict number of fragments to ^2 aligned
-BUFSZ_P2_DESC=	Restrict buffer size to ^2 aligned (breaks aplay)
+BUFSZ_P2_DESC=	Restrict buffer size to ^2 aligned
 VERBOSE_DESC=	Print debugging messages
 
-.include <bsd.mport.options.mk>
+IO_PTR_CFLAGS=	-DFREEBSD_OSS_USE_IO_PTR
+BLKCNT_P2_CFLAGS=-DFREEBSD_OSS_BLKCNT_P2
+BUFSZ_P2_CFLAGS=-DFREEBSD_OSS_BUFSZ_P2
+VERBOSE_CFLAGS=	-DFREEBSD_OSS_DEBUG_VERBOSE
 
-.if ${PORT_OPTIONS:MIO_PTR}
-CFLAGS+=	-DFREEBSD_OSS_USE_IO_PTR
-.endif
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ENABLE=	jack
 
-.if ${PORT_OPTIONS:MBLKCNT_P2}
-CFLAGS+=	-DFREEBSD_OSS_BLKCNT_P2
-.endif
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CONFIGURE_ENABLE=avcodec
+FFMPEG_CPPFLAGS=	-I${LOCALBASE}/include
 
-.if ${PORT_OPTIONS:MBUFSZ_P2}
-CFLAGS+=	-DFREEBSD_OSS_BUFSZ_P2
-.endif
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=pulseaudio
 
-.if ${PORT_OPTIONS:MVERBOSE}
-CFLAGS+=	-DFREEBSD_OSS_DEBUG_VERBOSE
-.endif
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_CONFIGURE_ENABLE=samplerate
 
-.if ${PORT_OPTIONS:MJACK}
-.if empty(PORT_OPTIONS:MSAMPLERATE)
-IGNORE=			JACK audio support requires SAMPLERATE
-.endif
-LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
-PLIST_SUB+=		JACK=""
-.else
-PLIST_SUB+=		JACK="@comment "
-CONFIGURE_ARGS+=	--disable-jack
-.endif
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ON=	--with-speex=lib
+SPEEX_CONFIGURE_OFF=	--without-speex
 
-.if ${PORT_OPTIONS:MFFMPEG}
-CONFIGURE_ARGS+=	--enable-avcodec
-CFLAGS+=		-I${LOCALBASE}/include
-LIB_DEPENDS+=		avcodec:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=		LAVC=""
-.else
-CONFIGURE_ARGS+=	--disable-avcodec
-PLIST_SUB+=		LAVC="@comment "
-.endif
+.include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=		pulse:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+=		PULSE=""
-.else
-PLIST_SUB+=		PULSE="@comment "
-CONFIGURE_ARGS+=	--disable-pulseaudio
+.if ${PORT_OPTIONS:MJACK} && empty(PORT_OPTIONS:MSAMPLERATE)
+IGNORE=			JACK audio support requires SAMPLERATE
 .endif
 
-.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=		samplerate:${PORTSDIR}/audio/libsamplerate
-PLIST_SUB+=		SAMPLERATE=""
-.else
-PLIST_SUB+=		SAMPLERATE="@comment "
-CONFIGURE_ARGS+=	--disable-samplerate
-.endif
-
-.if ${PORT_OPTIONS:MSPEEX}
-CONFIGURE_ARGS+=	--with-speex=lib
-LIB_DEPENDS+=		speex:${PORTSDIR}/audio/speex
-PLIST_SUB+=		SPEEX=""
-.else
-CONFIGURE_ARGS+=	--without-speex
-PLIST_SUB+=		SPEEX="@comment "
-.endif
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
 		-e '/lt_cv_dlopen/s/-ldl//g' \



More information about the Midnightbsd-cvs mailing list