<!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>[121873] trunk/dports/print/denemo</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/121873">121873</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-09 16:16:13 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>denemo: update to version 1.1.6, now builds with aubio 0.4 (#42524).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsprintdenemoPortfile">trunk/dports/print/denemo/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsprintdenemofilesautogensh">trunk/dports/print/denemo/files/autogen.sh</a></li>
<li><a href="#trunkdportsprintdenemofilespatchconfigureacdiff">trunk/dports/print/denemo/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsprintdenemofilespatchsrcaudiopitchrecogcdiff">trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsprintdenemofilespatchconfigurediff">trunk/dports/print/denemo/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsprintdenemofilespatchsrcprefopscdiff">trunk/dports/print/denemo/files/patch-src-prefops.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsprintdenemoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/print/denemo/Portfile (121872 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/Portfile 2014-07-09 23:10:05 UTC (rev 121872)
+++ trunk/dports/print/denemo/Portfile 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name denemo
</span><del>-version 1.1.0
</del><ins>+version 1.1.6
</ins><span class="cx"> categories print audio x11
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -22,17 +22,21 @@
</span><span class="cx"> homepage http://www.denemo.org/
</span><span class="cx"> master_sites gnu
</span><span class="cx">
</span><del>-checksums rmd160 ce8fe79ac52e89c38a33dd8bc486bf7d5c1d7eb2 \
- sha256 9bdb1d587604de9ed78c73060c13a1dba656f691fd4b0bcc8faf4a6a64084b14
</del><ins>+checksums rmd160 e09c952116fb960555c63bf9e38e16f0703642f6 \
+ sha256 929ceab1c9e7a83cbaf122bfa37b8497128f786043158d7e44af94c288569363
</ins><span class="cx">
</span><span class="cx"> depends_build port:intltool \
</span><del>- port:pkgconfig
</del><ins>+ port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:aubio \
</span><span class="cx"> port:evince \
</span><span class="cx"> port:fluidsynth \
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:gtksourceview3 \
</span><ins>+ port:gtk3 \
</ins><span class="cx"> port:guile \
</span><span class="cx"> port:jack \
</span><span class="cx"> port:librsvg \
</span><span class="lines">@@ -42,9 +46,18 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:qtplay
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-src-prefops.c.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-src-audio-pitchrecog.c.diff
</ins><span class="cx">
</span><ins>+# use upstream autogen.sh to reconfigure with our intltool.m4
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+ reinplace "s|/usr/|${prefix}/|" ${worksrcpath}/autogen.sh
+}
+
+configure.cmd ./autogen.sh && ./configure
+
</ins><span class="cx"> configure.args --enable-evince \
</span><span class="cx"> --enable-fluidsynth \
</span><span class="cx"> --enable-gtk3 \
</span><span class="lines">@@ -54,8 +67,6 @@
</span><span class="cx"> --enable-portmidi \
</span><span class="cx"> --enable-rubberband
</span><span class="cx">
</span><del>-use_parallel_build yes
-
</del><span class="cx"> variant csound description "Csound can be used for playback." {
</span><span class="cx"> depends_run-append port:csound
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsprintdenemofilesautogensh"></a>
<div class="addfile"><h4>Added: trunk/dports/print/denemo/files/autogen.sh (0 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/files/autogen.sh (rev 0)
+++ trunk/dports/print/denemo/files/autogen.sh 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+#!/bin/sh
+aclocal $ACLOCAL_FLAGS -I build -I /usr/share/aclocal && \
+autoheader && \
+glibtoolize --force && \
+intltoolize --copy --force --automake && \
+automake --add-missing --gnu && \
+autoconf
</ins></span></pre></div>
<a id="trunkdportsprintdenemofilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/print/denemo/files/patch-configure.ac.diff (0 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/print/denemo/files/patch-configure.ac.diff 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- configure.ac.orig 2014-04-21 05:29:06.000000000 -0700
++++ configure.ac 2014-05-01 23:40:53.000000000 -0700
+@@ -20,7 +20,6 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+ [The domain to use with gettext])
+-AM_GLIB_GNU_GETTEXT
+ LOCALEDIR=[${datadir}/locale]
+ AC_SUBST(LOCALEDIR)
+
</ins></span></pre></div>
<a id="trunkdportsprintdenemofilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/print/denemo/files/patch-configure.diff (121872 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/files/patch-configure.diff 2014-07-09 23:10:05 UTC (rev 121872)
+++ trunk/dports/print/denemo/files/patch-configure.diff 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-Fix "ld: library not found for -lporttime"
-https://savannah.gnu.org/bugs/index.php?40878
---- configure.orig 2013-11-25 09:12:27.000000000 -0600
-+++ configure 2013-12-11 15:28:03.000000000 -0600
-@@ -22080,7 +22080,7 @@
-
-
- CFLAGS="$CFLAGS -D_HAVE_PORTMIDI_"
-- LIBS="$LIBS -lportmidi -lporttime"
-+ LIBS="$LIBS -lportmidi"
-
- ac_fn_c_check_header_mongrel "$LINENO" "porttime.h" "ac_cv_header_porttime_h" "$ac_includes_default"
- if test "x$ac_cv_header_porttime_h" = xyes; then :
</del></span></pre></div>
<a id="trunkdportsprintdenemofilespatchsrcaudiopitchrecogcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff (0 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff (rev 0)
+++ trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- src/audio/pitchrecog.c.orig 2014-05-02 00:11:40.000000000 -0700
++++ src/audio/pitchrecog.c 2014-05-02 00:12:02.000000000 -0700
+@@ -440,7 +440,7 @@
+ #include <math.h>
+ #define AUBIO_UNSTABLE 1
+ #include <aubio/aubio.h>
+-#include <audio.h>
++#include "audio.h"
+ #include <glib.h>
+ #include "audio/pitchrecog.h"
+
</ins></span></pre></div>
<a id="trunkdportsprintdenemofilespatchsrcprefopscdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/print/denemo/files/patch-src-prefops.c.diff (121872 => 121873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/denemo/files/patch-src-prefops.c.diff 2014-07-09 23:10:05 UTC (rev 121872)
+++ trunk/dports/print/denemo/files/patch-src-prefops.c.diff 2014-07-09 23:16:13 UTC (rev 121873)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>---- src/prefops.c.orig 2013-09-11 13:42:37.000000000 -0500
-+++ src/prefops.c 2013-12-09 11:14:08.000000000 -0600
-@@ -94,15 +94,15 @@
- ret->lilypath = g_string_new (g_build_filename (get_system_bin_dir (), "lilypond-windows.exe", NULL)); //We don't assume the file assoc works - we are installing this anyway to a known place,the option neither lilypond-windows.exe nor the -dgui option are used
- ret->imageviewer = g_string_new ("");
- #else /* !G_OS_WIN32 */
-- ret->browser = g_string_new ("firefox");
-- ret->audioplayer = g_string_new ("play");
-+ ret->browser = g_string_new ("open");
-+ ret->audioplayer = g_string_new ("qtplay");
- #ifdef _GUB_BUILD_
- ret->lilypath = g_string_new (g_build_filename (get_system_bin_dir (), "lilypond", NULL));
- #else
- ret->lilypath = g_string_new ("lilypond");
- #endif
-
-- ret->imageviewer = g_string_new ("eog");
-+ ret->imageviewer = g_string_new ("open");
- #endif /* !G_OS_WIN32 */
-
- ret->profile = g_string_new ("Default");
</del></span></pre>
</div>
</div>
</body>
</html>