<!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>[118213] 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/118213">118213</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-03-25 15:18:13 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lmms: update to 1.0.0; add dependencies; use app portgroup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialmmsPortfile">trunk/dports/multimedia/lmms/Portfile</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxCMakeListstxtdiff">trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialmmsfilespatchCMakeListstxt">trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchpluginsLadspaEffectcalfCMakeListstxtdiff">trunk/dports/multimedia/lmms/files/patch-plugins-LadspaEffect-calf-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchpluginsdynamics_processordynamics_processorcppdiff">trunk/dports/multimedia/lmms/files/patch-plugins-dynamics_processor-dynamics_processor.cpp.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 (118212 => 118213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/Portfile 2014-03-25 22:12:02 UTC (rev 118212)
+++ trunk/dports/multimedia/lmms/Portfile 2014-03-25 22:18:13 UTC (rev 118213)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup app 1.0
</ins><span class="cx"> PortGroup cmake 1.0
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="lines">@@ -9,7 +10,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name lmms
</span><del>-version 0.4.15
</del><ins>+version 1.0.0
</ins><span class="cx"> categories multimedia
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -24,23 +25,32 @@
</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><ins>+use_bzip2 yes
+distfiles ${name}-${version}-src${extract.suffix}
</ins><span class="cx">
</span><span class="cx"> # https://sourceforge.net/p/lmms/bugs/571/
</span><span class="cx"> use_parallel_build no
</span><del>-use_bzip2 yes
</del><span class="cx">
</span><del>-checksums rmd160 d660769cda53e0d6ca15f2e578478e8f27dbb851 \
- sha256 0104caaea8adf7b51b0fc4ff2ab26364d1da5751a8fcbf6772704c8ef57a020b
</del><ins>+checksums rmd160 4cee3b94ad70f297067b0572424a350e6f2a85fc \
+ sha256 4949cac86ef311165bf75bc66ce3862e26c72d313809d924c932741d2421e7b5
</ins><span class="cx">
</span><del>-depends_lib-append port:libsndfile \
</del><ins>+depends_lib-append port:fftw-3-single \
+ path:lib/libfltk.dylib:fltk \
+ port:fluidsynth \
+ port:jack \
+ port:libogg \
+ port:libsamplerate \
</ins><span class="cx"> port:libsdl \
</span><ins>+ port:libsndfile \
+ port:libvorbis \
</ins><span class="cx"> port:portaudio \
</span><del>- port:fftw-3-single \
- port:fluidsynth \
- port:jack \
- path:lib/libfltk.dylib:fltk
</del><ins>+ port:pulseaudio \
+ port:xorg-libXext
</ins><span class="cx">
</span><del>-patchfiles patch-plugins-zynaddsubfx-CMakeLists.txt.diff \
</del><ins>+patchfiles patch-CMakeLists.txt \
+ patch-plugins-dynamics_processor-dynamics_processor.cpp.diff \
+ patch-plugins-LadspaEffect-calf-CMakeLists.txt.diff \
+ patch-plugins-zynaddsubfx-CMakeLists.txt.diff \
</ins><span class="cx"> patch-plugins-zynaddsubfx-ZynAddSubFx.cpp.diff
</span><span class="cx">
</span><span class="cx"> # https://sourceforge.net/p/lmms/bugs/487/
</span><span class="lines">@@ -49,17 +59,17 @@
</span><span class="cx"> # This project has buggy C++ code
</span><span class="cx"> compiler.blacklist *clang*
</span><span class="cx">
</span><del>-# 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
-configure.args-append -DWANT_VST=OFF
</del><ins>+configure.args-append -DWANT_ALSA=OFF \
+ -DWANT_JACK=ON \
+ -DWANT_OGGVORBIS=ON \
+ -DWANT_PORTAUDIO=ON \
+ -DWANT_PULSEAUDIO=ON \
+ -DWANT_SDL=ON \
+ -DWANT_STK=OFF \
+ -DWANT_VST=OFF
</ins><span class="cx">
</span><del>-configure.args-append -DWANT_ALSA=OFF \
- -DWANT_PULSEAUDIO=OFF \
- -DWANT_SDL=ON \
- -DWANT_OGGVORBIS=ON \
- -DWANT_STK=OFF \
- -DWANT_JACK=ON
</del><ins>+app.name LMMS
+app.icon ${worksrcpath}/data/lmms.png
</ins><span class="cx">
</span><span class="cx"> platform darwin 8 {
</span><span class="cx"> configure.ldflags-append -lpng -lz
</span></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchCMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt (0 => 118213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt 2014-03-25 22:18:13 UTC (rev 118213)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- CMakeLists.txt.orig 2014-03-23 18:00:39.000000000 -0500
++++ CMakeLists.txt 2014-03-25 15:55:22.000000000 -0500
+@@ -307,7 +307,7 @@
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
+
+ # set compiler flags
+-SET(WERROR_FLAGS "-Wall -Werror -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
++SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
+ SET(CMAKE_C_FLAGS "-O2 -g ${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
+ SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
</ins><span class="cx">Property changes on: trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkdportsmultimedialmmsfilespatchpluginsLadspaEffectcalfCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-plugins-LadspaEffect-calf-CMakeLists.txt.diff (0 => 118213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-plugins-LadspaEffect-calf-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-plugins-LadspaEffect-calf-CMakeLists.txt.diff 2014-03-25 22:18:13 UTC (rev 118213)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- plugins/LadspaEffect/calf/CMakeLists.txt.orig 2014-03-23 18:00:39.000000000 -0500
++++ plugins/LadspaEffect/calf/CMakeLists.txt 2014-03-25 16:36:57.000000000 -0500
+@@ -10,7 +10,11 @@
+ IF(NOT LMMS_BUILD_APPLE)
+ SET(INLINE_FLAGS "-finline-functions-called-once")
+ ENDIF(NOT LMMS_BUILD_APPLE)
+-SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -finline-functions ${INLINE_FLAGS}")
++SET(INLINE_FLAGS2 "")
++if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++SET(INLINE_FLAGS2 "-finline-limit=80")
++ENDIF(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 ${INLINE_FLAGS2} -finline-functions ${INLINE_FLAGS}")
+
+ IF(LMMS_BUILD_WIN32)
+ ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/calf.dll\"")
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchpluginsdynamics_processordynamics_processorcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-plugins-dynamics_processor-dynamics_processor.cpp.diff (0 => 118213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-plugins-dynamics_processor-dynamics_processor.cpp.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-plugins-dynamics_processor-dynamics_processor.cpp.diff 2014-03-25 22:18:13 UTC (rev 118213)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- plugins/dynamics_processor/dynamics_processor.cpp.orig 2014-03-23 18:00:39.000000000 -0500
++++ plugins/dynamics_processor/dynamics_processor.cpp 2014-03-25 16:03:36.000000000 -0500
+@@ -28,7 +28,7 @@
+ #include <math.h>
+ #include "embed.cpp"
+
+-#ifdef LMMS_BUILD_WIN32
++#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
+ #ifndef isnanf
+ #define isnanf(x) isnan(x)
+ #endif
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchpluginszynaddsubfxCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff (118212 => 118213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff 2014-03-25 22:12:02 UTC (rev 118212)
+++ trunk/dports/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff 2014-03-25 22:18:13 UTC (rev 118213)
</span><span class="lines">@@ -1,41 +1,10 @@
</span><del>---- 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
</del><ins>+--- plugins/zynaddsubfx/CMakeLists.txt.orig 2014-03-23 18:00:39.000000000 -0500
++++ plugins/zynaddsubfx/CMakeLists.txt 2014-03-25 15:46:36.000000000 -0500
</ins><span class="cx"> @@ -21,6 +21,7 @@
</span><del>- ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc
</del><ins>+ "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> +SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
</span><span class="cx">
</span><span class="cx"> # definitions for ZynAddSubFX
</span><span class="cx"> IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
</span><del>-@@ -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)
</del></span></pre>
</div>
</div>
</body>
</html>