[121873] trunk/dports/print/denemo
devans at macports.org
devans at macports.org
Wed Jul 9 16:16:13 PDT 2014
Revision: 121873
https://trac.macports.org/changeset/121873
Author: devans at macports.org
Date: 2014-07-09 16:16:13 -0700 (Wed, 09 Jul 2014)
Log Message:
-----------
denemo: update to version 1.1.6, now builds with aubio 0.4 (#42524).
Modified Paths:
--------------
trunk/dports/print/denemo/Portfile
Added Paths:
-----------
trunk/dports/print/denemo/files/autogen.sh
trunk/dports/print/denemo/files/patch-configure.ac.diff
trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff
Removed Paths:
-------------
trunk/dports/print/denemo/files/patch-configure.diff
trunk/dports/print/denemo/files/patch-src-prefops.c.diff
Modified: trunk/dports/print/denemo/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortSystem 1.0
name denemo
-version 1.1.0
+version 1.1.6
categories print audio x11
platforms darwin
maintainers nomaintainer
@@ -22,17 +22,21 @@
homepage http://www.denemo.org/
master_sites gnu
-checksums rmd160 ce8fe79ac52e89c38a33dd8bc486bf7d5c1d7eb2 \
- sha256 9bdb1d587604de9ed78c73060c13a1dba656f691fd4b0bcc8faf4a6a64084b14
+checksums rmd160 e09c952116fb960555c63bf9e38e16f0703642f6 \
+ sha256 929ceab1c9e7a83cbaf122bfa37b8497128f786043158d7e44af94c288569363
depends_build port:intltool \
- port:pkgconfig
+ port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:aubio \
port:evince \
port:fluidsynth \
port:gettext \
port:gtksourceview3 \
+ port:gtk3 \
port:guile \
port:jack \
port:librsvg \
@@ -42,9 +46,18 @@
depends_run port:qtplay
-patchfiles patch-configure.diff \
- patch-src-prefops.c.diff
+patchfiles patch-configure.ac.diff \
+ patch-src-audio-pitchrecog.c.diff
+# 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
+
configure.args --enable-evince \
--enable-fluidsynth \
--enable-gtk3 \
@@ -54,8 +67,6 @@
--enable-portmidi \
--enable-rubberband
-use_parallel_build yes
-
variant csound description "Csound can be used for playback." {
depends_run-append port:csound
}
Added: trunk/dports/print/denemo/files/autogen.sh
===================================================================
--- 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)
@@ -0,0 +1,7 @@
+#!/bin/sh
+aclocal $ACLOCAL_FLAGS -I build -I /usr/share/aclocal && \
+autoheader && \
+glibtoolize --force && \
+intltoolize --copy --force --automake && \
+automake --add-missing --gnu && \
+autoconf
Added: trunk/dports/print/denemo/files/patch-configure.ac.diff
===================================================================
--- 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)
@@ -0,0 +1,10 @@
+--- 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)
+
Deleted: trunk/dports/print/denemo/files/patch-configure.diff
===================================================================
--- 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)
@@ -1,13 +0,0 @@
-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 :
Added: trunk/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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"
+
Deleted: trunk/dports/print/denemo/files/patch-src-prefops.c.diff
===================================================================
--- 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)
@@ -1,21 +0,0 @@
---- 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");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140709/5114553d/attachment.html>
More information about the macports-changes
mailing list