From 42ad3600de95fdd9e154d1077215e89149fff452 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Wed, 17 Jun 2015 13:40:04 +0000 Subject: - Chase audio/portaudio2 removal and use audio/portaudio instead - Bump PORTREVISION PR: 200820 Submitted by: (maintainer) --- audio/hydrogen/Makefile | 6 +++--- audio/hydrogen/files/patch-CMakeLists.txt | 18 +++++------------- audio/hydrogen/files/patch-src__cli__CMakeLists.txt | 6 +++--- .../files/patch-src__core__src__IO__PortAudioDriver.h | 14 -------------- audio/hydrogen/files/patch-src__gui__CMakeLists.txt | 6 +++--- audio/hydrogen/files/patch-src__player__CMakeLists.txt | 6 +++--- audio/hydrogen/files/patch-src__synth__CMakeLists.txt | 6 +++--- 7 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h (limited to 'audio/hydrogen') diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 3513815fefca..9bf6dcce93ac 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -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 diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt index f26249d5d913..3ac49392b401 100644 --- a/audio/hydrogen/files/patch-CMakeLists.txt +++ b/audio/hydrogen/files/patch-CMakeLists.txt @@ -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 --git a/audio/hydrogen/files/patch-src__cli__CMakeLists.txt b/audio/hydrogen/files/patch-src__cli__CMakeLists.txt index 00d47c81e3d5..2cbd8a839274 100644 --- a/audio/hydrogen/files/patch-src__cli__CMakeLists.txt +++ b/audio/hydrogen/files/patch-src__cli__CMakeLists.txt @@ -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 --git a/audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h b/audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h deleted file mode 100644 index 895d4f0e2f3c..000000000000 --- a/audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h +++ /dev/null @@ -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 -+#if defined(__FreeBSD__) -+#include -+#else - #include -+#endif - - namespace H2Core - { diff --git a/audio/hydrogen/files/patch-src__gui__CMakeLists.txt b/audio/hydrogen/files/patch-src__gui__CMakeLists.txt index d735a4ea4560..2a37c7edf4d3 100644 --- a/audio/hydrogen/files/patch-src__gui__CMakeLists.txt +++ b/audio/hydrogen/files/patch-src__gui__CMakeLists.txt @@ -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 --git a/audio/hydrogen/files/patch-src__player__CMakeLists.txt b/audio/hydrogen/files/patch-src__player__CMakeLists.txt index ce7e3a965fe6..56514f792210 100644 --- a/audio/hydrogen/files/patch-src__player__CMakeLists.txt +++ b/audio/hydrogen/files/patch-src__player__CMakeLists.txt @@ -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 --git a/audio/hydrogen/files/patch-src__synth__CMakeLists.txt b/audio/hydrogen/files/patch-src__synth__CMakeLists.txt index 15f6630593d1..afd0598b62c7 100644 --- a/audio/hydrogen/files/patch-src__synth__CMakeLists.txt +++ b/audio/hydrogen/files/patch-src__synth__CMakeLists.txt @@ -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 -- cgit v1.2.3