Update to pianobar-2011.04.27
This commit is contained in:
dcoppa
parent
3fc575c8db
commit
ae3cdb13ec
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2011/04/21 10:02:09 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2011/05/04 07:48:04 dcoppa Exp $
|
||||
|
||||
COMMENT = console client for pandora
|
||||
|
||||
DISTNAME = pianobar-2011.04.10
|
||||
DISTNAME = pianobar-2011.04.27
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
CATEGORIES = audio
|
||||
|
||||
@ -33,8 +33,8 @@ CFLAGS += -I${LOCALBASE}/include
|
||||
CFLAGS += -DNDEBUG
|
||||
.endif
|
||||
|
||||
MAKE_FLAGS = LIBAO_INCLUDE="${LOCALBASE}/include/ao" \
|
||||
LIBAO_LIB="-L${LOCALBASE}/lib -lao" \
|
||||
MAKE_FLAGS = DYNLINK=1 \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
LIBpiano_VERSION="${LIBpiano_VERSION}" \
|
||||
MANDIR="${PREFIX}/man"
|
||||
|
||||
@ -44,10 +44,8 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \
|
||||
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
|
||||
|
||||
USE_GMAKE = Yes
|
||||
NO_REGRESS = Yes
|
||||
|
||||
ALL_TARGET = pianobar libpiano
|
||||
INSTALL_TARGET =install install-libpiano
|
||||
NO_REGRESS = Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pianobar
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (pianobar-2011.04.10.tar.bz2) = eKUl9ZPL/cCJhOWRJMFMzw==
|
||||
RMD160 (pianobar-2011.04.10.tar.bz2) = MKWCdPkFJ+z5ArHDOtsqg+AihmU=
|
||||
SHA1 (pianobar-2011.04.10.tar.bz2) = iYxLE0AkWQ0+lyPIlHDNFSyrvd4=
|
||||
SHA256 (pianobar-2011.04.10.tar.bz2) = 5c/fAcYKubmfVJPh3wMjBwzMubK+KS0Bbu1HX4FIKS4=
|
||||
SIZE (pianobar-2011.04.10.tar.bz2) = 61154
|
||||
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
|
||||
|
||||
@ -1,38 +1,54 @@
|
||||
$OpenBSD: patch-Makefile,v 1.6 2011/04/21 10:02:09 dcoppa Exp $
|
||||
--- Makefile.orig Thu Apr 21 11:00:24 2011
|
||||
+++ Makefile Thu Apr 21 11:05:07 2011
|
||||
@@ -4,8 +4,7 @@ PREFIX:=/usr/local
|
||||
BINDIR:=${PREFIX}/bin
|
||||
LIBDIR:=${PREFIX}/lib
|
||||
$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
|
||||
INCDIR:=${PREFIX}/include
|
||||
MANDIR:=${PREFIX}/share/man
|
||||
DYNLINK:=0
|
||||
-CFLAGS:=-O2 -DNDEBUG
|
||||
-CC:=c99
|
||||
+CFLAGS+=-std=c99 -fgnu89-inline
|
||||
LDFLAGS:=
|
||||
-CC:=c99
|
||||
|
||||
PIANOBAR_DIR=src
|
||||
PIANOBAR_SRC=\
|
||||
@@ -98,7 +97,7 @@ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_O
|
||||
# build shared libpiano
|
||||
libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
|
||||
${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR}
|
||||
- ${CC} -shared ${CFLAGS} -o $@.so.0.0.0 ${LIBPIANO_RELOBJ} \
|
||||
+ ${CC} -shared ${CFLAGS} -o $@.so.${LIBpiano_VERSION} ${LIBPIANO_RELOBJ} \
|
||||
@@ -82,26 +81,24 @@ endif
|
||||
|
||||
# build pianobar
|
||||
ifeq (${DYNLINK},1)
|
||||
-pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0
|
||||
- ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \
|
||||
+pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.${LIBpiano_VERSION}
|
||||
+ ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -pthread -lm -L. -lpiano \
|
||||
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS}
|
||||
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}
|
||||
endif
|
||||
|
||||
# build shared and static libpiano
|
||||
-libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
|
||||
+libpiano.so.${LIBpiano_VERSION}: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
|
||||
${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR} \
|
||||
${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
||||
- ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} \
|
||||
- -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \
|
||||
+ ${CC} -shared ${CFLAGS} ${LDFLAGS} \
|
||||
+ -o libpiano.so.${LIBpiano_VERSION} ${LIBPIANO_RELOBJ} \
|
||||
${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ}
|
||||
- ln -s libpiano.so.0.0.0 libpiano.so.0
|
||||
- ln -s libpiano.so.0 libpiano.so
|
||||
${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
||||
|
||||
%.o: %.c
|
||||
@@ -114,7 +113,7 @@ libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAIT
|
||||
clean:
|
||||
${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} \
|
||||
${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} pianobar \
|
||||
- libpiano.so.0.0.0
|
||||
+ libpiano.so.${LIBpiano_VERSION}
|
||||
|
||||
all: pianobar libpiano
|
||||
|
||||
@@ -122,12 +121,9 @@ debug: pianobar
|
||||
debug: CFLAGS=-Wall -pedantic -ggdb
|
||||
|
||||
@@ -129,16 +126,10 @@ install: pianobar install-libpiano
|
||||
else
|
||||
install: pianobar
|
||||
endif
|
||||
- install -d ${DESTDIR}/${BINDIR}/
|
||||
- install -m755 pianobar ${DESTDIR}/${BINDIR}/
|
||||
- install -d ${DESTDIR}/${MANDIR}/man1/
|
||||
@ -40,8 +56,14 @@ $OpenBSD: patch-Makefile,v 1.6 2011/04/21 10:02:09 dcoppa Exp $
|
||||
+ ${INSTALL_PROGRAM} pianobar ${DESTDIR}/${BINDIR}/
|
||||
+ ${INSTALL_MAN} contrib/pianobar.1 ${DESTDIR}/${MANDIR}/man1/
|
||||
|
||||
install-libpiano: libpiano
|
||||
install-libpiano:
|
||||
- install -d ${DESTDIR}/${LIBDIR}/
|
||||
- install -m755 libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/
|
||||
- install -m644 libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/
|
||||
- ln -s libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/libpiano.so.0
|
||||
- ln -s libpiano.so.0 ${DESTDIR}/${LIBDIR}/libpiano.so
|
||||
- install -m644 libpiano.a ${DESTDIR}/${LIBDIR}/
|
||||
- install -d ${DESTDIR}/${INCDIR}/
|
||||
- install -m644 src/libpiano/piano.h ${DESTDIR}/${INCDIR}/
|
||||
+ ${INSTALL_DATA} libpiano.so.${LIBpiano_VERSION} ${DESTDIR}/${LIBDIR}/
|
||||
|
||||
+ ${INSTALL_DATA} libpiano.a ${DESTDIR}/${LIBDIR}/
|
||||
+ ${INSTALL_DATA} src/libpiano/piano.h ${DESTDIR}/${INCDIR}/
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-contrib_pianobar_1,v 1.1 2011/04/21 10:02:09 dcoppa Exp $
|
||||
$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 @@
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-src_ui_c,v 1.3 2011/04/21 10:02:09 dcoppa Exp $
|
||||
--- src/ui.c.orig Thu Apr 21 11:08:21 2011
|
||||
+++ src/ui.c Thu Apr 21 11:10:32 2011
|
||||
@@ -62,7 +62,7 @@ static bool isnumeric (const char *s) {
|
||||
|
||||
/* find needle in haystack, ignoring case, and return first position
|
||||
*/
|
||||
-const char *strcasestr (const char *haystack, const char *needle) {
|
||||
+const char *BarStrCaseStr (const char *haystack, const char *needle) {
|
||||
const char *needlePos = needle;
|
||||
|
||||
assert (haystack != NULL);
|
||||
@@ -364,7 +364,7 @@ PianoStation_t *BarUiSelectStation (PianoHandle_t *ph,
|
||||
do {
|
||||
for (i = 0; i < stationCount; i++) {
|
||||
const PianoStation_t *currStation = sortedStations[i];
|
||||
- if (strcasestr (currStation->name, buf) != NULL) {
|
||||
+ if (BarStrCaseStr (currStation->name, buf) != NULL) {
|
||||
BarUiMsg (MSG_LIST, "%2i) %c%c%c %s\n", i,
|
||||
currStation->useQuickMix ? 'q' : ' ',
|
||||
currStation->isQuickMix ? 'Q' : ' ',
|
||||
@@ -443,7 +443,7 @@ PianoArtist_t *BarUiSelectArtist (PianoArtist_t *start
|
||||
i = 0;
|
||||
tmpArtist = startArtist;
|
||||
while (tmpArtist != NULL) {
|
||||
- if (strcasestr (tmpArtist->name, buf) != NULL) {
|
||||
+ if (BarStrCaseStr (tmpArtist->name, buf) != NULL) {
|
||||
BarUiMsg (MSG_LIST, "%2u) %s\n", i, tmpArtist->name);
|
||||
}
|
||||
i++;
|
||||
@@ -653,8 +653,8 @@ size_t BarUiListSongs (const BarSettings_t *settings,
|
||||
|
||||
while (song != NULL) {
|
||||
if (filter == NULL ||
|
||||
- (filter != NULL && (strcasestr (song->artist, filter) != NULL ||
|
||||
- strcasestr (song->title, filter) != NULL))) {
|
||||
+ (filter != NULL && (BarStrCaseStr (song->artist, filter) != NULL ||
|
||||
+ BarStrCaseStr (song->title, filter) != NULL))) {
|
||||
BarUiMsg (MSG_LIST, "%2lu) %s - %s %s%s\n", i, song->artist,
|
||||
song->title,
|
||||
(song->rating == PIANO_RATE_LOVE) ? settings->loveIcon : "",
|
||||
@ -1,5 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2010/07/20 09:47:19 dcoppa Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2011/05/04 07:48:04 dcoppa Exp $
|
||||
@bin bin/pianobar
|
||||
include/piano.h
|
||||
lib/libpiano.a
|
||||
@lib lib/libpiano.so.${LIBpiano_VERSION}
|
||||
@man man/man1/pianobar.1
|
||||
@comment share/doc/pianobar/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user