[150456] trunk/dports/audio/pianobar
ryandesign at macports.org
ryandesign at macports.org
Tue Jul 19 04:58:02 PDT 2016
Revision: 150456
https://trac.macports.org/changeset/150456
Author: ryandesign at macports.org
Date: 2016-07-19 04:58:02 -0700 (Tue, 19 Jul 2016)
Log Message:
-----------
pianobar: update to 2016.06.02 and dynamically link to libpiano (#51565; maintainer timeout)
Modified Paths:
--------------
trunk/dports/audio/pianobar/Portfile
trunk/dports/audio/pianobar/files/patch-Makefile.diff
Removed Paths:
-------------
trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff
trunk/dports/audio/pianobar/files/patch-src-main.c.diff
Modified: trunk/dports/audio/pianobar/Portfile
===================================================================
--- trunk/dports/audio/pianobar/Portfile 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/Portfile 2016-07-19 11:58:02 UTC (rev 150456)
@@ -4,8 +4,7 @@
PortSystem 1.0
PortGroup github 1.0
-github.setup PromyLOPh pianobar 2015.11.22
-revision 2
+github.setup PromyLOPh pianobar 2016.06.02
categories audio
platforms darwin
maintainers gmail.com:aguynamedryan+pianobar
@@ -21,8 +20,8 @@
configure keybindings, last.fm scrobbling, \
proxy support for listening outside of USA.
-checksums rmd160 375d9a1a4a8a879df98affe9ed063d779f7b822e \
- sha256 120f34fa70c34c12194b7c350952c9d5fd706b820bdd49cb139dabe785499bc9
+checksums rmd160 949a4991e8935f53c943eaca7ca932eddce27bc8 \
+ sha256 be02852ad04767604b56742f3ae8208ff6032d2fb3d792c3b80b735c203eeaba
depends_build port:pkgconfig
@@ -32,13 +31,6 @@
port:libgcrypt \
port:json-c
-post-patch {
- # Disable silent rules.
- # https://github.com/PromyLOPh/pianobar/issues/571
- reinplace -E "s/^(\t+)@(\\\$\{)/\\1\\2/" ${worksrcpath}/Makefile
- reinplace -E "/^\t+ at echo \" /d" ${worksrcpath}/Makefile
-}
-
configure.cflags-append -std=c99
# Prevent upgrade failure.
@@ -49,12 +41,18 @@
variant universal {}
build.args CC="${configure.cc} [get_canonical_archflags cc]" \
+ DYNLINK=1 \
PREFIX=${prefix} \
CFLAGS="${configure.cflags} ${configure.cppflags}" \
- LDFLAGS="${configure.ldflags}"
+ LDFLAGS="${configure.ldflags}" \
+ V=1
destroot.args PREFIX=${prefix}
+if {${subport} eq ${name}} {
+ depends_lib-append port:libpiano
+}
+
subport libpiano {
depends_lib-append port:gnutls
build.target libpiano.so.0
Modified: trunk/dports/audio/pianobar/files/patch-Makefile.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-Makefile.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-Makefile.diff 2016-07-19 11:58:02 UTC (rev 150456)
@@ -1,41 +1,41 @@
---- Makefile.orig 2015-11-22 04:31:27.000000000 -0800
-+++ Makefile 2016-01-27 15:18:12.000000000 -0800
-@@ -71,7 +71,7 @@
+--- Makefile.orig 2016-06-02 01:49:26.000000000 -0500
++++ Makefile 2016-06-05 00:35:18.000000000 -0500
+@@ -79,7 +79,7 @@
# build pianobar
ifeq (${DYNLINK},1)
-pianobar: ${PIANOBAR_OBJ} libpiano.so.0
+pianobar: ${PIANOBAR_OBJ} libpiano.0.dylib
- @echo " LINK $@"
- @${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
+ ${SILENTECHO} " LINK $@"
+ ${SILENTCMD}${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
else
-@@ -81,12 +81,12 @@
+@@ -89,12 +89,12 @@
endif
# build shared and static libpiano
-libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
+libpiano.0.dylib: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
- @echo " LINK $@"
-- @${CC} -shared -Wl,-soname,libpiano.so.0 -o libpiano.so.0.0.0 \
-+ @${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib -o libpiano.0.0.0.dylib \
+ ${SILENTECHO} " LINK $@"
+- ${SILENTCMD}${CC} -shared -Wl,-soname,libpiano.so.0 -o libpiano.so.0.0.0 \
++ ${SILENTCMD}${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib -o libpiano.0.0.0.dylib \
${LIBPIANO_RELOBJ} ${ALL_LDFLAGS}
-- @ln -fs libpiano.so.0.0.0 libpiano.so.0
-- @ln -fs libpiano.so.0 libpiano.so
-+ @ln -fs libpiano.0.0.0.dylib libpiano.0.dylib
-+ @ln -fs libpiano.0.dylib libpiano.dylib
- @echo " AR libpiano.a"
- @${AR} rcs libpiano.a ${LIBPIANO_OBJ}
+- ${SILENTCMD}ln -fs libpiano.so.0.0.0 libpiano.so.0
+- ${SILENTCMD}ln -fs libpiano.so.0 libpiano.so
++ ${SILENTCMD}ln -fs libpiano.0.0.0.dylib libpiano.0.dylib
++ ${SILENTCMD}ln -fs libpiano.0.dylib libpiano.dylib
+ ${SILENTECHO} " AR libpiano.a"
+ ${SILENTCMD}${AR} rcs libpiano.a ${LIBPIANO_OBJ}
-@@ -107,7 +107,7 @@
+@@ -115,7 +115,7 @@
clean:
- @echo " CLEAN"
- @${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
+ ${SILENTECHO} " CLEAN"
+ ${SILENTCMD}${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
- ${LIBPIANO_RELOBJ} pianobar libpiano.so* \
+ ${LIBPIANO_RELOBJ} pianobar libpiano*.dylib \
libpiano.a $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d)
all: pianobar
-@@ -124,9 +124,9 @@
+@@ -132,9 +132,9 @@
install-libpiano:
install -d ${DESTDIR}${LIBDIR}/
Deleted: trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff 2016-07-19 11:58:02 UTC (rev 150456)
@@ -1,19 +0,0 @@
---- src/libpiano/piano.c.orig 2012-04-27 07:52:09.000000000 -0700
-+++ src/libpiano/piano.c 2012-04-27 07:52:24.000000000 -0700
-@@ -42,7 +42,7 @@
- #include "crypt.h"
- #include "config.h"
-
--#define PIANO_PROTOCOL_VERSION "33"
-+#define PIANO_PROTOCOL_VERSION "34"
- #define PIANO_RPC_HOST "www.pandora.com"
- #define PIANO_RPC_PORT "80"
- #define PIANO_RPC_PATH "/radio/xmlrpc/v" PIANO_PROTOCOL_VERSION "?"
-@@ -272,6 +272,7 @@
- "<?xml version=\"1.0\"?><methodCall>"
- "<methodName>listener.authenticateListener</methodName>"
- "<params><param><value><int>%lu</int></value></param>"
-+ "<param><value><string></string></value></param>"
- /* user */
- "<param><value><string>%s</string></value></param>"
- /* password */
Deleted: trunk/dports/audio/pianobar/files/patch-src-main.c.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-src-main.c.diff 2016-07-19 11:51:13 UTC (rev 150455)
+++ trunk/dports/audio/pianobar/files/patch-src-main.c.diff 2016-07-19 11:58:02 UTC (rev 150456)
@@ -1,35 +0,0 @@
---- src/main.c.orig 2012-04-27 07:52:18.000000000 -0700
-+++ src/main.c 2012-04-27 07:52:24.000000000 -0700
-@@ -77,10 +77,31 @@
- WaitressReturn_t wRet;
- PianoRequestDataLogin_t reqData;
- bool ret;
-+ WaitressHandle_t waithSync;
-+ char *syncTime;
-+ unsigned long int syncTimeInt;
-+
-+ /* skip sync step by fetching time from somewhere else */
-+ WaitressInit (&waithSync);
-+ WaitressSetUrl (&waithSync, "http://ridetheclown.com/s2/synctime.php");
-+ if (app->settings.proxy != NULL && strlen (app->settings.proxy) > 0) {
-+ WaitressSetProxy (&waithSync, app->settings.proxy);
-+ }
-+ wRet = WaitressFetchBuf (&waithSync, &syncTime);
-+ WaitressFree (&waithSync);
-+ if (wRet != WAITRESS_RET_OK) {
-+ BarUiMsg (&app->settings, MSG_ERR, "Unable to sync: %s\n",
-+ WaitressErrorToStr (wRet));
-+ return false;
-+ }
-+
-+ syncTimeInt = strtoul (syncTime, NULL, 0);
-+ app->ph.timeOffset = time (NULL) - syncTimeInt;
-+ free (syncTime);
-
- reqData.user = app->settings.username;
- reqData.password = app->settings.password;
-- reqData.step = 0;
-+ reqData.step = 1;
-
- BarUiMsg (&app->settings, MSG_INFO, "Login... ");
- ret = BarUiPianoCall (app, PIANO_REQUEST_LOGIN, &reqData, &pRet, &wRet);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160719/ddfb12d0/attachment-0001.html>
More information about the macports-changes
mailing list