cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Chase audio/portaudio2 removal and use audio/portaudio instead

Browse Source 
- Bump PORTREVISION

PR:		200820
Submitted by:	<FreeBSD@ShaneWare.Biz> (maintainer)
This commit is contained in:
Jason E. Hale 2015-06-17 13:40:04 +00:00
parent 942349dc56
commit 42ad3600de
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=389931
7 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/hydrogen/Makefile
View File

@ -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_ON= -DWANT_LASH:BOOL=ON
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

18
audio/hydrogen/files/patch-CMakeLists.txt
View File

@ -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)

6
audio/hydrogen/files/patch-src__cli__CMakeLists.txt
View File

@ -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}

14
audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h
View File

@ -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
{

6
audio/hydrogen/files/patch-src__gui__CMakeLists.txt
View File

@ -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}

6
audio/hydrogen/files/patch-src__player__CMakeLists.txt
View File

@ -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

6
audio/hydrogen/files/patch-src__synth__CMakeLists.txt
View File

@ -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