Update to a new snapshot dated 2012-05-02.

Makes pianobar work again, after the umpteenth change to Pandora API. New dependencies: devel/json-c, security/libgcrypt
2012-05-04 10:32:33 +00:00 · 2012-05-04 10:32:33 +00:00 · 7979b67d5f
commit 7979b67d5f
parent 247537a753
5 changed files with 36 additions and 66 deletions
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.34 2012/04/20 08:22:34 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.35 2012/05/04 10:32:33 dcoppa Exp $

 COMMENT =	console client for pandora

-DISTNAME =	pianobar-2012.04.14
+DISTNAME =	pianobar-2012.05.02
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	audio

@ -13,7 +13,7 @@ MASTER_SITES =	http://spacehopper.org/mirrors/

 SHARED_ONLY =	Yes

-SHARED_LIBS =	piano	0.0	# 0.0.0
+SHARED_LIBS =	piano	1.0	# 0.0.0

 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
@ -21,13 +21,14 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes

-WANTLIB =	ao c faad gmp gnutls hogweed iconv intl \
-		m mad nettle p11-kit pthread tasn1 z
+WANTLIB =	ao c faad gcrypt gnutls json m mad pthread

 LIB_DEPENDS =	audio/faad \
 		audio/libao \
 		audio/libmad \
-		security/gnutls>=2.10.0
+		devel/json-c \
+		security/gnutls>=2.10.0 \
+		security/libgcrypt

 CFLAGS +=	-I${LOCALBASE}/include

--- a/audio/pianobar/distinfo
+++ b/audio/pianobar/distinfo
@ -1,5 +1,5 @@
-MD5 (pianobar-2012.04.14.tar.bz2) = EtEu0VK2UIkNzalXRbJ76A==
-RMD160 (pianobar-2012.04.14.tar.bz2) = FKoY76J07Bz1XxE31spQRG/KGsA=
-SHA1 (pianobar-2012.04.14.tar.bz2) = xFbeUkKA/EFYD1TOL9E62oTVchI=
-SHA256 (pianobar-2012.04.14.tar.bz2) = ufV+qXrcFWbRF6oegtkctZKSMQFKbWFpWwe0sLQgRtY=
-SIZE (pianobar-2012.04.14.tar.bz2) = 69280
+MD5 (pianobar-2012.05.02.tar.bz2) = RG9XhUyLDFh/nx72Aqws9Q==
+RMD160 (pianobar-2012.05.02.tar.bz2) = +657ZVZ0mMIvIjsViVHKBcHrfYk=
+SHA1 (pianobar-2012.05.02.tar.bz2) = tzl9AerKg/pDkpeJk14l+IP6m80=
+SHA256 (pianobar-2012.05.02.tar.bz2) = q0kyr/NNC7XYcrgVHctJUU6nwheEWVu8odmLZjaFbHg=
+SIZE (pianobar-2012.05.02.tar.bz2) = 46778
--- a/audio/pianobar/patches/patch-Makefile
+++ b/audio/pianobar/patches/patch-Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.12 2012/01/16 13:27:09 dcoppa Exp $
--- Makefile.orig	Tue Jan 10 22:54:49 2012
-+++ Makefile	Mon Jan 16 13:44:44 2012
+$OpenBSD: patch-Makefile,v 1.13 2012/05/04 10:32:33 dcoppa Exp $
+--- Makefile.orig	Fri May  4 09:29:47 2012
+++ Makefile	Fri May  4 09:39:21 2012
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
 INCDIR:=${PREFIX}/include
 MANDIR:=${PREFIX}/share/man
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.12 2012/01/16 13:27:09 dcoppa Exp $
 PIANOBAR_DIR=src
 PIANOBAR_SRC=\
 		${PIANOBAR_DIR}/main.c \
-@@ -90,47 +83,38 @@ LIBGNUTLS_LDFLAGS=-lgnutls
+@@ -87,50 +80,41 @@ LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
 
 # build pianobar
 ifeq (${DYNLINK},1)
@ -27,55 +27,58 @@ $OpenBSD: patch-Makefile,v 1.12 2012/01/16 13:27:09 dcoppa Exp $
 -	@${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} ${LIBGNUTLS_LDFLAGS}
