diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-05-30 20:39:12 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-05-30 20:39:12 +0000 |
| commit | 3fef6c52f0fc4ef44d16f7c2f73fab20c9c251e5 (patch) | |
| tree | c6487f309b5d29e868c4ea46df98e320c50df957 /audio/lmms | |
| parent | 0b206685de74445cde7f184f18a43c7ac16172a6 (diff) | |
Notes
Diffstat (limited to 'audio/lmms')
| -rw-r--r-- | audio/lmms/Makefile | 2 | ||||
| -rw-r--r-- | audio/lmms/files/patch-CMakeLists.txt | 9 | ||||
| -rw-r--r-- | audio/lmms/files/patch-include_AudioPortAudio.h | 11 | ||||
| -rw-r--r-- | audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h | 11 |
4 files changed, 1 insertions, 32 deletions
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index a85b67f35051..003ba382deb9 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -3,7 +3,7 @@ PORTNAME= lmms PORTVERSION= 0.4.15 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/lmms/files/patch-CMakeLists.txt b/audio/lmms/files/patch-CMakeLists.txt index e4117f0d99c4..9f050d84bbe5 100644 --- a/audio/lmms/files/patch-CMakeLists.txt +++ b/audio/lmms/files/patch-CMakeLists.txt @@ -9,15 +9,6 @@ #SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}") #SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}") -@@ -424,7 +424,7 @@ - ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) - - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) --LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) -+LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib/portaudio2 ${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) - LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES}) - - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz") @@ -462,7 +462,7 @@ ENDIF(NOT LMMS_BUILD_APPLE) diff --git a/audio/lmms/files/patch-include_AudioPortAudio.h b/audio/lmms/files/patch-include_AudioPortAudio.h deleted file mode 100644 index 50f7ab56dd68..000000000000 --- a/audio/lmms/files/patch-include_AudioPortAudio.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/AudioPortAudio.h.orig 2011-10-04 21:28:47.000000000 +0000 -+++ include/AudioPortAudio.h 2011-10-04 21:29:25.000000000 +0000 -@@ -45,7 +45,7 @@ - - #ifdef LMMS_HAVE_PORTAUDIO - --#include <portaudio.h> -+#include <portaudio2/portaudio.h> - - #include "AudioDevice.h" - diff --git a/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h b/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h deleted file mode 100644 index d95fa3827d9c..000000000000 --- a/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/zynaddsubfx/src/Output/PAaudiooutput.h.orig 2011-10-04 21:29:52.000000000 +0000 -+++ plugins/zynaddsubfx/src/Output/PAaudiooutput.h 2011-10-04 21:30:34.000000000 +0000 -@@ -22,7 +22,7 @@ - #ifndef PA_AUDIO_OUTPUT_H - #define PA_AUDIO_OUTPUT_H - --#include <portaudio.h> -+#include <portaudio2/portaudio.h> - - #include "../globals.h" - #include "../Misc/Master.h" |