Update to the latest snapshot from its github repo.

This commit is contained in:
dcoppa 2013-05-17 08:21:48 +00:00
parent df7f866391
commit 0486be19c3
4 changed files with 25 additions and 33 deletions

View File

@ -1,25 +1,25 @@
# $OpenBSD: Makefile,v 1.52 2013/03/10 22:55:05 espie Exp $
# $OpenBSD: Makefile,v 1.53 2013/05/17 08:21:48 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = console client for pandora
DISTNAME = pianobar-2012.12.01
REVISION = 0
DISTNAME = pianobar-2013.05.06
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio
MAINTAINER = David Coppa <dcoppa@openbsd.org>
HOMEPAGE = http://6xq.net/projects/pianobar/
MASTER_SITES = ${HOMEPAGE}
SHARED_LIBS = piano 3.0 # 0.0.0
MASTER_SITES = http://spacehopper.org/mirrors/
SHARED_LIBS = piano 3.1 # 0.0.0
# MIT
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = ao c faad gcrypt gnutls json m mad pthread
WANTLIB = ao c faad gcrypt gnutls json-c m mad pthread
LIB_DEPENDS = audio/faad>=2.7 \
audio/libao \

View File

@ -1,2 +1,2 @@
SHA256 (pianobar-2012.12.01.tar.bz2) = o5CfeW587yGxnZgoLzMuy8+bLGCiryKgos4B6cTZ9RU=
SIZE (pianobar-2012.12.01.tar.bz2) = 50383
SHA256 (pianobar-2013.05.06.tar.bz2) = FfKMrQon+ysmWyWfFUnYwtgQED82cAaCBZ1q1/yHhrQ=
SIZE (pianobar-2013.05.06.tar.bz2) = 50689

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.20 2012/09/18 12:35:03 dcoppa Exp $
--- Makefile.orig Fri Sep 7 16:44:39 2012
+++ Makefile Tue Sep 18 14:16:04 2012
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
$OpenBSD: patch-Makefile,v 1.21 2013/05/17 08:21:48 dcoppa Exp $
--- Makefile.orig Thu May 16 09:41:57 2013
+++ Makefile Thu May 16 11:41:12 2013
@@ -6,20 +6,8 @@ LIBDIR:=${PREFIX}/lib
INCDIR:=${PREFIX}/include
MANDIR:=${PREFIX}/share/man
DYNLINK:=0
@ -12,13 +12,18 @@ $OpenBSD: patch-Makefile,v 1.20 2012/09/18 12:35:03 dcoppa Exp $
- CFLAGS=-O2 -DNDEBUG
-endif
-ifeq (${CC},cc)
- CC=c99
- OS := $(shell uname)
- ifeq (${OS},Darwin)
- CC=gcc -std=c99
- else
- CC=c99
- endif
-endif
-
PIANOBAR_DIR=src
PIANOBAR_SRC=\
PIANOBAR_DIR:=src
PIANOBAR_SRC:=\
${PIANOBAR_DIR}/main.c \
@@ -88,37 +81,31 @@ LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
@@ -93,38 +81,32 @@ LIBJSONC_LDFLAGS:=$(shell pkg-config --libs json-c 2>/
# build pianobar
ifeq (${DYNLINK},1)
@ -27,7 +32,8 @@ $OpenBSD: patch-Makefile,v 1.20 2012/09/18 12:35:03 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 -lpthread -lm -L. -lpiano \
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS}
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
${LIBGCRYPT_LDFLAGS}
else
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
${LIBWAITRESS_HDR}
@ -64,7 +70,7 @@ $OpenBSD: patch-Makefile,v 1.20 2012/09/18 12:35:03 dcoppa Exp $
$(CC) -M ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
${LIBFAAD_CFLAGS} ${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} \
${LIBGCRYPT_CFLAGS} ${LIBJSONC_CFLAGS} $< > $@.$$$$; \
@@ -131,21 +118,18 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LI
@@ -137,21 +119,18 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LI
# build standard object files
%.o: %.c
@ -90,7 +96,7 @@ $OpenBSD: patch-Makefile,v 1.20 2012/09/18 12:35:03 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)
@@ -193,17 +177,15 @@ else
@@ -199,17 +178,15 @@ else
install: pianobar
endif
install -d ${DESTDIR}/${BINDIR}/

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-contrib_config-example,v 1.1 2012/12/31 10:38:17 dcoppa Exp $
Update fingerprint of internal-tuner
(upstream git commit 214050e0567f1d152a001c7dd0ee903c6039ce37)
--- contrib/config-example.orig Mon Dec 31 11:32:47 2012
+++ contrib/config-example Mon Dec 31 11:33:43 2012
@@ -57,5 +57,5 @@
#device = D01
#encrypt_password = 2%3WCL*JU$MP]4
#decrypt_password = U#IO$RZPAB%VX2
-#tls_fingerprint = 394067EECB420E3911985C2CC02C12AE89BB09B2
+#tls_fingerprint = B0A1EB460B1B6F33A1B6CB500C6523CB2E6EC946