[126037] trunk/dports/audio/xmms2

[ryandesign at macports.org]

Revision: 126037
          https://trac.macports.org/changeset/126037
Author:   ryandesign at macports.org
Date:     2014-10-02 06:45:00 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
xmms2: fix build with clang 5.1 and up by removing unknown argument -multiply_defined_suppress (#44560); fix build with libmodplug 0.8.8.5 and up by fixing modplug.h include path

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

Added Paths:
-----------
    trunk/dports/audio/xmms2/files/patch-src-plugins-modplug-modplug.c.diff
    trunk/dports/audio/xmms2/files/patch-wscript.diff

Modified: trunk/dports/audio/xmms2/Portfile
===================================================================
--- trunk/dports/audio/xmms2/Portfile	2014-10-02 13:42:14 UTC (rev 126036)
+++ trunk/dports/audio/xmms2/Portfile	2014-10-02 13:45:00 UTC (rev 126037)
@@ -52,7 +52,9 @@
                         port:wavpack
 
 patchfiles              patch-ffmpeg-2.0.diff \
-                        patch-nellymoser.diff
+                        patch-nellymoser.diff \
+                        patch-src-plugins-modplug-modplug.c.diff \
+                        patch-wscript.diff
 
 post-patch {
     foreach f [glob -directory ${worksrcpath} waf waf-light wafadmin/*.py wafadmin/*/*.py waftools/ruby.py] {

Added: trunk/dports/audio/xmms2/files/patch-src-plugins-modplug-modplug.c.diff
===================================================================
--- trunk/dports/audio/xmms2/files/patch-src-plugins-modplug-modplug.c.diff	                        (rev 0)
+++ trunk/dports/audio/xmms2/files/patch-src-plugins-modplug-modplug.c.diff	2014-10-02 13:45:00 UTC (rev 126037)
@@ -0,0 +1,12 @@
+https://bugs.xmms2.org/view.php?id=2574
+--- src/plugins/modplug/modplug.c.orig	2011-10-20 14:26:08.000000000 -0500
++++ src/plugins/modplug/modplug.c	2014-10-02 08:38:40.000000000 -0500
+@@ -9,7 +9,7 @@
+ #include "xmms/xmms_sample.h"
+ #include "xmms/xmms_medialib.h"
+ #include "xmms/xmms_log.h"
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+ 
+ #include <glib.h>
+ #include <string.h>

Added: trunk/dports/audio/xmms2/files/patch-wscript.diff
===================================================================
--- trunk/dports/audio/xmms2/files/patch-wscript.diff	                        (rev 0)
+++ trunk/dports/audio/xmms2/files/patch-wscript.diff	2014-10-02 13:45:00 UTC (rev 126037)
@@ -0,0 +1,11 @@
+http://git.xmms2.org/xmms2/xmms2-devel/commit/wscript?id=8a2603cabdc0c184d2c177660986d20b21fd6987
+--- wscript.orig	2011-10-20 14:26:08.000000000 -0500
++++ wscript	2014-10-02 08:30:12.000000000 -0500
+@@ -356,7 +356,6 @@
+         conf.env.cprogram_PATTERN = '%s.exe'
+ 
+     if Options.platform == 'darwin':
+-        conf.env.append_value('LINKFLAGS', '-multiply_defined_suppress')
+         conf.env.explicit_install_name = True
+     else:
+         conf.env.explicit_install_name = False
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141002/893e978f/attachment.html>