<!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>[150456] trunk/dports/audio/pianobar</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/150456">150456</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-07-19 04:58:02 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>pianobar: update to 2016.06.02 and dynamically link to libpiano (#51565; maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiopianobarPortfile">trunk/dports/audio/pianobar/Portfile</a></li>
<li><a href="#trunkdportsaudiopianobarfilespatchMakefilediff">trunk/dports/audio/pianobar/files/patch-Makefile.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaudiopianobarfilespatchsrclibpianopianocdiff">trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff</a></li>
<li><a href="#trunkdportsaudiopianobarfilespatchsrcmaincdiff">trunk/dports/audio/pianobar/files/patch-src-main.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiopianobarPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/pianobar/Portfile (150455 => 150456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pianobar/Portfile 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/Portfile 2016-07-19 11:58:02 UTC (rev 150456)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup PromyLOPh pianobar 2015.11.22
-revision 2
</del><ins>+github.setup PromyLOPh pianobar 2016.06.02
</ins><span class="cx"> categories audio
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:aguynamedryan+pianobar
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx"> configure keybindings, last.fm scrobbling, \
</span><span class="cx"> proxy support for listening outside of USA.
</span><span class="cx">
</span><del>-checksums rmd160 375d9a1a4a8a879df98affe9ed063d779f7b822e \
- sha256 120f34fa70c34c12194b7c350952c9d5fd706b820bdd49cb139dabe785499bc9
</del><ins>+checksums rmd160 949a4991e8935f53c943eaca7ca932eddce27bc8 \
+ sha256 be02852ad04767604b56742f3ae8208ff6032d2fb3d792c3b80b735c203eeaba
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -32,13 +31,6 @@
</span><span class="cx"> port:libgcrypt \
</span><span class="cx"> port:json-c
</span><span class="cx">
</span><del>-post-patch {
- # Disable silent rules.
- # https://github.com/PromyLOPh/pianobar/issues/571
- reinplace -E "s/^(\t+)@(\\\$\{)/\\1\\2/" ${worksrcpath}/Makefile
- reinplace -E "/^\t+@echo \" /d" ${worksrcpath}/Makefile
-}
-
</del><span class="cx"> configure.cflags-append -std=c99
</span><span class="cx">
</span><span class="cx"> # Prevent upgrade failure.
</span><span class="lines">@@ -49,12 +41,18 @@
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> build.args CC="${configure.cc} [get_canonical_archflags cc]" \
</span><ins>+ DYNLINK=1 \
</ins><span class="cx"> PREFIX=${prefix} \
</span><span class="cx"> CFLAGS="${configure.cflags} ${configure.cppflags}" \
</span><del>- LDFLAGS="${configure.ldflags}"
</del><ins>+ LDFLAGS="${configure.ldflags}" \
+ V=1
</ins><span class="cx">
</span><span class="cx"> destroot.args PREFIX=${prefix}
</span><span class="cx">
</span><ins>+if {${subport} eq ${name}} {
+ depends_lib-append port:libpiano
+}
+
</ins><span class="cx"> subport libpiano {
</span><span class="cx"> depends_lib-append port:gnutls
</span><span class="cx"> build.target libpiano.so.0
</span></span></pre></div>
<a id="trunkdportsaudiopianobarfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/pianobar/files/patch-Makefile.diff (150455 => 150456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pianobar/files/patch-Makefile.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-Makefile.diff 2016-07-19 11:58:02 UTC (rev 150456)
</span><span class="lines">@@ -1,41 +1,41 @@
</span><del>---- Makefile.orig 2015-11-22 04:31:27.000000000 -0800
-+++ Makefile 2016-01-27 15:18:12.000000000 -0800
-@@ -71,7 +71,7 @@
</del><ins>+--- Makefile.orig 2016-06-02 01:49:26.000000000 -0500
++++ Makefile 2016-06-05 00:35:18.000000000 -0500
+@@ -79,7 +79,7 @@
</ins><span class="cx">
</span><span class="cx"> # build pianobar
</span><span class="cx"> ifeq (${DYNLINK},1)
</span><span class="cx"> -pianobar: ${PIANOBAR_OBJ} libpiano.so.0
</span><span class="cx"> +pianobar: ${PIANOBAR_OBJ} libpiano.0.dylib
</span><del>- @echo " LINK $@"
- @${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
</del><ins>+ ${SILENTECHO} " LINK $@"
+ ${SILENTCMD}${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
</ins><span class="cx"> else
</span><del>-@@ -81,12 +81,12 @@
</del><ins>+@@ -89,12 +89,12 @@
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> # build shared and static libpiano
</span><span class="cx"> -libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
</span><span class="cx"> +libpiano.0.dylib: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
</span><del>- @echo " LINK $@"
-- @${CC} -shared -Wl,-soname,libpiano.so.0 -o libpiano.so.0.0.0 \
-+ @${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib -o libpiano.0.0.0.dylib \
</del><ins>+ ${SILENTECHO} " LINK $@"
+- ${SILENTCMD}${CC} -shared -Wl,-soname,libpiano.so.0 -o libpiano.so.0.0.0 \
++ ${SILENTCMD}${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib -o libpiano.0.0.0.dylib \
</ins><span class="cx"> ${LIBPIANO_RELOBJ} ${ALL_LDFLAGS}
</span><del>-- @ln -fs libpiano.so.0.0.0 libpiano.so.0
-- @ln -fs libpiano.so.0 libpiano.so
-+ @ln -fs libpiano.0.0.0.dylib libpiano.0.dylib
-+ @ln -fs libpiano.0.dylib libpiano.dylib
- @echo " AR libpiano.a"
- @${AR} rcs libpiano.a ${LIBPIANO_OBJ}
</del><ins>+- ${SILENTCMD}ln -fs libpiano.so.0.0.0 libpiano.so.0
+- ${SILENTCMD}ln -fs libpiano.so.0 libpiano.so
++ ${SILENTCMD}ln -fs libpiano.0.0.0.dylib libpiano.0.dylib
++ ${SILENTCMD}ln -fs libpiano.0.dylib libpiano.dylib
+ ${SILENTECHO} " AR libpiano.a"
+ ${SILENTCMD}${AR} rcs libpiano.a ${LIBPIANO_OBJ}
</ins><span class="cx">
</span><del>-@@ -107,7 +107,7 @@
</del><ins>+@@ -115,7 +115,7 @@
</ins><span class="cx"> clean:
</span><del>- @echo " CLEAN"
- @${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
</del><ins>+ ${SILENTECHO} " CLEAN"
+ ${SILENTCMD}${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
</ins><span class="cx"> - ${LIBPIANO_RELOBJ} pianobar libpiano.so* \
</span><span class="cx"> + ${LIBPIANO_RELOBJ} pianobar libpiano*.dylib \
</span><span class="cx"> libpiano.a $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d)
</span><span class="cx">
</span><span class="cx"> all: pianobar
</span><del>-@@ -124,9 +124,9 @@
</del><ins>+@@ -132,9 +132,9 @@
</ins><span class="cx">
</span><span class="cx"> install-libpiano:
</span><span class="cx"> install -d ${DESTDIR}${LIBDIR}/
</span></span></pre></div>
<a id="trunkdportsaudiopianobarfilespatchsrclibpianopianocdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff (150455 => 150456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff 2016-07-19 11:58:02 UTC (rev 150456)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- src/libpiano/piano.c.orig 2012-04-27 07:52:09.000000000 -0700
-+++ src/libpiano/piano.c 2012-04-27 07:52:24.000000000 -0700
-@@ -42,7 +42,7 @@
- #include "crypt.h"
- #include "config.h"
-
--#define PIANO_PROTOCOL_VERSION "33"
-+#define PIANO_PROTOCOL_VERSION "34"
- #define PIANO_RPC_HOST "www.pandora.com"
- #define PIANO_RPC_PORT "80"
- #define PIANO_RPC_PATH "/radio/xmlrpc/v" PIANO_PROTOCOL_VERSION "?"
-@@ -272,6 +272,7 @@
- "<?xml version=\"1.0\"?><methodCall>"
- "<methodName>listener.authenticateListener</methodName>"
- "<params><param><value><int>%lu</int></value></param>"
-+ "<param><value><string></string></value></param>"
- /* user */
- "<param><value><string>%s</string></value></param>"
- /* password */
</del></span></pre></div>
<a id="trunkdportsaudiopianobarfilespatchsrcmaincdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/pianobar/files/patch-src-main.c.diff (150455 => 150456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/pianobar/files/patch-src-main.c.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-src-main.c.diff 2016-07-19 11:58:02 UTC (rev 150456)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>---- src/main.c.orig 2012-04-27 07:52:18.000000000 -0700
-+++ src/main.c 2012-04-27 07:52:24.000000000 -0700
-@@ -77,10 +77,31 @@
- WaitressReturn_t wRet;
- PianoRequestDataLogin_t reqData;
- bool ret;
-+ WaitressHandle_t waithSync;
-+ char *syncTime;
-+ unsigned long int syncTimeInt;
-+
-+ /* skip sync step by fetching time from somewhere else */
-+ WaitressInit (&waithSync);
-+ WaitressSetUrl (&waithSync, "http://ridetheclown.com/s2/synctime.php");
-+ if (app->settings.proxy != NULL && strlen (app->settings.proxy) > 0) {
-+ WaitressSetProxy (&waithSync, app->settings.proxy);
-+ }
-+ wRet = WaitressFetchBuf (&waithSync, &syncTime);
-+ WaitressFree (&waithSync);
-+ if (wRet != WAITRESS_RET_OK) {
-+ BarUiMsg (&app->settings, MSG_ERR, "Unable to sync: %s\n",
-+ WaitressErrorToStr (wRet));
-+ return false;
-+ }
-+
-+ syncTimeInt = strtoul (syncTime, NULL, 0);
-+ app->ph.timeOffset = time (NULL) - syncTimeInt;
-+ free (syncTime);
-
- reqData.user = app->settings.username;
- reqData.password = app->settings.password;
-- reqData.step = 0;
-+ reqData.step = 1;
-
- BarUiMsg (&app->settings, MSG_INFO, "Login... ");
- ret = BarUiPianoCall (app, PIANO_REQUEST_LOGIN, &reqData, &pRet, &wRet);
</del></span></pre>
</div>
</div>
</body>
</html>