+ 			${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
+ 			${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS}
 else
 pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
- 		${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR}
+ 		${LIBWAITRESS_HDR}
 -	@echo "  LINK  $@"
 -	@${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
-			${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -lpthread -lm \
+-			${LIBWAITRESS_OBJ} -lao -lpthread -lm \
 +	${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
-+			${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -pthread -lm \
- 			${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} -o $@
+			${LIBWAITRESS_OBJ} -lao -pthread -lm \
+ 			${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
+ 			${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS} -o $@
 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}
+ 		${LIBWAITRESS_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
 -	@echo "  LINK  $@"
-	@${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
+-	@${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} \
+	${CC} -shared ${CFLAGS} ${LDFLAGS} \
+ 			${LIBGNUTLS_LDFLAGS} ${LIBGCRYPT_LDFLAGS} \
 -			-o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \
-+	${CC} -shared ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
 +			-o libpiano.so.${LIBpiano_VERSION} ${LIBPIANO_RELOBJ} \
- 			${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ}
+ 			${LIBWAITRESS_RELOBJ}
 -	@ln -s libpiano.so.0.0.0 libpiano.so.0
 -	@ln -s libpiano.so.0 libpiano.so
 -	@echo "    AR  libpiano.a"
-	@${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
-+	${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
+-	@${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
+	${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
 
 %.o: %.c
 -	@echo "    CC  $<"
 -	@${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
 +	${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
- 			-I ${LIBEZXML_INCLUDE} ${LIBFAAD_CFLAGS} \
- 			${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} -c -o $@ $<
+ 			${LIBFAAD_CFLAGS} ${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} \
+ 			${LIBJSONC_CFLAGS} -c -o $@ $<
 
 # create position independent code (for shared libraries)
 %.lo: %.c
 -	@echo "    CC  $< (PIC)"
 -	@${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
 +	${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
- 			-I ${LIBEZXML_INCLUDE} -c -fPIC -o $@ $<
+ 			${LIBJSONC_CFLAGS} \
+ 			-c -fPIC -o $@ $<
 
 clean:
 -	@echo " CLEAN"
 -	@${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
 +	${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
- 			${LIBEZXML_OBJ} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \
- 			${LIBEZXML_RELOBJ} pianobar libpiano.so* libpiano.a waitress-test
+ 			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} pianobar libpiano.so* \
+ 			libpiano.a waitress-test
 
@@ -177,17 +161,15 @@ else
 install: pianobar
--- a/audio/pianobar/patches/patch-src_libpiano_crypt_c
+++ b/audio/pianobar/patches/patch-src_libpiano_crypt_c
@ -1,14 +0,0 @@
-$OpenBSD: patch-src_libpiano_crypt_c,v 1.2 2012/01/16 13:27:09 dcoppa Exp $
-
-Add missing include
-
--- src/libpiano/crypt.c.orig	Tue Jan 10 22:54:49 2012
-+++ src/libpiano/crypt.c	Mon Jan 16 13:37:35 2012
-@@ -25,6 +25,7 @@ THE SOFTWARE.
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- #include "crypt.h"
--- a/audio/pianobar/patches/patch-src_ui_act_c
+++ b/audio/pianobar/patches/patch-src_ui_act_c
@ -1,20 +0,0 @@
-$OpenBSD: patch-src_ui_act_c,v 1.2 2012/04/21 13:38:47 dcoppa Exp $
-
-Strict pthread implementations (like OpenBSD's rthreads with
-PTHREAD_MUTEX_TYPE_STRICT_NP set) don't allow unlocking a mutex
-that is not locked, resulting in abort() being called. Always
-aquiring the lock before unlocking it while skipping to the next
-song fixes this.
-(upstream git commit bbed23df60c4bfc067b4f7c03574cfe11cc8bb60)
-
--- src/ui_act.c.orig	Fri Apr 20 09:01:59 2012
-+++ src/ui_act.c	Sat Apr 21 15:26:21 2012
-@@ -50,6 +50,8 @@ static inline void BarUiDoSkipSong (struct audioPlayer
- 	assert (player != NULL);
- 
- 	player->doQuit = 1;
-+	/* unlocking an unlocked mutex is forbidden by some implementations */
-+	pthread_mutex_trylock (&player->pauseMutex);
- 	pthread_mutex_unlock (&player->pauseMutex);
- }
-