Attachment 148372 Details for Bug 194403 – Update for ZynaddSubFx port

[patch] Update for ZynaddSubFx port

zynaddsubfx-port.diff (text/plain), 2.16 KB, created by Hans Petter Selasky on 2014-10-16 13:46:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Petter Selasky

Created: 2014-10-16 13:46:56 UTC

Size: 2.16 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 371006)
>+++ Makefile	(working copy)
>@@ -19,7 +19,7 @@
> USES=		tar:bzip2 cmake pkgconfig
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES GUI LASH LO JACK PORTAUDIO
>-OPTIONS_DEFAULT=	GUI PORTAUDIO
>+OPTIONS_DEFAULT=	JACK GUI PORTAUDIO
> OPTIONS_RADIO=		AUDIO
> OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
> OPTIONS_SUB=		yes
>@@ -94,7 +94,6 @@
> 		 /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:
>Index: files/patch-src__CMakeLists.txt
>===================================================================
>--- files/patch-src__CMakeLists.txt	(revision 0)
>+++ files/patch-src__CMakeLists.txt	(working copy)
>@@ -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()
>
>Property changes on: files/patch-src__CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 194403: 148372