<!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>[135968] 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/135968">135968</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-08 04:08:58 -0700 (Fri, 08 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>lmms: update to 1.1.3</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="#trunkdportsmultimedialmmsfilespatchCMakeListstxtdiff">trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchdatalmmsplistindiff">trunk/dports/multimedia/lmms/files/patch-data-lmms.plist.in.diff</a></li>
<li><a href="#trunkdportsmultimedialmmsfilespatchdatascriptscreate_apple_bundleshindiff">trunk/dports/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.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 (135967 => 135968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/Portfile 2015-05-08 10:44:15 UTC (rev 135967)
+++ trunk/dports/multimedia/lmms/Portfile 2015-05-08 11:08:58 UTC (rev 135968)
</span><span class="lines">@@ -2,16 +2,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup app 1.0
</del><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><del>-# cmake/modules/DetectMachine.cmake tries to detect bitness
-PortGroup muniversal 1.0
-
-name lmms
-version 1.0.1
-revision 1
</del><ins>+github.setup LMMS lmms 1.1.3 v
</ins><span class="cx"> categories multimedia
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -23,17 +18,16 @@
</span><span class="cx"> You can have fun with your MIDI-keyboard and much more, all in a user-friendly and \
</span><span class="cx"> modern interface.
</span><span class="cx">
</span><del>-homepage http://lmms.sourceforge.net
</del><ins>+homepage https://lmms.io/
</ins><span class="cx"> platforms darwin
</span><del>-master_sites sourceforge:project/lmms/lmms/${version}
-use_bzip2 yes
-distfiles ${name}-${version}-src${extract.suffix}
</del><span class="cx">
</span><span class="cx"> # https://sourceforge.net/p/lmms/bugs/571/
</span><ins>+# This issue tracker has disappeared but this issue still occurs.
+# A new issue tracker has been set up at github.
</ins><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-checksums rmd160 d9f3234ef9f9c9f1918beda1d9bc78d090c9796d \
- sha256 8d87b2e1195be6c3125801d80f711d83121dd359be9bd3c71f978be2f8d900b5
</del><ins>+checksums rmd160 6af06a2bb277d41c4ee8a3bdc85fc30c171cd6c3 \
+ sha256 c8611be5c259f49cdcaac583bdf9bdd2ffc1f843cd8233ab5bb63c5a720f4910
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:fftw-3-single \
</span><span class="cx"> path:lib/libfltk.dylib:fltk \
</span><span class="lines">@@ -46,28 +40,59 @@
</span><span class="cx"> port:libvorbis \
</span><span class="cx"> port:portaudio \
</span><span class="cx"> port:pulseaudio \
</span><ins>+ port:stk \
+ port:xorg-libX11 \
</ins><span class="cx"> port:xorg-libXext
</span><span class="cx">
</span><del>-patchfiles patch-plugins-zynaddsubfx-CMakeLists.txt.diff
</del><ins>+patchfiles patch-CMakeLists.txt.diff \
+ patch-data-lmms.plist.in.diff \
+ patch-data-scripts-create_apple_bundle.sh.in.diff
</ins><span class="cx">
</span><del>-# https://sourceforge.net/p/lmms/bugs/487/
-configure.cflags-append -std=gnu89
</del><ins>+post-patch {
+ reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
+ reinplace "s|@DESTROOT@|${destroot}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
+}
</ins><span class="cx">
</span><del>-# This project has buggy C++ code
-compiler.blacklist *clang*
</del><ins>+cmake.out_of_source yes
</ins><span class="cx">
</span><del>-configure.args-append -DWANT_ALSA=OFF \
</del><ins>+# The build system uses CMAKE_INSTALL_PREFIX in a nonstandard way, both by
+# writing the Info.plist into it during configure and by attempting to copy
+# all items contained in it into the application bundle during destroot. So
+# it must be set to an empty writable directory.
+set target_path ${workpath}/target
+pre-configure {
+ file mkdir ${target_path}
+}
+configure.pre_args -DCMAKE_INSTALL_PREFIX=${target_path}
+
+configure.args-append -DFLTK_FLUID_EXECUTABLE=${prefix}/bin/fluid \
+ -DSTK_INCLUDE_DIR=${prefix}/include/stk \
+ -DWANT_ALSA=OFF \
</ins><span class="cx"> -DWANT_JACK=ON \
</span><span class="cx"> -DWANT_OGGVORBIS=ON \
</span><span class="cx"> -DWANT_PORTAUDIO=ON \
</span><span class="cx"> -DWANT_PULSEAUDIO=ON \
</span><span class="cx"> -DWANT_SDL=ON \
</span><del>- -DWANT_STK=OFF \
</del><ins>+ -DWANT_STK=ON \
</ins><span class="cx"> -DWANT_VST=OFF
</span><span class="cx">
</span><del>-app.name LMMS
-app.icon ${worksrcpath}/data/lmms.png
</del><ins>+configure.args-replace -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/LMMS.app/Contents/Frameworks
</ins><span class="cx">
</span><del>-platform darwin 8 {
- configure.ldflags-append -lpng -lz
</del><ins>+# The build system only partly honors DESTDIR, such that the destroot fails
+# if it is set, and since we've already patched the build system to stage
+# into the destroot, we can just unset it. MacPorts base sets DESTDIR in
+# destroot.destdir, while the qt4 portgroup sets it as an environment variable.
+destroot.destdir
+destroot.env-delete DESTDIR=${destroot}
+
+post-destroot {
+ ln -s ${applications_dir}/LMMS.app/Contents/MacOS/lmms ${destroot}${prefix}/bin/
+ ln -s ${applications_dir}/LMMS.app/Contents/share/man/man1/lmms.1.gz ${destroot}${prefix}/share/man/man1/
</ins><span class="cx"> }
</span><ins>+
+# cmake/modules/DetectMachine.cmake tries to detect bitness but because the
+# build system does not destroot entirely within the destdir, using the
+# muniversal portgroup will be complicated.
+#PortGroup muniversal 1.0
+universal_variant no
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt.diff (0 => 135968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-CMakeLists.txt.diff 2015-05-08 11:08:58 UTC (rev 135968)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- CMakeLists.txt.orig 2015-03-07 20:47:14.000000000 -0600
++++ CMakeLists.txt 2015-05-07 00:33:18.000000000 -0500
+@@ -52,8 +52,6 @@
+ SET(WANT_VST OFF)
+ SET(STATUS_ALSA "<not supported on this platform>")
+ SET(STATUS_PULSEAUDIO "<not supported on this platform>")
+- # MacPorts: /opt/local/lib
+- LINK_DIRECTORIES(${LINK_DIRECTORIES} /opt/local/lib)
+ ENDIF(LMMS_BUILD_APPLE)
+
+
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchdatalmmsplistindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-data-lmms.plist.in.diff (0 => 135968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-data-lmms.plist.in.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-data-lmms.plist.in.diff 2015-05-08 11:08:58 UTC (rev 135968)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- data/lmms.plist.in.orig 2015-03-07 20:47:14.000000000 -0600
++++ data/lmms.plist.in 2015-05-08 05:17:58.000000000 -0500
+@@ -13,7 +13,7 @@
+ <string>APPL</string>
+
+ <key>CFBundleGetInfoString</key>
+- <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ @MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
++ <string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
+
+ <!--
+ #############################################################
</ins></span></pre></div>
<a id="trunkdportsmultimedialmmsfilespatchdatascriptscreate_apple_bundleshindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff (0 => 135968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff 2015-05-08 11:08:58 UTC (rev 135968)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+--- data/scripts/create_apple_bundle.sh.in.orig 2015-03-07 20:47:14.000000000 -0600
++++ data/scripts/create_apple_bundle.sh.in 2015-05-08 04:49:50.000000000 -0500
+@@ -11,7 +11,7 @@
+ #=========================================================================================
+
+ # MacPorts Location
+-MACPORTS=/opt/local
++MACPORTS=@PREFIX@
+
+ # LMMS project root directory (extracted source)
+ CMAKE_SRC=@CMAKE_SOURCE_DIR@
+@@ -23,10 +23,10 @@
+ CMAKE_BUILD=$(cd @CMAKE_CURRENT_BINARY_DIR@/../..; pwd)
+
+ # STK rawwaves directory
+-STK_RAWWAVE=${HOME}/stk-*/rawwaves
++STK_RAWWAVE=@PREFIX@/share/stk/rawwaves
+
+ # Place to create ".app" bundle
+-APP=${HOME}/Desktop/LMMS.app
++APP=@DESTROOT@@APPLICATIONS_DIR@/LMMS.app
+
+ # MacPorts installs libreadline with wrong permissions
+ LIBREADLINE=${MACPORTS}/lib/libreadline.6.2.dylib
+@@ -63,9 +63,9 @@
+ mkdir ${APP}/Contents
+ cp -R * ${APP}/Contents
+
+-# Manually copy STK rawwaves
+-mkdir -p ${APP}/Contents/share/stk/rawwaves
+-cp ${STK_RAWWAVE}/*.raw ${APP}/Contents/share/stk/rawwaves
++# Symlink STK rawwaves
++mkdir -p ${APP}/Contents/share/stk
++ln -s ${STK_RAWWAVE} ${APP}/Contents/share/stk/rawwaves
+
+ # Make all libraries writable for macdeployqt
+ cd ${APP}
+@@ -107,11 +107,10 @@
+ _executables="${_executables} -executable=${APP}/Contents/MacOS/RemoteZynAddSubFx"
+ _executables="${_executables} -executable=${APP}/Contents/Frameworks/libZynAddSubFxCore.dylib"
+
+-# Build our App Package using "macdeployqt"
+-macdeployqt ${APP} $_executables
+-
+ # OS X Specific Artwork
++mkdir -p ${APP}/Contents/Resources
+ cp ${CMAKE_SRC}/data/*.icns ${APP}/Contents/Resources/
++exit
+
+ # Done. Ready to build DMG
+ echo -e "\nFinished.\n\nYou may run LMMS from the Desktop."
</ins></span></pre>
</div>
</div>
</body>
</html>