Update to 2012.04.24

PR:	ports/167347
Submitted by:	John Hixson <john@pcbsd.org>
This commit is contained in:
Josh Paetzel 2012-04-26 23:59:38 +00:00
parent 00ee4f65cb
commit 9c42a3fb30
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=295579
4 changed files with 61 additions and 6 deletions

View file

@ -6,20 +6,20 @@
#
PORTNAME= pianobar
PORTVERSION= 2012.01.10
PORTVERSION= 2012.04.24
CATEGORIES= audio
MASTER_SITES= http://6xq.net/static/projects/${PORTNAME}/
MASTER_SITES= http://6xq.net/projects/${PORTNAME}/
MAINTAINER= john@pcbsd.org
COMMENT= Command line Pandora player
LICENSE= MIT
LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \
faad:${PORTSDIR}/audio/faad \
mad:${PORTSDIR}/audio/libmad \
gnutls.47:${PORTSDIR}/security/gnutls
LICENSE= MIT
MAN1= pianobar.1
MAN_COMPRESSED= no

View file

@ -1,2 +1,2 @@
SHA256 (pianobar-2012.01.10.tar.bz2) = 6d19e5abde542bcdf8b9cfa50448fbe95c1e113f59e54065c9f4e0fbf78690f9
SIZE (pianobar-2012.01.10.tar.bz2) = 68839
SHA256 (pianobar-2012.04.24.tar.bz2) = 1286005b14ef58ea5b7baece054e772761e6351fdeceadd3a69e0a7c8b9bf28e
SIZE (pianobar-2012.04.24.tar.bz2) = 69538

View file

@ -0,0 +1,36 @@
--- src/main.c.orig 2012-04-24 11:09:20.000000000 -0700
+++ src/main.c 2012-04-26 16:07:03.000000000 -0700
@@ -77,10 +77,32 @@
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);

View file

@ -0,0 +1,19 @@
--- src/libpiano/piano.c.orig 2012-04-24 11:09:20.000000000 -0700
+++ src/libpiano/piano.c 2012-04-26 16:05:39.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 */