Update to pianobar-2011.07.09.
Actually unbreak it, after pandora.com's api change.
This commit is contained in:
dcoppa
parent
af470c7bbe
commit
60d2b30878
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2011/05/13 09:52:51 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2011/07/10 11:01:05 dcoppa Exp $
|
||||
|
||||
COMMENT = console client for pandora
|
||||
|
||||
DISTNAME = pianobar-2011.04.27
|
||||
REVISION = 0
|
||||
DISTNAME = pianobar-2011.07.09
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
CATEGORIES = audio
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (pianobar-2011.04.27.tar.bz2) = D6hNjooJH4Kp/VgNUMCWew==
|
||||
RMD160 (pianobar-2011.04.27.tar.bz2) = q6/9V8XHsiT1f8u7YPys/wa88GI=
|
||||
SHA1 (pianobar-2011.04.27.tar.bz2) = FGwTGz80J9XBJ2cFYE/uygR5VsQ=
|
||||
SHA256 (pianobar-2011.04.27.tar.bz2) = 5LE1SXSvNtMtw0szKb0J8+BDcSdTkCTPet1h+su2Idw=
|
||||
SIZE (pianobar-2011.04.27.tar.bz2) = 61317
|
||||
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
|
||||
|
||||
@ -1,18 +1,24 @@
|
||||
$OpenBSD: patch-Makefile,v 1.7 2011/05/04 07:48:04 dcoppa Exp $
|
||||
--- Makefile.orig Wed Apr 27 21:11:06 2011
|
||||
+++ Makefile Tue May 3 16:13:28 2011
|
||||
@@ -6,9 +6,8 @@ LIBDIR:=${PREFIX}/lib
|
||||
$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
|
||||
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
|
||||
INCDIR:=${PREFIX}/include
|
||||
MANDIR:=${PREFIX}/share/man
|
||||
DYNLINK:=0
|
||||
-CFLAGS:=-O2 -DNDEBUG
|
||||
+CFLAGS+=-std=c99 -fgnu89-inline
|
||||
LDFLAGS:=
|
||||
-CC:=c99
|
||||
|
||||
-# Respect environment variables set by user; does not work with :=
|
||||
-ifeq (${CFLAGS},)
|
||||
- CFLAGS=-O2 -DNDEBUG
|
||||
-endif
|
||||
-ifeq (${CC},cc)
|
||||
- CC=c99
|
||||
-endif
|
||||
-
|
||||
PIANOBAR_DIR=src
|
||||
PIANOBAR_SRC=\
|
||||
@@ -82,26 +81,24 @@ endif
|
||||
${PIANOBAR_DIR}/main.c \
|
||||
@@ -87,26 +80,24 @@ endif
|
||||
|
||||
# build pianobar
|
||||
ifeq (${DYNLINK},1)
|
||||
@ -24,10 +30,10 @@ $OpenBSD: patch-Makefile,v 1.7 2011/05/04 07:48:04 dcoppa Exp $
|
||||
else
|
||||
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
|
||||
${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR}
|
||||
- ${CC} ${CFLAGS} ${LDFLAGS} -lao -lpthread -lm ${LIBFAAD_LDFLAGS} \
|
||||
+ ${CC} ${CFLAGS} ${LDFLAGS} -lao -pthread -lm ${LIBFAAD_LDFLAGS} \
|
||||
${LIBMAD_LDFLAGS} -o $@ ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
|
||||
${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
||||
${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
|
||||
- ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -lpthread -lm \
|
||||
+ ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -pthread -lm \
|
||||
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} -o $@
|
||||
endif
|
||||
|
||||
# build shared and static libpiano
|
||||
@ -45,7 +51,7 @@ $OpenBSD: patch-Makefile,v 1.7 2011/05/04 07:48:04 dcoppa Exp $
|
||||
${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
||||
|
||||
%.o: %.c
|
||||
@@ -129,16 +126,10 @@ install: pianobar install-libpiano
|
||||
@@ -141,16 +132,10 @@ install: pianobar install-libpiano
|
||||
else
|
||||
install: pianobar
|
||||
endif
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-contrib_pianobar_1,v 1.2 2011/05/04 07:48:04 dcoppa Exp $
|
||||
|
||||
Make mandoc happy
|
||||
|
||||
--- contrib/pianobar.1.orig Thu Apr 21 11:15:29 2011
|
||||
+++ contrib/pianobar.1 Thu Apr 21 11:20:22 2011
|
||||
@@ -1,4 +1,4 @@
|
||||
-.TH pianobar 1
|
||||
+.TH PIANOBAR 1 "April 10, 2011"
|
||||
|
||||
.SH NAME
|
||||
pianobar \- console pandora.com music player
|
||||
@@ -34,7 +34,7 @@ The configuration file consists of simple
|
||||
lines. Each terminated with a newline (\\n) character. Keys and values are both
|
||||
case sensitive.
|
||||
|
||||
-act_* keys control
|
||||
+act_* keys control
|
||||
.B pianobar's
|
||||
key-bindings. Every one-byte character except for \\x00 and the
|
||||
special value
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-src_libpiano_xml_c,v 1.1 2011/05/13 09:52:51 dcoppa Exp $
|
||||
|
||||
Fix useQuickMix attribute
|
||||
(Commit 49f64fd33c202831407ba6b02fa74c2037052f1c)
|
||||
|
||||
--- src/libpiano/xml.c.orig Fri May 13 11:44:10 2011
|
||||
+++ src/libpiano/xml.c Fri May 13 11:45:07 2011
|
||||
@@ -373,8 +373,9 @@ static void PianoXmlParseQuickMixStationsCb (const cha
|
||||
}
|
||||
}
|
||||
ids[idsN-1] = NULL;
|
||||
+
|
||||
+ *retIds = ids;
|
||||
}
|
||||
- *retIds = ids;
|
||||
}
|
||||
|
||||
/* parse stations returned by pandora
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_player_c,v 1.6 2011/04/21 10:02:09 dcoppa Exp $
|
||||
$OpenBSD: patch-src_player_c,v 1.7 2011/07/10 11:01:05 dcoppa Exp $
|
||||
|
||||
Add missing include
|
||||
|
||||
Our faad port uses a patched neaacdec.h header
|
||||
|
||||
--- src/player.c.orig Mon Jan 24 13:00:25 2011
|
||||
+++ src/player.c Sun Mar 20 16:34:33 2011
|
||||
--- src/player.c.orig Sat Jul 9 10:40:54 2011
|
||||
+++ src/player.c Sun Jul 10 12:40:48 2011
|
||||
@@ -28,6 +28,7 @@ THE SOFTWARE.
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
@ -14,7 +14,7 @@ Our faad port uses a patched neaacdec.h header
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include "player.h"
|
||||
@@ -185,7 +186,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, s
|
||||
@@ -186,7 +187,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, s
|
||||
/* +1+4 needs to be replaced by <something>! */
|
||||
player->bufferRead += 1+4;
|
||||
char err = NeAACDecInit2 (player->aacHandle, player->buffer +
|
||||
|
||||
Loading…
Reference in New Issue
Block a user