[114860] trunk/dports/multimedia/lmms
ryandesign at macports.org
ryandesign at macports.org
Tue Dec 17 21:27:32 PST 2013
Revision: 114860
https://trac.macports.org/changeset/114860
Author: ryandesign at macports.org
Date: 2013-12-17 21:27:32 -0800 (Tue, 17 Dec 2013)
Log Message:
-----------
lmms: update to 0.4.15; use muniversal portgroup because the cmake module detects bitness; add dependency on portaudio since it is checked for explicitly; fix build failure in ZynAddSubFx.cpp (#36426)
Modified Paths:
--------------
trunk/dports/multimedia/lmms/Portfile
Added Paths:
-----------
trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff
trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff
Removed Paths:
-------------
trunk/dports/multimedia/lmms/files/patch-qt-include.diff
trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff
Modified: trunk/dports/multimedia/lmms/Portfile
===================================================================
--- trunk/dports/multimedia/lmms/Portfile 2013-12-18 05:24:44 UTC (rev 114859)
+++ trunk/dports/multimedia/lmms/Portfile 2013-12-18 05:27:32 UTC (rev 114860)
@@ -5,8 +5,11 @@
PortGroup cmake 1.0
PortGroup qt4 1.0
+# cmake/modules/DetectMachine.cmake tries to detect bitness
+PortGroup muniversal 1.0
+
name lmms
-version 0.4.13
+version 0.4.15
categories multimedia
maintainers nomaintainer
license GPL-2+
@@ -21,39 +24,29 @@
homepage http://lmms.sourceforge.net
platforms darwin
master_sites sourceforge:project/lmms/lmms/${version}
-#parallel build seems broken :(
+
use_parallel_build no
use_bzip2 yes
-checksums rmd160 e2ddb1d68c45f72f933c76b2161d9f9aab638a0a \
- sha256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082
+checksums rmd160 d660769cda53e0d6ca15f2e578478e8f27dbb851 \
+ sha256 0104caaea8adf7b51b0fc4ff2ab26364d1da5751a8fcbf6772704c8ef57a020b
depends_lib-append port:libsndfile \
port:libsdl \
+ port:portaudio \
port:fftw-3-single \
port:fluidsynth \
port:jack \
path:lib/libfltk.dylib:fltk
-patchfiles patch-qt-include.diff \
- patch-zynaddsubfx-CMakeLists.txt.diff
+patchfiles patch-plugins-zynaddsubfx-CMakeLists.txt.diff \
+ patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff
configure.cflags-append -std=gnu89
# This project has buggy C++ code
compiler.blacklist *clang*
-platform darwin {
- if {${os.major} >= 13} {
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
# Use bundled libsamplerate due to link problems with the external library
configure.args-append -DWANT_SYSTEM_SR=OFF
# Disable VST because it is not supported on OS X
@@ -61,7 +54,6 @@
configure.args-append -DWANT_ALSA=OFF \
-DWANT_PULSEAUDIO=OFF \
- -DWANT_FFTW3F=ON \
-DWANT_SDL=ON \
-DWANT_OGGVORBIS=ON \
-DWANT_STK=OFF \
Copied: trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff (from rev 114858, trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff)
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff 2013-12-18 05:27:32 UTC (rev 114860)
@@ -0,0 +1,41 @@
+--- plugins/zynaddsubfx/CMakeLists.txt.orig 2013-06-11 15:57:16.000000000 -0500
++++ plugins/zynaddsubfx/CMakeLists.txt 2013-12-17 22:11:14.000000000 -0600
+@@ -21,6 +21,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc
+ )
+
++SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+
+ # definitions for ZynAddSubFX
+ IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+@@ -45,7 +46,7 @@
+ ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+ ENDIF(LMMS_BUILD_WIN32)
+
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
+
+ set(ZASF_CORE_LIBS
+ zynaddsubfx_input
+@@ -98,7 +99,7 @@
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
+ INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
+-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk)
+ ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
+
+ # link system libraries when on win32
+@@ -119,12 +120,3 @@
+ ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe)
+ ENDIF(LMMS_BUILD_WIN32)
+
+-# build FLTK
+-IF(LMMS_BUILD_WIN64)
+- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
+-ELSEIF(LMMS_BUILD_WIN32)
+- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
+-ENDIF(LMMS_BUILD_WIN64)
+-ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
+-
+-ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
Added: trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff 2013-12-18 05:27:32 UTC (rev 114860)
@@ -0,0 +1,11 @@
+--- plugins/zynaddsubfx/ZynAddSubFx.cpp.orig 2013-06-11 15:57:16.000000000 -0500
++++ plugins/zynaddsubfx/ZynAddSubFx.cpp 2013-12-17 23:02:50.000000000 -0600
+@@ -24,7 +24,7 @@
+
+ #include "lmmsconfig.h"
+
+-#include <Qt/QtXml>
++#include <QtXml>
+ #include <QtCore/QTemporaryFile>
+ #include <QtGui/QDropEvent>
+ #include <QtGui/QGridLayout>
Deleted: trunk/dports/multimedia/lmms/files/patch-qt-include.diff
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-qt-include.diff 2013-12-18 05:24:44 UTC (rev 114859)
+++ trunk/dports/multimedia/lmms/files/patch-qt-include.diff 2013-12-18 05:27:32 UTC (rev 114860)
@@ -1,11 +0,0 @@
---- include/RemotePlugin.h.orig 2010-09-08 01:05:14.000000000 +0200
-+++ include/RemotePlugin.h 2010-09-08 01:05:40.000000000 +0200
-@@ -51,7 +51,7 @@
- #include <process.h>
- #endif
-
--#include <Qt/qglobal.h>
-+#include <QtCore/qglobal.h>
-
- #if QT_VERSION >= 0x040400
- #include <QtCore/QSystemSemaphore>
Deleted: trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff 2013-12-18 05:24:44 UTC (rev 114859)
+++ trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff 2013-12-18 05:27:32 UTC (rev 114860)
@@ -1,53 +0,0 @@
---- plugins/zynaddsubfx/CMakeLists.txt.orig 2011-08-07 07:11:44.000000000 +0100
-+++ plugins/zynaddsubfx/CMakeLists.txt 2011-08-07 07:18:03.000000000 +0100
-@@ -24,6 +24,9 @@
- )
-
-
-+SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
-+
-+
- # definitions for ZynAddSubFX
- IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
- ADD_DEFINITIONS(-DOS_LINUX)
-@@ -47,7 +47,8 @@
- ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
- ENDIF(LMMS_BUILD_WIN32)
-
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
-+# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
-
- set(ZASF_CORE_LIBS
- zynaddsubfx_input
-@@ -100,7 +101,8 @@
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
- INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
--TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
-+#TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
-+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk)
- ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
-
- # link system libraries when on win32
-@@ -122,13 +124,13 @@
- ENDIF(LMMS_BUILD_WIN32)
-
- # build FLTK
--IF(LMMS_BUILD_WIN64)
-- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
--ELSEIF(LMMS_BUILD_WIN32)
-- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
--ENDIF(LMMS_BUILD_WIN64)
--ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
-+#IF(LMMS_BUILD_WIN64)
-+# SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
-+#ELSEIF(LMMS_BUILD_WIN32)
-+# SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
-+#ENDIF(LMMS_BUILD_WIN64)
-+#ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
-
--ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
-+#ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
- ENDIF(LMMS_HAVE_FFTW3F)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131217/be3ce7ac/attachment-0001.html>
More information about the macports-changes
mailing list