<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114860] trunk/dports/multimedia/lmms</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114860">114860</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-17 21:27:32 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialmmsPortfile">trunk/dports/multimedia/lmms/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxCMakeListstxtdiff">trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxZynAddSubFxcppdiff">trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialmmsfilespatchqtincludediff">trunk/dports/multimedia/lmms/files/patch-qt-include.diff</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchzynaddsubfxCMakeListstxtdiff">trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimedialmmsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/lmms/Portfile (114859 => 114860)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,8 +5,11 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><ins>+# cmake/modules/DetectMachine.cmake tries to detect bitness
+PortGroup muniversal 1.0
+
</ins><span class="cx"> name lmms
</span><del>-version 0.4.13
</del><ins>+version 0.4.15
</ins><span class="cx"> categories multimedia
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -21,39 +24,29 @@
</span><span class="cx"> homepage http://lmms.sourceforge.net
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites sourceforge:project/lmms/lmms/${version}
</span><del>-#parallel build seems broken :(
</del><ins>+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 e2ddb1d68c45f72f933c76b2161d9f9aab638a0a \
- sha256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082
</del><ins>+checksums rmd160 d660769cda53e0d6ca15f2e578478e8f27dbb851 \
+ sha256 0104caaea8adf7b51b0fc4ff2ab26364d1da5751a8fcbf6772704c8ef57a020b
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:libsndfile \
</span><span class="cx"> port:libsdl \
</span><ins>+ port:portaudio \
</ins><span class="cx"> port:fftw-3-single \
</span><span class="cx"> port:fluidsynth \
</span><span class="cx"> port:jack \
</span><span class="cx"> path:lib/libfltk.dylib:fltk
</span><span class="cx">
</span><del>-patchfiles patch-qt-include.diff \
- patch-zynaddsubfx-CMakeLists.txt.diff
</del><ins>+patchfiles patch-plugins-zynaddsubfx-CMakeLists.txt.diff \
+ patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff
</ins><span class="cx">
</span><span class="cx"> configure.cflags-append -std=gnu89
</span><span class="cx">
</span><span class="cx"> # This project has buggy C++ code
</span><span class="cx"> compiler.blacklist *clang*
</span><span class="cx">
</span><del>-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"
- }
- }
-}
-
</del><span class="cx"> # Use bundled libsamplerate due to link problems with the external library
</span><span class="cx"> configure.args-append -DWANT_SYSTEM_SR=OFF
</span><span class="cx"> # Disable VST because it is not supported on OS X
</span><span class="lines">@@ -61,7 +54,6 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append -DWANT_ALSA=OFF \
</span><span class="cx"> -DWANT_PULSEAUDIO=OFF \
</span><del>- -DWANT_FFTW3F=ON \
</del><span class="cx"> -DWANT_SDL=ON \
</span><span class="cx"> -DWANT_OGGVORBIS=ON \
</span><span class="cx"> -DWANT_STK=OFF \
</span></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxCMakeListstxtdifffromrev114858trunkdportsmultimedialmmsfilespatchzynaddsubfxCMakeListstxtdiff"></a>
<div class="copfile"><h4>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) (0 => 114860)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+--- 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)
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxZynAddSubFxcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff (0 => 114860)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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>
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchqtincludediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/lmms/files/patch-qt-include.diff (114859 => 114860)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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>
</del></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchzynaddsubfxCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff (114859 => 114860)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>---- 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)
-
</del></span></pre>
</div>
</div>
</body>
</html>