[119598] users/devans/dports/print/denemo

2 May 2014

Revision: 119598
          https://trac.macports.org/changeset/119598
Author:   devans@macports.org
Date:     2014-05-02 00:37:21 -0700 (Fri, 02 May 2014)
Log Message:
-----------
devans/dports: update denemo to version 1.1.4 to test build with aubio 0.4.0.

Modified Paths:
--------------
    users/devans/dports/print/denemo/Portfile
    users/devans/dports/print/denemo/files/patch-configure.ac.diff

Added Paths:
-----------
    users/devans/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff

Removed Paths:
-------------
    users/devans/dports/print/denemo/files/patch-configure.diff
    users/devans/dports/print/denemo/files/patch-src-prefops.c.diff

Modified: users/devans/dports/print/denemo/Portfile
===================================================================

--- users/devans/dports/print/denemo/Portfile	2014-05-02 05:55:54 UTC (rev 119597)
+++ users/devans/dports/print/denemo/Portfile	2014-05-02 07:37:21 UTC (rev 119598)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                denemo
-version             1.1.2
+version             1.1.4
 categories          print audio x11
 platforms           darwin
 maintainers         nomaintainer
@@ -22,8 +22,8 @@
 homepage            http://www.denemo.org/
 master_sites        gnu
 
-checksums           rmd160  182902a43b34e3c20c8edf06493bd8ab87a20e1a \
-                    sha256  b795ae6450622a457b46d28b133f857a56d58746c50a6f8131c94dbe14331b0d
+checksums           rmd160  02dd1a4c27929701fcd53bcc476280f382b9ac13 \
+                    sha256  0e23df8052a21eb911db44373dab423fde666b41458f0f585e5312a02acc3019
 
 depends_build       port:intltool \
                     port:pkgconfig \
@@ -46,8 +46,8 @@
 
 depends_run         port:qtplay
 
-patchfiles          patch-configure.ac.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
 
@@ -67,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
 }

Modified: users/devans/dports/print/denemo/files/patch-configure.ac.diff
===================================================================
--- users/devans/dports/print/denemo/files/patch-configure.ac.diff	2014-05-02 05:55:54 UTC (rev 119597)
+++ users/devans/dports/print/denemo/files/patch-configure.ac.diff	2014-05-02 07:37:21 UTC (rev 119598)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-03-12 23:12:37.000000000 -0700
-+++ configure.ac	2014-03-12 23:12:54.000000000 -0700
-@@ -21,7 +21,6 @@
+--- 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])

Deleted: users/devans/dports/print/denemo/files/patch-configure.diff
===================================================================
--- users/devans/dports/print/denemo/files/patch-configure.diff	2014-05-02 05:55:54 UTC (rev 119597)
+++ users/devans/dports/print/denemo/files/patch-configure.diff	2014-05-02 07:37:21 UTC (rev 119598)
@@ -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: users/devans/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff
===================================================================
--- users/devans/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff	                        (rev 0)
+++ users/devans/dports/print/denemo/files/patch-src-audio-pitchrecog.c.diff	2014-05-02 07:37:21 UTC (rev 119598)
@@ -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: users/devans/dports/print/denemo/files/patch-src-prefops.c.diff
===================================================================
--- users/devans/dports/print/denemo/files/patch-src-prefops.c.diff	2014-05-02 05:55:54 UTC (rev 119597)
+++ users/devans/dports/print/denemo/files/patch-src-prefops.c.diff	2014-05-02 07:37:21 UTC (rev 119598)
@@ -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");

    

devans＠macports.org

tags

participants (1)