Attachment 157682 Details for Bug 200820 – update audio/hydrogen re: portaudio2 removal

[patch] update audio/hydrogen re: portaudio2 removal

hydrogen.patch (text/plain), 5.47 KB, created by Shane on 2015-06-12 14:26:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2015-06-12 14:26:25 UTC

Size: 5.47 KB

patch

obsolete

>diff -Nru hydrogen.orig/Makefile hydrogen/Makefile
>--- hydrogen.orig/Makefile	2015-06-12 21:12:07.436964167 +0930
>+++ hydrogen/Makefile	2015-06-08 19:11:50.154318687 +0930
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	hydrogen
> PORTVERSION=	0.9.6.1
>+PORTREVISION=	1
> CATEGORIES=	audio
> 
> MAINTAINER=	FreeBSD@ShaneWare.Biz
>@@ -48,10 +49,9 @@
> LASH_CMAKE_OFF=		-DWANT_LASH:BOOL=OFF
> LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
> 
>-PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON \
>-			-DPORTAUDIO_LIBRARIES:STRING=${LOCALBASE}/lib/portaudio2/libportaudio.so
>+PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
> PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
>-PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
>+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
> 
> PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO:BOOL=ON
> PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
>diff -Nru hydrogen.orig/files/patch-CMakeLists.txt hydrogen/files/patch-CMakeLists.txt
>--- hydrogen.orig/files/patch-CMakeLists.txt	2015-06-12 21:12:07.409964400 +0930
>+++ hydrogen/files/patch-CMakeLists.txt	2015-06-08 19:08:03.074333792 +0930
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2014-09-09 20:39:33.000000000 +0200
>-+++ CMakeLists.txt	2014-09-18 10:21:00.739505710 +0200
>-@@ -100,12 +100,12 @@
>+--- CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
>++++ CMakeLists.txt
>+@@ -100,12 +100,12 @@ ENDIF()
>  IF(APPLE)
>  	SET(CMAKE_CXX_FLAGS "-O2")
>  ELSE()
>@@ -16,15 +16,7 @@
>  
>  
>  IF(APPLE)
>-@@ -138,7 +138,6 @@
>-     ENDIF(APPLE)
>- ENDIF(WIN32)
>- 
>--
>- #
>- # HEADER LIBRARY FUNCTIONS
>- #
>-@@ -178,7 +177,11 @@
>+@@ -178,7 +178,11 @@ FIND_LADSPA(LADSPA ladspa.h noise)
>  IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
>  	FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
>  ELSE()
>@@ -37,7 +29,7 @@
>  ENDIF()
>  
>  FIND_HELPER(JACK jack jack/jack.h jack)
>-@@ -195,9 +198,9 @@
>+@@ -195,9 +199,9 @@ FIND_HELPER(PULSEAUDIO pulseaudio pulse/
>  FIND_HELPER(LASH lash-1.0 lash/lash.h lash)
>  FIND_HELPER(LRDF lrdf lrdf.h lrdf)
>  
>diff -Nru hydrogen.orig/files/patch-src__cli__CMakeLists.txt hydrogen/files/patch-src__cli__CMakeLists.txt
>--- hydrogen.orig/files/patch-src__cli__CMakeLists.txt	2015-06-12 21:12:07.399475587 +0930
>+++ hydrogen/files/patch-src__cli__CMakeLists.txt	2015-06-08 19:08:03.079333901 +0930
>@@ -1,6 +1,6 @@
>---- ./src/cli/CMakeLists.txt.orig	2014-06-19 06:38:04.000000000 +0930
>-+++ ./src/cli/CMakeLists.txt	2014-08-13 02:18:54.938462662 +0930
>-@@ -6,6 +6,7 @@
>+--- src/cli/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
>++++ src/cli/CMakeLists.txt
>+@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(
>      ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
>      ${QT_INCLUDES}
>      ${LASH_INCLUDE_DIR}
>diff -Nru hydrogen.orig/files/patch-src__core__src__IO__PortAudioDriver.h hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h
>--- hydrogen.orig/files/patch-src__core__src__IO__PortAudioDriver.h	2015-06-12 21:12:07.399475587 +0930
>+++ hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h	1970-01-01 09:30:00.000000000 +0930
>@@ -1,14 +0,0 @@
>---- src/core/src/IO/PortAudioDriver.h.orig	2014-09-09 18:39:33 UTC
>-+++ src/core/src/IO/PortAudioDriver.h
>-@@ -31,7 +31,11 @@
>- #ifdef H2CORE_HAVE_PORTAUDIO
>- 
>- #include <inttypes.h>
>-+#if defined(__FreeBSD__)
>-+#include <portaudio2/portaudio.h>
>-+#else
>- #include <portaudio.h>
>-+#endif
>- 
>- namespace H2Core
>- {
>diff -Nru hydrogen.orig/files/patch-src__gui__CMakeLists.txt hydrogen/files/patch-src__gui__CMakeLists.txt
>--- hydrogen.orig/files/patch-src__gui__CMakeLists.txt	2015-06-12 21:12:07.408964321 +0930
>+++ hydrogen/files/patch-src__gui__CMakeLists.txt	2015-06-08 19:08:03.084334190 +0930
>@@ -1,6 +1,6 @@
>---- ./src/gui/CMakeLists.txt.orig	2014-06-19 06:38:04.000000000 +0930
>-+++ ./src/gui/CMakeLists.txt	2014-08-13 02:18:55.069463221 +0930
>-@@ -22,6 +22,7 @@
>+--- src/gui/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
>++++ src/gui/CMakeLists.txt
>+@@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(
>      ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
>      ${LASH_INCLUDE_DIR}
>      ${QT_INCLUDES}
>diff -Nru hydrogen.orig/files/patch-src__player__CMakeLists.txt hydrogen/files/patch-src__player__CMakeLists.txt
>--- hydrogen.orig/files/patch-src__player__CMakeLists.txt	2015-06-12 21:12:07.390965258 +0930
>+++ hydrogen/files/patch-src__player__CMakeLists.txt	2015-06-08 19:08:03.089333876 +0930
>@@ -1,6 +1,6 @@
>---- ./src/player/CMakeLists.txt.orig	2014-06-19 06:38:04.000000000 +0930
>-+++ ./src/player/CMakeLists.txt	2014-08-13 02:18:55.093462388 +0930
>-@@ -4,6 +4,7 @@
>+--- src/player/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
>++++ src/player/CMakeLists.txt
>+@@ -4,6 +4,7 @@ FILE(GLOB_RECURSE h2player_SRCS *.cpp)
>  INCLUDE_DIRECTORIES(
>      ${CMAKE_SOURCE_DIR}/src/core/include        # core headers
>      ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
>diff -Nru hydrogen.orig/files/patch-src__synth__CMakeLists.txt hydrogen/files/patch-src__synth__CMakeLists.txt
>--- hydrogen.orig/files/patch-src__synth__CMakeLists.txt	2015-06-12 21:12:07.390965258 +0930
>+++ hydrogen/files/patch-src__synth__CMakeLists.txt	2015-06-08 19:08:03.094333394 +0930
>@@ -1,6 +1,6 @@
>---- ./src/synth/CMakeLists.txt.orig	2014-06-19 06:38:04.000000000 +0930
>-+++ ./src/synth/CMakeLists.txt	2014-08-13 02:18:55.095462906 +0930
>-@@ -4,6 +4,7 @@
>+--- src/synth/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
>++++ src/synth/CMakeLists.txt
>+@@ -4,6 +4,7 @@ FILE(GLOB_RECURSE h2synth_SRCS *.cpp)
>  INCLUDE_DIRECTORIES(
>      ${CMAKE_SOURCE_DIR}/src/core/include        # core headers
>      ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h

Actions: View | Diff

Attachments on bug 200820: 157682