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

Update to pianobar-2014.09.28

Browse Source
This commit is contained in:
dcoppa 2014-09-29 09:26:00 +00:00
parent d1487edbe7
commit 2f87c83a51
6 changed files with 36 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/pianobar/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.64 2014/09/02 08:56:23 dcoppa Exp $
# $OpenBSD: Makefile,v 1.65 2014/09/29 09:26:00 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = console client for pandora
DISTNAME = pianobar-2014.06.08
REVISION = 0
DISTNAME = pianobar-2014.09.28
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio
@ -15,7 +14,7 @@ HOMEPAGE = http://6xq.net/projects/pianobar/
MASTER_SITES = ${HOMEPAGE}
SHARED_LIBS = piano 6.0 # 0.0.0
SHARED_LIBS = piano 7.0 # 0.0.0
# MIT
PERMIT_PACKAGE_CDROM = Yes

4
audio/pianobar/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pianobar-2014.06.08.tar.bz2) = M0i0vfqZWbx66wP/b/ZuM0+O/HioQmFVjxj1+9VD7Ss=
SIZE (pianobar-2014.06.08.tar.bz2) = 51215
SHA256 (pianobar-2014.09.28.tar.bz2) = a9ECGK1daMTHYeAscpYn0lgbSm21WRkOflLcXfF35o8=
SIZE (pianobar-2014.09.28.tar.bz2) = 51810

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.24 2014/07/11 16:18:55 dcoppa Exp $
--- Makefile.orig Sun Jun 8 15:26:29 2014
+++ Makefile Fri Jul 11 18:04:01 2014
$OpenBSD: patch-Makefile,v 1.25 2014/09/29 09:26:00 dcoppa Exp $
--- Makefile.orig Sun Sep 28 15:17:29 2014
+++ Makefile Mon Sep 29 11:13:08 2014
@@ -6,24 +6,8 @@ LIBDIR:=${PREFIX}/lib
INCDIR:=${PREFIX}/include
MANDIR:=${PREFIX}/share/man
@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.24 2014/07/11 16:18:55 dcoppa Exp $
PIANOBAR_DIR:=src
PIANOBAR_SRC:=\
${PIANOBAR_DIR}/main.c \
@@ -95,32 +79,26 @@ ALL_LDFLAGS:=${LDFLAGS} -lao -lpthread -lm \
@@ -95,27 +79,21 @@ ALL_LDFLAGS:=${LDFLAGS} -lao -lpthread -lm \
# build pianobar
ifeq (${DYNLINK},1)
@ -60,26 +60,20 @@ $OpenBSD: patch-Makefile,v 1.24 2014/07/11 16:18:55 dcoppa Exp $
+ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
# build dependency files
%.d: %.c
- @set -e; rm -f $@; \
+ set -e; rm -f $@; \
$(CC) -M ${ALL_CFLAGS} $< > $@.$$$$; \
sed '1 s,^.*\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
@@ -131,17 +109,14 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LI
-include $(PIANOBAR_SRC:.c=.d)
@@ -124,17 +102,14 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LI
# build standard object files
%.o: %.c
- @echo " CC $<"
- @${CC} -c -o $@ ${ALL_CFLAGS} $<
+ ${CC} -c -o $@ ${ALL_CFLAGS} $<
- @${CC} -c -o $@ ${ALL_CFLAGS} -MMD -MF $*.d -MP $<
+ ${CC} -c -o $@ ${ALL_CFLAGS} -MMD -MF $*.d -MP $<
# create position independent code (for shared libraries)
%.lo: %.c
- @echo " CC $< (PIC)"
- @${CC} -c -fPIC -o $@ ${ALL_CFLAGS} $<
+ ${CC} -c -fPIC -o $@ ${ALL_CFLAGS} $<
- @${CC} -c -fPIC -o $@ ${ALL_CFLAGS} -MMD -MF $*.d -MP $<
+ ${CC} -c -fPIC -o $@ ${ALL_CFLAGS} -MMD -MF $*.d -MP $<
clean:
- @echo " CLEAN"
@ -88,31 +82,31 @@ $OpenBSD: patch-Makefile,v 1.24 2014/07/11 16:18:55 dcoppa Exp $
${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} pianobar libpiano.so* \
libpiano.a waitress-test $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d) \
$(LIBWAITRESS_SRC:.c=.d)
@@ -159,18 +134,16 @@ install: pianobar install-libpiano
@@ -152,18 +127,16 @@ install: pianobar install-libpiano
else
install: pianobar
endif
- install -d ${DESTDIR}/${BINDIR}/
- install -m755 pianobar ${DESTDIR}/${BINDIR}/
- install -d ${DESTDIR}/${MANDIR}/man1/
- install -m644 contrib/pianobar.1 ${DESTDIR}/${MANDIR}/man1/
+ ${INSTALL_DATA_DIR} ${DESTDIR}/${BINDIR}/
+ ${INSTALL_PROGRAM} pianobar ${DESTDIR}/${BINDIR}/
+ ${INSTALL_DATA_DIR} ${DESTDIR}/${MANDIR}/man1/
+ ${INSTALL_MAN} contrib/pianobar.1 ${DESTDIR}/${MANDIR}/man1/
- install -d ${DESTDIR}${BINDIR}/
- install -m755 pianobar ${DESTDIR}${BINDIR}/
- install -d ${DESTDIR}${MANDIR}/man1/
- install -m644 contrib/pianobar.1 ${DESTDIR}${MANDIR}/man1/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${BINDIR}/
+ ${INSTALL_PROGRAM} pianobar ${DESTDIR}${BINDIR}/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${MANDIR}/man1/
+ ${INSTALL_MAN} contrib/pianobar.1 ${DESTDIR}${MANDIR}/man1/
install-libpiano:
- install -d ${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_DIR} ${DESTDIR}/${LIBDIR}/
+ ${INSTALL_DATA} libpiano.so.${LIBpiano_VERSION} ${DESTDIR}/${LIBDIR}/
+ ${INSTALL_DATA} libpiano.a ${DESTDIR}/${LIBDIR}/
+ ${INSTALL_DATA_DIR} ${DESTDIR}/${INCDIR}/
+ ${INSTALL_DATA} src/libpiano/piano.h ${DESTDIR}/${INCDIR}/
- install -d ${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_DIR} ${DESTDIR}${LIBDIR}/
+ ${INSTALL_DATA} libpiano.so.${LIBpiano_VERSION} ${DESTDIR}${LIBDIR}/
+ ${INSTALL_DATA} libpiano.a ${DESTDIR}${LIBDIR}/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${INCDIR}/
+ ${INSTALL_DATA} src/libpiano/piano.h ${DESTDIR}${INCDIR}/
.PHONY: install install-libpiano test debug all

