[141587] trunk/dports/audio/xmms2

[devans at macports.org]

Revision: 141587
          https://trac.macports.org/changeset/141587
Author:   devans at macports.org
Date:     2015-10-22 02:41:38 -0700 (Thu, 22 Oct 2015)
Log Message:
-----------
xmms2: fix library requirements, configuration and linking for xmms2-ripper test client, resolves build issue (#46958).

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

Added Paths:
-----------
    trunk/dports/audio/xmms2/files/patch-src-clients-vistest-wscript.diff

Modified: trunk/dports/audio/xmms2/Portfile
===================================================================
--- trunk/dports/audio/xmms2/Portfile	2015-10-22 07:42:01 UTC (rev 141586)
+++ trunk/dports/audio/xmms2/Portfile	2015-10-22 09:41:38 UTC (rev 141587)
@@ -54,7 +54,8 @@
 patchfiles              patch-ffmpeg-2.0.diff \
                         patch-nellymoser.diff \
                         patch-src-plugins-modplug-modplug.c.diff \
-                        patch-wscript.diff
+                        patch-wscript.diff \
+                        patch-src-clients-vistest-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-clients-vistest-wscript.diff
===================================================================
--- trunk/dports/audio/xmms2/files/patch-src-clients-vistest-wscript.diff	                        (rev 0)
+++ trunk/dports/audio/xmms2/files/patch-src-clients-vistest-wscript.diff	2015-10-22 09:41:38 UTC (rev 141587)
@@ -0,0 +1,28 @@
+--- src/clients/vistest/wscript.orig	2015-10-22 02:04:11.000000000 -0700
++++ src/clients/vistest/wscript	2015-10-22 02:08:31.000000000 -0700
+@@ -23,12 +23,12 @@
+             t.install_path = None
+ 
+ 
+-    if bld.env.LIB_vorbisenc:
++    if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg:
+         t = bld(features = 'c cprogram',
+             target = 'xmms2-ripper',
+             source = 'ripper.c',
+             includes = '. ../../.. ../../include',
+-            uselib = 'vorbisenc',
++            uselib = 'vorbisenc vorbis ogg',
+             use = 'xmmsclient'
+             )
+         if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
+@@ -55,6 +55,10 @@
+ 
+     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
+             args='--cflags --libs', mandatory=False)
++    conf.check_cfg(package='vorbis', uselib_store='vorbis',
++            args='--cflags --libs', mandatory=False)
++    conf.check_cfg(package='ogg', uselib_store='ogg',
++            args='--cflags --libs', mandatory=False)
+ 
+     if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
+             args='--cflags --libs', mandatory=False):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/6e09490a/attachment.html>