cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pianobar-2011.09.22

Browse Source
This commit is contained in:
dcoppa 2011-09-22 14:28:13 +00:00
parent 0a26178f1a
commit 68a5e76a98
6 changed files with 13 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/pianobar/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2011/09/22 09:22:41 dcoppa Exp $
# $OpenBSD: Makefile,v 1.21 2011/09/22 14:28:13 dcoppa Exp $
COMMENT = console client for pandora
DISTNAME = pianobar-2011.07.09
REVISION = 3
DISTNAME = pianobar-2011.09.22
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio

10
audio/pianobar/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pianobar-2011.07.09.tar.bz2) = feCYGsRZwNYcmD7nt5EVAg==
RMD160 (pianobar-2011.07.09.tar.bz2) = W9tAn7TSGjUmhbZ9hL2+XS8Yn08=
SHA1 (pianobar-2011.07.09.tar.bz2) = QlxVEtLFTBhuYQwCWB3oVGtAJZk=
SHA256 (pianobar-2011.07.09.tar.bz2) = 6OzGBje1eoB+PbNSQulo+ozmCw24oyaKzVKhbAJ+ibQ=
SIZE (pianobar-2011.07.09.tar.bz2) = 64497
MD5 (pianobar-2011.09.22.tar.bz2) = bhey16DvOx1rX8gOINGTJg==
RMD160 (pianobar-2011.09.22.tar.bz2) = 1pxKlMWWE/pso+jOLZpv4IeGdKU=
SHA1 (pianobar-2011.09.22.tar.bz2) = VXFFT0NRzzTeLX8K5xE/HnKfu+M=
SHA256 (pianobar-2011.09.22.tar.bz2) = blTUiB562msEQ2EbCFMhXp5UJTZnpYMQ2W3+OL4ljtM=
SIZE (pianobar-2011.09.22.tar.bz2) = 65436

10
audio/pianobar/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.8 2011/07/10 11:01:05 dcoppa Exp $
--- Makefile.orig Sat Jul 9 10:40:54 2011
+++ Makefile Sun Jul 10 12:38:43 2011
$OpenBSD: patch-Makefile,v 1.9 2011/09/22 14:28:13 dcoppa Exp $
--- Makefile.orig Thu Sep 22 12:34:19 2011
+++ Makefile Thu Sep 22 16:15:22 2011
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
INCDIR:=${PREFIX}/include
MANDIR:=${PREFIX}/share/man
@ -51,7 +51,7 @@ $OpenBSD: patch-Makefile,v 1.8 2011/07/10 11:01:05 dcoppa Exp $
${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
%.o: %.c
@@ -141,16 +132,10 @@ install: pianobar install-libpiano
@@ -141,18 +132,12 @@ install: pianobar install-libpiano
else
install: pianobar
endif
@ -73,3 +73,5 @@ $OpenBSD: patch-Makefile,v 1.8 2011/07/10 11:01:05 dcoppa Exp $
+ ${INSTALL_DATA} libpiano.so.${LIBpiano_VERSION} ${DESTDIR}/${LIBDIR}/
+ ${INSTALL_DATA} libpiano.a ${DESTDIR}/${LIBDIR}/
+ ${INSTALL_DATA} src/libpiano/piano.h ${DESTDIR}/${INCDIR}/
.PHONY: install install-libpiano test debug all

12
audio/pianobar/patches/patch-src_libpiano_piano_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_libpiano_piano_c,v 1.1 2011/09/22 09:22:41 dcoppa Exp $
--- src/libpiano/piano.c.orig Thu Sep 22 10:58:36 2011
+++ src/libpiano/piano.c Thu Sep 22 10:58:55 2011
@@ -39,7 +39,7 @@ THE SOFTWARE.
#include "crypt.h"
#include "config.h"
-#define PIANO_PROTOCOL_VERSION "31"
+#define PIANO_PROTOCOL_VERSION "32"
#define PIANO_RPC_HOST "www.pandora.com"
#define PIANO_RPC_PORT "80"
#define PIANO_RPC_PATH "/radio/xmlrpc/v" PIANO_PROTOCOL_VERSION "?"

37
audio/pianobar/patches/patch-src_libpiano_xml_c
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-src_libpiano_xml_c,v 1.3 2011/07/18 15:04:08 dcoppa Exp $
Fix false bookmarking error message
(upstream commit c5a89908b05126fd59ea7d4fd42d9570a2ca6228)
--- src/libpiano/xml.c.orig Sat Jul 9 10:40:54 2011
+++ src/libpiano/xml.c Mon Jul 18 17:00:10 2011
@@ -560,26 +560,16 @@ PianoReturn_t PianoXmlParsePlaylist (PianoHandle_t *ph
return ret;
}
-/* parse simple answers like this: <?xml version="1.0" encoding="UTF-8"?>
- * <methodResponse><params><param><value>1</value></param></params>
- * </methodResponse>
+/* check for exception only
* @param xml string
- * @return
+ * @return _OK or error
*/
PianoReturn_t PianoXmlParseSimple (char *xml) {
- ezxml_t xmlDoc, dataNode;
+ ezxml_t xmlDoc;
PianoReturn_t ret;
if ((ret = PianoXmlInitDoc (xml, &xmlDoc)) != PIANO_RET_OK) {
return ret;
- }
-
- dataNode = ezxml_get (xmlDoc, "params", 0, "param", 0, "value", -1);
-
- if (strcmp (ezxml_txt (dataNode), "1") == 0) {
- ret = PIANO_RET_OK;
- } else {
- ret = PIANO_RET_ERR;
}
ezxml_free (xmlDoc);

12
audio/pianobar/patches/patch-src_main_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_main_c,v 1.3 2011/09/22 09:22:41 dcoppa Exp $
--- src/main.c.orig Thu Sep 22 10:57:52 2011
+++ src/main.c Thu Sep 22 10:58:21 2011
@@ -92,7 +92,7 @@ static void BarMainGetLoginCredentials (BarSettings_t
BarReadlineFds_t *input) {
if (settings->username == NULL) {
char nameBuf[100];
- BarUiMsg (settings, MSG_QUESTION, "Username: ");
+ BarUiMsg (settings, MSG_QUESTION, "Email: ");
BarReadlineStr (nameBuf, sizeof (nameBuf), input, BAR_RL_DEFAULT);
settings->username = strdup (nameBuf);
}