[141608] trunk/dports/audio/xmms2

[devans at macports.org]

Revision: 141608
          https://trac.macports.org/changeset/141608
Author:   devans at macports.org
Date:     2015-10-22 16:17:01 -0700 (Thu, 22 Oct 2015)
Log Message:
-----------
xmms2: drop deprecated python26 variant, update dependencies to enable optional ccda, shout plugins, patch to fix ccda plugin build, increment revision.

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

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

Modified: trunk/dports/audio/xmms2/Portfile
===================================================================
--- trunk/dports/audio/xmms2/Portfile	2015-10-22 23:07:03 UTC (rev 141607)
+++ trunk/dports/audio/xmms2/Portfile	2015-10-22 23:17:01 UTC (rev 141608)
@@ -6,7 +6,7 @@
 
 name                    xmms2
 version                 0.8DrO_o
-revision                8
+revision                9
 categories              audio
 # Mostly LGPL, some plugins and clients are GPL
 license                 LGPL-2.1+ GPL-2+ GPL-2
@@ -49,13 +49,17 @@
                         port:libsamplerate \
                         port:libsdl \
                         path:lib/libspeex.dylib:speex \
-                        port:wavpack
+                        port:wavpack \
+                        port:libshout2 \
+                        port:libcdio \
+                        port:libcdio-paranoia
 
 patchfiles              patch-ffmpeg-2.0.diff \
                         patch-nellymoser.diff \
                         patch-src-plugins-modplug-modplug.c.diff \
                         patch-wscript.diff \
-                        patch-src-clients-vistest-wscript.diff
+                        patch-src-clients-vistest-wscript.diff \
+                        patch-src-plugins-cdda-cdda.c.diff
 
 post-patch {
     foreach f [glob -directory ${worksrcpath} waf waf-light wafadmin/*.py wafadmin/*/*.py waftools/ruby.py] {
@@ -110,20 +114,12 @@
     configure.args-append --without-plugins=jack
 }
 
-variant python26 description {Support for Python 2.6} conflicts python27 {
-    depends_lib-append      port:py26-pyrex
-    configure.args-delete   --without-optionals python
-    configure.python        ${prefix}/bin/python2.6
-}
-
-variant python27 description {Support for Python 2.7} conflicts python26 {
+variant python27 description {Support for Python 2.7} {
     depends_lib-append      port:py27-pyrex
     configure.args-delete   --without-optionals python
     configure.python        ${prefix}/bin/python2.7
 }
 
-if {![variant_isset python26]} {
-    default_variants +python27
-}
+default_variants +python27
 
 livecheck.regex         /${name}-(.+)${extract.suffix}

Added: trunk/dports/audio/xmms2/files/patch-src-plugins-cdda-cdda.c.diff
===================================================================
--- trunk/dports/audio/xmms2/files/patch-src-plugins-cdda-cdda.c.diff	                        (rev 0)
+++ trunk/dports/audio/xmms2/files/patch-src-plugins-cdda-cdda.c.diff	2015-10-22 23:17:01 UTC (rev 141608)
@@ -0,0 +1,11 @@
+--- src/plugins/cdda/cdda.c.orig	2015-10-22 15:45:06.000000000 -0700
++++ src/plugins/cdda/cdda.c	2015-10-22 15:47:03.000000000 -0700
+@@ -18,7 +18,7 @@
+ #include "xmms/xmms_log.h"
+ #include "xmms/xmms_util.h"
+ 
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #include <cdio/cdio.h>
+ #include <cdio/logging.h>
+ #include <discid/discid.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/9d254f8f/attachment.html>