You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/media-sound/pianobar/files/pianobar-2011.11.09_p1-test...

38 lines
1.2 KiB

--- pianobar-2011.11.09_p1.orig/Makefile
+++ pianobar-2011.11.09_p1/Makefile
@@ -55,10 +55,12 @@
LIBWAITRESS_DIR=src/libwaitress
LIBWAITRESS_SRC=${LIBWAITRESS_DIR}/waitress.c
+LIBWAITRESS_TSRC=${LIBWAITRESS_DIR}/waitress-test.c
LIBWAITRESS_HDR=\
${LIBWAITRESS_DIR}/config.h \
${LIBWAITRESS_DIR}/waitress.h
LIBWAITRESS_OBJ=${LIBWAITRESS_SRC:.c=.o}
+LIBWAITRESS_TOBJ=${LIBWAITRESS_TSRC:.c=.o}
LIBWAITRESS_RELOBJ=${LIBWAITRESS_SRC:.c=.lo}
LIBWAITRESS_INCLUDE=${LIBWAITRESS_DIR}
@@ -133,8 +135,8 @@
debug: CFLAGS=-Wall -pedantic -ggdb
waitress-test: CFLAGS+= -DTEST
-waitress-test: ${LIBWAITRESS_OBJ}
- ${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
+waitress-test: ${LIBWAITRESS_TOBJ}
+ ${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
test: waitress-test
./waitress-test
--- pianobar-2011.11.09_p1.orig/src/libwaitress/waitress.c
+++ pianobar-2011.11.09_p1/src/libwaitress/waitress.c
@@ -1287,7 +1287,7 @@
gnutls_global_init ();
WaitressHandle_t waith;
char *buf;
- WaitressInit (&waith);
+ WaitressInit (&waith, NULL);
WaitressSetUrl (&waith, "http://6xq.net:80/");
printf ("ret: %s\n", WaitressErrorToStr (WaitressFetchBuf (&waith, &buf)));
printf ("%s\n", buf);