From owner-svn-ports-all@FreeBSD.ORG Thu Nov 13 09:08:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BDA1505; Thu, 13 Nov 2014 09:08:37 +0000 (UTC) Received: from svn.freebsd.org (svn.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 789EE953; Thu, 13 Nov 2014 09:08:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAD98bBN037977; Thu, 13 Nov 2014 09:08:37 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAD98bEf037972; Thu, 13 Nov 2014 09:08:37 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411130908.sAD98bEf037972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 13 Nov 2014 09:08:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372515 - in head/audio/zynaddsubfx: . files 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.18-1 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: Thu, 13 Nov 2014 09:08:37 -0000 Author: marino Date: Thu Nov 13 09:08:36 2014 New Revision: 372515 URL: https://svnweb.freebsd.org/changeset/ports/372515 QAT: https://qat.redports.org/buildarchive/r372515/ Log: audio/zynaddsubfx: Fix JACK support by using portaudio v2 While here, clean up makefile of this unmaintained port. PR: 194403 Submitted by: Hans Petter Selasky Added: head/audio/zynaddsubfx/files/patch-src__CMakeLists.txt (contents, props changed) Modified: head/audio/zynaddsubfx/Makefile Modified: head/audio/zynaddsubfx/Makefile ============================================================================== --- head/audio/zynaddsubfx/Makefile Thu Nov 13 09:02:57 2014 (r372514) +++ head/audio/zynaddsubfx/Makefile Thu Nov 13 09:08:36 2014 (r372515) @@ -3,7 +3,7 @@ PORTNAME= zynaddsubfx PORTVERSION= 2.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= SF DISTNAME= ZynAddSubFX-${PORTVERSION} @@ -16,10 +16,14 @@ LICENSE= GPLv2 LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ libmxml.so:${PORTSDIR}/textproc/mxml +BROKEN_ia64= invokes i386 asm +BROKEN_powerpc= invokes i386 asm +BROKEN_sparc64= invokes i386 asm + USES= tar:bzip2 cmake pkgconfig -OPTIONS_DEFINE= DOCS EXAMPLES GUI LASH LO JACK PORTAUDIO -OPTIONS_DEFAULT= GUI PORTAUDIO +OPTIONS_DEFINE= JACK GUI PORTAUDIO LASH LO DOCS EXAMPLES +OPTIONS_DEFAULT= JACK GUI PORTAUDIO OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSAMIDI DSSI OPTIONS_SUB= yes @@ -74,10 +78,6 @@ PORTEXAMPLES= * .include -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64: invokes i386 asm -.endif - .if ${ARCH} == "i386" || ${ARCH} == "amd64" CFLAGS+= -DASM_F2I_YES .endif @@ -94,22 +94,20 @@ post-patch: /pthread/d ; \ s|lib64|lib|' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/Misc/Config.cpp - @${REINPLACE_CMD} -e 's|portaudio.h|portaudio2/portaudio.h|' ${WRKSRC}/src/Nio/PaEngine.h - post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/banks - (cd ${WRKDIR}/${DISTNAME}/instruments/banks \ - && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks) + @${MKDIR} ${STAGEDIR}${DATADIR}/banks \ + ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${DOCSDIR2} \ + ${STAGEDIR}${DOCSDIR3} \ + ${STAGEDIR}${EXAMPLESDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKDIR}/${DISTNAME}/instruments/banks && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks) ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR2} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} - @${MKDIR} ${STAGEDIR}${DOCSDIR3} ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} - - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @(cd ${WRKSRC}/instruments/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/instruments/examples && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Added: head/audio/zynaddsubfx/files/patch-src__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/zynaddsubfx/files/patch-src__CMakeLists.txt Thu Nov 13 09:08:36 2014 (r372515) @@ -0,0 +1,30 @@ +--- src/CMakeLists.txt.orig 2014-10-16 15:33:19.000000000 +0200 ++++ src/CMakeLists.txt 2014-10-16 15:33:53.000000000 +0200 +@@ -127,6 +127,13 @@ + # From here on, the setting variables have been prepared so concentrate + # on the actual compiling. + ++if(PaEnable) ++ include_directories(${PORTAUDIO_INCLUDE_DIRS}) ++ add_definitions(-DPORTAUDIO=1) ++ list(APPEND AUDIO_LIBRARIES ${PORTAUDIO_LIBRARIES}) ++ list(APPEND AUDIO_LIBRARY_DIRS ${PORTAUDIO_LIBRARY_DIRS}) ++endif() ++ + if(AlsaEnable) + list(APPEND AUDIO_LIBRARIES ${ASOUND_LIBRARY}) + list(APPEND AUDIO_LIBRARY_DIRS ${ASOUND_LIBRARY_DIRS}) +@@ -143,13 +150,6 @@ + add_definitions(-DOSS=1) + endif(OssEnable) + +-if(PaEnable) +- include_directories(${PORTAUDIO_INCLUDE_DIR}) +- add_definitions(-DPORTAUDIO=1) +- list(APPEND AUDIO_LIBRARIES ${PORTAUDIO_LIBRARIES}) +- list(APPEND AUDIO_LIBRARY_DIRS ${PORTAUDIO_LIBRARY_DIRS}) +-endif() +- + if (CompileTests) + ENABLE_TESTING() + endif()