31
audio/pianobar/patches/patch-src_libpiano_response_c
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_libpiano_response_c,v 1.7 2014/07/11 16:18:55 dcoppa Exp $
commit 597b2ec46a3708d50ab9620d5bb4fdbd19cf8a6c
Author: Lars-Dominik Braun <lars@6xq.net>
Date: Sat Jun 21 12:30:41 2014 +0200
piano: Fix segfault in GET_STATION_INFO response parser
Pandora added two new integer values to the feedback object, which
breaks the assumption that all values are arrays. Since we know the
names of the interesting keys (thumbsUp and thumbsDown) just use them
instead of iterating over all available keys.
--- src/libpiano/response.c.orig Sun Jun 8 15:26:29 2014
+++ src/libpiano/response.c Fri Jul 11 18:11:16 2014
@@ -568,7 +568,14 @@ PianoReturn_t PianoResponse (PianoHandle_t *ph, PianoR
json_object *feedback = json_object_object_get (result,
"feedback");
if (feedback != NULL) {
- json_object_object_foreach (feedback, key, val) {
+ static const char * const keys[] = {"thumbsUp", "thumbsDown"};
+ for (size_t i = 0; i < sizeof (keys)/sizeof (*keys); i++) {
+ json_object * const val = json_object_object_get (feedback,
+ keys[i]);
+ if (val == NULL) {
+ continue;
+ }
+ assert (json_object_is_type (val, json_type_array));
for (int i = 0; i < json_object_array_length (val); i++) {
json_object *s = json_object_array_get_idx (val, i);
PianoSong_t *feedbackSong;

15
audio/pianobar/patches/patch-src_player_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_player_c,v 1.16 2014/09/02 08:56:23 dcoppa Exp $
Fix volume control with newer FFmpeg
--- src/player.c.orig Tue Sep 2 10:52:59 2014
+++ src/player.c Tue Sep 2 10:53:42 2014
@@ -36,7 +36,7 @@ THE SOFTWARE.
* ffmpeg and libav */
#include <libavfilter/version.h>
/* ffmpeg >=2.2 */
-#if LIBAVFILTER_VERSION_MAJOR == 4 && \
+#if LIBAVFILTER_VERSION_MAJOR >= 4 && \
LIBAVFILTER_VERSION_MICRO >= 100
#define HAVE_AVFILTER_GRAPH_SEND_COMMAND
#endif

21
audio/pianobar/patches/patch-src_ui_dispatch_h
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_ui_dispatch_h,v 1.1 2014/07/11 16:18:55 dcoppa Exp $
commit 4cd701c94150ed57b8492490dfea983fd9792f73
Author: Lars-Dominik Braun <lars@6xq.net>
Date: Fri Jun 20 22:25:56 2014 +0200
act_debug's scope is DC_SONG
Fixes segfault reported in #461.
--- src/ui_dispatch.h.orig Sun Jun 8 15:26:29 2014
+++ src/ui_dispatch.h Fri Jul 11 18:11:14 2014
@@ -84,7 +84,7 @@ static const BarUiDispatchAction_t dispatchActions[BAR
"upcoming songs", "act_upcoming"},
{'x', BAR_DC_STATION, BarUiActSelectQuickMix, "select quickmix stations",
"act_stationselectquickmix"},
- {'$', BAR_DC_GLOBAL, BarUiActDebug, NULL, "act_debug"},
+ {'$', BAR_DC_SONG, BarUiActDebug, NULL, "act_debug"},
{'b', BAR_DC_SONG, BarUiActBookmark, "bookmark song/artist",
"act_bookmark"},
{'(', BAR_DC_GLOBAL, BarUiActVolDown, "decrease volume",