From owner-svn-ports-all@freebsd.org Mon Aug 24 08:30:18 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C482C9BFA70; Mon, 24 Aug 2015 08:30:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9CF5921F; Mon, 24 Aug 2015 08:30:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7O8UIC2002039; Mon, 24 Aug 2015 08:30:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7O8UIDa002038; Mon, 24 Aug 2015 08:30:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508240830.t7O8UIDa002038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 24 Aug 2015 08:30:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395161 - head/audio/audacity X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2015 08:30:18 -0000 Author: jbeich Date: Mon Aug 24 08:30:17 2015 New Revision: 395161 URL: https://svnweb.freebsd.org/changeset/ports/395161 Log: audio/audacity: convert to more option helpers - Restore SSE option removed in r331611 - Keep SSE default only to amd64 or i386 + custom CPUTYPE - Convert PORTMIXER to target option helper PR: 202605 Approved by: xxjack12xx@gmail.com (maintainer) Modified: head/audio/audacity/Makefile Modified: head/audio/audacity/Makefile ============================================================================== --- head/audio/audacity/Makefile Mon Aug 24 08:19:19 2015 (r395160) +++ head/audio/audacity/Makefile Mon Aug 24 08:30:17 2015 (r395161) @@ -33,6 +33,10 @@ OPTIONS_SINGLE= SAMPLERATED OPTIONS_SINGLE_SAMPLERATED= SAMPLERATE #SOXR OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \ PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST +OPTIONS_DEFINE_amd64= SSE +OPTIONS_DEFINE_i386= SSE +OPTIONS_DEFAULT_amd64= SSE +OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE} DEBUG_DESC= Enable debug support LAME_DESC= Use lame for import and export support @@ -54,11 +58,6 @@ CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ARGS+= --with-lib-preference="local system" \ --enable-portaudio --enable-unicode -.if ${MACHINE_CPU:Msse} -CONFIGURE_ARGS+= --enable-sse -.else -CONFIGURE_ARGS+= --disable-sse -.endif DEBUG_CONFIGURE_WITH= debug @@ -103,6 +102,8 @@ SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so #SOXR_CONFIGURE_WITH= libsoxr #SOXR_BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake +SSE_CONFIGURE_ENABLE= sse + TWOLAME_CONFIGURE_WITH= libtwolame TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame @@ -113,8 +114,6 @@ VORBIS_LIB_DEPENDS= libvorbis.so:${PORTS VST_CONFIGURE_ENABLE= vst -.include - LDFLAGS+= -lpthread -L${LOCALBASE}/lib CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf @@ -123,13 +122,13 @@ CFLAGS+= -I${WRKSRC}/lib-src/portsmf \ -I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include post-patch: -.if ! ${PORT_OPTIONS:MPORTMIXER} - @${REINPLACE_CMD} -e 's/ portmixer / /' ${WRKSRC}/lib-src/Makefile.in -.endif @${REINPLACE_CMD} -e 's|inline void|static inline void|' ${WRKSRC}/lib-src/libnyquist/nyquist/ffts/src/fftlib.c +post-patch-PORTMIXER-off: + @${REINPLACE_CMD} -e 's/ portmixer / /' ${WRKSRC}/lib-src/Makefile.in + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include