[105561] trunk/dports/audio/xmp

[ryandesign at macports.org]

Revision: 105561
          https://trac.macports.org/changeset/105561
Author:   ryandesign at macports.org
Date:     2013-04-24 17:09:10 -0700 (Wed, 24 Apr 2013)
Log Message:
-----------
xmp: update xmp to 4.0.3 and libxmp to 4.1.0 (#38889); disable silent rules

Modified Paths:
--------------
    trunk/dports/audio/xmp/Portfile

Added Paths:
-----------
    trunk/dports/audio/xmp/files/patch-src-common.h.diff
    trunk/dports/audio/xmp/files/patch-src-control.c.diff

Modified: trunk/dports/audio/xmp/Portfile
===================================================================
--- trunk/dports/audio/xmp/Portfile	2013-04-25 00:01:24 UTC (rev 105560)
+++ trunk/dports/audio/xmp/Portfile	2013-04-25 00:09:10 UTC (rev 105561)
@@ -13,11 +13,14 @@
 
 build.type          gnu
 
+# Disable silent rules.
+build.args-append   V=1
+
 # Cannot turn off dependency tracking for libxmp.
 universal_variant   no
 
 if {${subport} == ${name}} {
-    version             4.0.2
+    version             4.0.3
     license             GPL-2+
 
     long_description    The Extended Module Player is a portable \
@@ -29,8 +32,8 @@
                         (XM), and Impulse Tracker (IT).
 
     master_sites        sourceforge:project/xmp/xmp/${version}
-    checksums           rmd160  653cf6c4e8951ba25ee7581ba24ed4dc356cde95 \
-                        sha256  a05127b85e1cdd049b99e31b4c73a71787398ea34fee012100d6b66beece1e31
+    checksums           rmd160  366262b03255a099fd75c5c452815495d1b84995 \
+                        sha256  e67dd83e38168df965a384dbe1b032c4a23a57f4b4f26095df329161c47acf75
 
     depends_lib         port:libxmp
 
@@ -54,7 +57,7 @@
 }
 
 subport libxmp {
-    version             4.0.4
+    version             4.1.0
     license             LGPL-2.1+
 
     long_description    Libxmp is a library that renders module files to \
@@ -62,16 +65,18 @@
                         obscure module formats including Protracker \
                         (MOD), Scream Tracker 3 (S3M), Fast Tracker II \
                         (XM), and Impulse Tracker (IT).
- 
 
     master_sites        sourceforge:project/xmp/libxmp/${version}
     distname            ${subport}-${version}
-    checksums           rmd160  9b76739871873ea68d3f2c7a8ca08f5efb34dcb5 \
-                        sha256  dde8ed6b07fd82a82956774de3c2edfb8f01ef16c56e826a1284cb554029c46b
+    checksums           rmd160  2b94458d3903fe00bf6a4c05c47cc8e0e47547a3 \
+                        sha256  23b932edcfc43ba6f0200e626fb5448572a0d525fc8c3122b2a099d5f987be7d
 
+    patchfiles          patch-src-common.h.diff \
+                        patch-src-control.c.diff
+
     # Switch to warning that Clang recognizes.
     if {[string first clang ${configure.compiler}] != -1} {
-        patchfiles      patch-configure.diff
+        patchfiles-append patch-configure.diff
     }
 
     test.run            yes

Added: trunk/dports/audio/xmp/files/patch-src-common.h.diff
===================================================================
--- trunk/dports/audio/xmp/files/patch-src-common.h.diff	                        (rev 0)
+++ trunk/dports/audio/xmp/files/patch-src-common.h.diff	2013-04-25 00:09:10 UTC (rev 105561)
@@ -0,0 +1,17 @@
+--- ./src/common.h.orig	2013-04-21 20:30:02.110649091 +0200
++++ ./src/common.h	2013-04-21 20:30:22.957668244 +0200
+@@ -124,14 +124,6 @@
+ 
+ #endif	/* !_MSC_VER */
+ 
+-#ifdef HAVE_STRLCPY
+-#define strncpy strlcpy
+-#endif
+-
+-#ifdef HAVE_STRLCAT
+-#define strncpy strlcat
+-#endif
+-
+ /* Quirks */
+ #define QUIRK_S3MLOOP	(1 << 0)	/* S3M loop mode */
+ #define QUIRK_ENVFADE	(1 << 1)	/* Fade at end of envelope */

Added: trunk/dports/audio/xmp/files/patch-src-control.c.diff
===================================================================
--- trunk/dports/audio/xmp/files/patch-src-control.c.diff	                        (rev 0)
+++ trunk/dports/audio/xmp/files/patch-src-control.c.diff	2013-04-25 00:09:10 UTC (rev 105561)
@@ -0,0 +1,36 @@
+*** src/control.c~	2013-04-22 19:07:53.000000000 -0500
+--- src/control.c	2013-04-22 19:08:42.000000000 -0500
+***************
+*** 213,219 ****
+  	return ret;
+  }
+  
+! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID)
+  extern int xmp_set_player_v41__(xmp_context, int, int)
+  	__attribute__((alias("xmp_set_player_v40__")));
+  
+--- 213,219 ----
+  	return ret;
+  }
+  
+! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__)
+  extern int xmp_set_player_v41__(xmp_context, int, int)
+  	__attribute__((alias("xmp_set_player_v40__")));
+  
+***************
+*** 280,286 ****
+  	return ret;
+  }
+  
+! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID)
+  extern int xmp_get_player_v41__(xmp_context, int)
+  	__attribute__((alias("xmp_get_player_v40__")));
+  
+--- 280,286 ----
+  	return ret;
+  }
+  
+! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__)
+  extern int xmp_get_player_v41__(xmp_context, int)
+  	__attribute__((alias("xmp_get_player_v40__")));
+  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130424/653c219d/attachment.html>