svn commit: r367687 - in head/audio/hydrogen-devel: . files
Thomas Zander
riggs at FreeBSD.org
Mon Sep 8 19:41:58 UTC 2014
Author: riggs
Date: Mon Sep 8 19:41:56 2014
New Revision: 367687
URL: http://svnweb.freebsd.org/changeset/ports/367687
QAT: https://qat.redports.org/buildarchive/r367687/
Log:
- Bump PORTREVISION
- Simplify port makefile (mostly OPTIONS)
- Address build failures in certain situations
PR: 193065
Submitted by: FreeBSD at ShaneWare.Biz (maintainer)
Added:
head/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt (contents, props changed)
head/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt (contents, props changed)
head/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h (contents, props changed)
head/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt (contents, props changed)
head/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt (contents, props changed)
head/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt (contents, props changed)
Modified:
head/audio/hydrogen-devel/Makefile
head/audio/hydrogen-devel/files/patch-CMakeLists.txt
Modified: head/audio/hydrogen-devel/Makefile
==============================================================================
--- head/audio/hydrogen-devel/Makefile Mon Sep 8 19:35:47 2014 (r367686)
+++ head/audio/hydrogen-devel/Makefile Mon Sep 8 19:41:56 2014 (r367687)
@@ -3,6 +3,7 @@
PORTNAME= hydrogen-devel
PORTVERSION= 0.9.6r2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GH
@@ -27,88 +28,60 @@ MAJORVERSION= 0.9.6
USE_QT4= corelib gui qmake_build linguist_build moc_build network \
qt3support rcc_build sql uic_build xml
USES= cmake:outsource desktop-file-utils pkgconfig
-CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON
+CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON -DWANT_DEBUG:BOOL=OFF \
+ -DLIBSNDFILE_INCLUDE_DIR:STRING=${LOCALBASE}/include
USE_LDCONFIG= yes
-CXXFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= JACK ALSA PORTAUDIO OSS LIBARCHIVE LASH LADSPA RDF RUBBERBAND
+OPTIONS_DEFINE= ALSA JACK LADSPA LASH LIBARCHIVE OSS PORTAUDIO RDF RUBBERBAND
OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF
-LIBARCHIVE_DESC= LibArchive support
-RUBBERBAND_DESC= librubberband for time stretching
-RDF_DESC= RDF File support
+ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON
+ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS= alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
+
+JACK_CMAKE_ON= -DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
+JACK_CMAKE_OFF= -DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
+
+LADSPA_CMAKE_ON= -DWANT_LADSPA:BOOL=ON \
+ -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
+LADSPA_CMAKE_OFF= -DWANT_LADSPA:BOOL=OFF
+LADSPA_BUILD_DEPENDS= ladspa>=0:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS= analyseplugin:${PORTSDIR}/audio/ladspa
+
+LASH_CMAKE_ON= -DWANT_LASH:BOOL=ON \
+ -DLASH_INCLUDE_DIR:STRING=${LOCALBASE}/include/lash-1.0
+LASH_CMAKE_OFF= -DWANT_LASH:BOOL=OFF
+LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash
-.include <bsd.port.options.mk>
+LIBARCHIVE_DESC= LibArchive support
+LIBARCHIVE_CMAKE_ON= -DWANT_LIBARCHIVE:BOOL=ON
+LIBARCHIVE_CMAKE_OFF= -DWANT_LIBARCHIVE:BOOL=OFF
+LIBARCHIVE_LIB_DEPENDS= libarchive.so:${PORTSDIR}/archivers/libarchive
+
+OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON
+OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF
+
+PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON \
+ -DPORTAUDIO_INCLUDE_DIR:STRING=${LOCALBASE}/include/portaudio2 \
+ -DPORTAUDIO_LIBRARIES:STRING=${LOCALBASE}/lib/portaudio2/libportaudio.so
+PORTAUDIO_CMAKE_OFF= -DWANT_PORTAUDIO:BOOL=OFF
+PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+= alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
-CMAKE_ARGS+= -DWANT_ALSA:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_ALSA:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack
-CMAKE_ARGS+= -DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLADSPA}
-BUILD_DEPENDS+= ladspa>=0:${PORTSDIR}/audio/ladspa
-RUN_DEPENDS+= analyseplugin:${PORTSDIR}/audio/ladspa
-CMAKE_ARGS+= -DWANT_LADSPA:BOOL=ON
-CMAKE_ARGS+= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
-.else
-CMAKE_ARGS+= -DWANT_LADSPA:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLASH}
-LIB_DEPENDS+= liblash.so:${PORTSDIR}/audio/lash
-CMAKE_ARGS+= -DWANT_LASH:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_LASH:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLIBARCHIVE}
-LIB_DEPENDS+= libarchive.so:${PORTSDIR}/archivers/libarchive
-CMAKE_ARGS+= -DWANT_LIBARCHIVE:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_LIBARCHIVE:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MOSS}
-CMAKE_ARGS+= -DWANT_OSS:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_OSS:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+= libportaudio.so.2:${PORTSDIR}/audio/portaudio2
-CMAKE_ARGS+= -DWANT_PORTAUDIO:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_PORTAUDIO:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MRDF}
-LIB_DEPENDS+= liblrdf.so:${PORTSDIR}/textproc/liblrdf
-CFLAGS+= -I${LOCALBASE}/include/raptor2
-CXXFLAGS+= -I${LOCALBASE}/include/raptor2
-CMAKE_ARGS+= -DWANT_LRDF:BOOL=ON
-.else
-CMAKE_ARGS+= -DWANT_LRDF:BOOL=OFF
-.endif
+RDF_DESC= RDF File support
+RDF_CMAKE_ON= -DWANT_LRDF:BOOL=ON
+RDF_CMAKE_OFF= -DWANT_LRDF:BOOL=OFF
+RDF_LIB_DEPENDS= liblrdf.so:${PORTSDIR}/textproc/liblrdf
+RDF_CXXFLAGS= -I${LOCALBASE}/include/raptor2
# using librubberband is experimental and current versions have bad timing
# installing the rubberband cli tool still works as before
-.if ${PORT_OPTIONS:MRUBBERBAND}
-LIB_DEPENDS+= librubberband.so:${PORTSDIR}/audio/rubberband
-CMAKE_ARGS+= -DWANT_RUBBERBAND:BOOL=ON
-CMAKE_ARGS+= -DRUBBERBAND_INCLUDE_DIR:STRING=${LOCALBASE}/include/rubberband
-.else
-CMAKE_ARGS+= -DWANT_RUBBERBAND:BOOL=OFF
-.endif
+RUBBERBAND_DESC= librubberband for time stretching
+RUBBERBAND_CMAKE_ON= -DWANT_RUBBERBAND:BOOL=ON \
+ -DRUBBERBAND_INCLUDE_DIR:STRING=${LOCALBASE}/include/rubberband
+RUBBERBAND_CMAKE_OFF= -DWANT_RUBBERBAND:BOOL=OFF
+RUBBERBAND_LIB_DEPENDS= librubberband.so:${PORTSDIR}/audio/rubberband
.include <bsd.port.mk>
Modified: head/audio/hydrogen-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/audio/hydrogen-devel/files/patch-CMakeLists.txt Mon Sep 8 19:35:47 2014 (r367686)
+++ head/audio/hydrogen-devel/files/patch-CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -1,25 +1,21 @@
--- ./CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
-+++ ./CMakeLists.txt 2014-06-21 03:49:38.036536435 +0930
-@@ -21,8 +21,12 @@
++++ ./CMakeLists.txt 2014-08-13 02:18:54.653463918 +0930
+@@ -21,8 +21,7 @@
SET(VERSION_PATCH "6")
SET(VERSION_SUFFIX "RC2")
-#SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+-
+SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-+IF(LOCALBASE)
-+LINK_DIRECTORIES("${LOCALBASE}/lib")
-+INCLUDE_DIRECTORIES("${LOCALBASE}/include")
-+ENDIF(LOCALBASE)
-
IF(VERSION_SUFFIX)
SET(DISPLAY_VERSION "${VERSION}-${VERSION_SUFFIX}")
-@@ -93,12 +97,12 @@
+@@ -93,12 +92,12 @@
IF(APPLE)
SET(CMAKE_CXX_FLAGS "-O2")
ELSE()
- SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines")
-+ SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines ${CMAKE_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
ENDIF()
-SET(CMAKE_CXX_FLAGS_RELEASE "")
@@ -30,7 +26,7 @@
IF(APPLE)
-@@ -114,9 +118,9 @@
+@@ -114,9 +113,9 @@
MANDATORY_PKG(LIBSNDFILE)
# TODO remove data from path
@@ -42,7 +38,7 @@
IF(WIN32)
SET(WANT_JACK FALSE)
SET(Threads_PATH "C:/Program Files/GnuWin32")
-@@ -167,7 +171,7 @@
+@@ -167,7 +166,7 @@
FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
FIND_LADSPA(LADSPA ladspa.h noise)
Added: head/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,10 @@
+--- ./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 @@
+ ${CMAKE_BINARY_DIR}/src/core/include # generated config.h
+ ${QT_INCLUDES}
+ ${LASH_INCLUDE_DIR}
++ ${CMAKE_INSTALL_PREFIX}/include
+ )
+
+ ADD_EXECUTABLE(h2cli WIN32 MACOSX_BUNDLE ${h2cli_SRCS} )
Added: head/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,18 @@
+--- ./src/core/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/core/CMakeLists.txt 2014-08-13 02:21:24.615462875 +0930
+@@ -9,6 +9,7 @@
+ INCLUDE_DIRECTORIES( include
+ ${CMAKE_SOURCE_DIR}/include # regular headers
+ ${CMAKE_CURRENT_BINARY_DIR}/include # generated config.h
++ ${PORTAUDIO_INCLUDE_DIR}
+ ${QT_INCLUDES}
+ ${LIBTAR_INCLUDE_DIR}
+ ${LIBARCHIVE_INCLUDE_DIR}
+@@ -16,7 +17,6 @@
+ ${ALSA_INCLUDE_DIR}
+ ${OSS_INCLUDE_DIR}
+ ${JACK_INCLUDE_DIR}
+- ${PORTAUDIO_INCLUDE_DIR}
+ ${PORTMIDI_INCLUDE_DIR}
+ ${COREAUDIO_INCLUDE_DIR}
+ ${COREMIDI_INCLUDE_DIR}
Added: head/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,11 @@
+--- ./src/core/include/hydrogen/LashClient.h.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/core/include/hydrogen/LashClient.h 2014-08-13 02:18:54.984463002 +0930
+@@ -27,7 +27,7 @@
+ #ifndef LASH_CLIENT
+ #define LASH_CLIENT
+
+-#include <lash-1.0/lash/lash.h>
++#include <lash/lash.h>
+
+ #include <string>
+ #include <cassert>
Added: head/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,10 @@
+--- ./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 @@
+ ${CMAKE_BINARY_DIR}/src/core/include # generated config.h
+ ${LASH_INCLUDE_DIR}
+ ${QT_INCLUDES}
++ ${LIBSNDFILE_INCLUDE_DIR}
+ )
+
+ IF(APPLE)
Added: head/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,10 @@
+--- ./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 @@
+ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/core/include # core headers
+ ${CMAKE_BINARY_DIR}/src/core/include # generated config.h
++ ${LIBSNDFILE_INCLUDE_DIR}
+ ${QT_INCLUDES}
+ )
+
Added: head/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt Mon Sep 8 19:41:56 2014 (r367687)
@@ -0,0 +1,10 @@
+--- ./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 @@
+ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/core/include # core headers
+ ${CMAKE_BINARY_DIR}/src/core/include # generated config.h
++ ${LIBSNDFILE_INCLUDE_DIR}
+ ${QT_INCLUDES}
+ )
+
More information about the svn-ports-head
mailing list