<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141608] trunk/dports/audio/xmms2</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141608">141608</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-22 16:17:01 -0700 (Thu, 22 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>xmms2: drop deprecated python26 variant, update dependencies to enable optional ccda, shout plugins, patch to fix ccda plugin build, increment revision.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudioxmms2Portfile">trunk/dports/audio/xmms2/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudioxmms2filespatchsrcpluginscddacddacdiff">trunk/dports/audio/xmms2/files/patch-src-plugins-cdda-cdda.c.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudioxmms2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/xmms2/Portfile (141607 => 141608)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    xmms2
</span><span class="cx"> version                 0.8DrO_o
</span><del>-revision                8
</del><ins>+revision                9
</ins><span class="cx"> categories              audio
</span><span class="cx"> # Mostly LGPL, some plugins and clients are GPL
</span><span class="cx"> license                 LGPL-2.1+ GPL-2+ GPL-2
</span><span class="lines">@@ -49,13 +49,17 @@
</span><span class="cx">                         port:libsamplerate \
</span><span class="cx">                         port:libsdl \
</span><span class="cx">                         path:lib/libspeex.dylib:speex \
</span><del>-                        port:wavpack
</del><ins>+                        port:wavpack \
+                        port:libshout2 \
+                        port:libcdio \
+                        port:libcdio-paranoia
</ins><span class="cx"> 
</span><span class="cx"> patchfiles              patch-ffmpeg-2.0.diff \
</span><span class="cx">                         patch-nellymoser.diff \
</span><span class="cx">                         patch-src-plugins-modplug-modplug.c.diff \
</span><span class="cx">                         patch-wscript.diff \
</span><del>-                        patch-src-clients-vistest-wscript.diff
</del><ins>+                        patch-src-clients-vistest-wscript.diff \
+                        patch-src-plugins-cdda-cdda.c.diff
</ins><span class="cx"> 
</span><span class="cx"> post-patch {
</span><span class="cx">     foreach f [glob -directory ${worksrcpath} waf waf-light wafadmin/*.py wafadmin/*/*.py waftools/ruby.py] {
</span><span class="lines">@@ -110,20 +114,12 @@
</span><span class="cx">     configure.args-append --without-plugins=jack
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-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 {
</del><ins>+variant python27 description {Support for Python 2.7} {
</ins><span class="cx">     depends_lib-append      port:py27-pyrex
</span><span class="cx">     configure.args-delete   --without-optionals python
</span><span class="cx">     configure.python        ${prefix}/bin/python2.7
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-if {![variant_isset python26]} {
-    default_variants +python27
-}
</del><ins>+default_variants +python27
</ins><span class="cx"> 
</span><span class="cx"> livecheck.regex         /${name}-(.+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportsaudioxmms2filespatchsrcpluginscddacddacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/xmms2/files/patch-src-plugins-cdda-cdda.c.diff (0 => 141608)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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 &quot;xmms/xmms_log.h&quot;
+ #include &quot;xmms/xmms_util.h&quot;

+-#include &lt;cdio/cdda.h&gt;
++#include &lt;cdio/paranoia/cdda.h&gt;
+ #include &lt;cdio/cdio.h&gt;
+ #include &lt;cdio/logging.h&gt;
+ #include &lt;discid/discid.h&gt;
</ins></span></pre>
</div>
</div>

</body>
</html>