[129671] trunk/dports/audio/pianobar

ryandesign at macports.org ryandesign at macports.org
Thu Dec 18 13:05:21 PST 2014


Revision: 129671
          https://trac.macports.org/changeset/129671
Author:   ryandesign at macports.org
Date:     2014-12-18 13:05:20 -0800 (Thu, 18 Dec 2014)
Log Message:
-----------
pianobar: update to 2014.09.28 (#46190; maintainer timeout)

Modified Paths:
--------------
    trunk/dports/audio/pianobar/Portfile
    trunk/dports/audio/pianobar/files/patch-Makefile.diff

Modified: trunk/dports/audio/pianobar/Portfile
===================================================================
--- trunk/dports/audio/pianobar/Portfile	2014-12-18 20:20:51 UTC (rev 129670)
+++ trunk/dports/audio/pianobar/Portfile	2014-12-18 21:05:20 UTC (rev 129671)
@@ -4,8 +4,7 @@
 PortSystem                  1.0
 PortGroup                   github 1.0
 
-github.setup                PromyLOPh pianobar 2013.09.15
-revision                    3
+github.setup                PromyLOPh pianobar 2014.09.28
 categories                  audio
 platforms                   darwin
 maintainers                 gmail.com:aguynamedryan+pianobar
@@ -21,20 +20,21 @@
                             configure keybindings, last.fm scrobbling, \
                             proxy support for listening outside of USA.
 
-checksums                   rmd160  553ccf96604958e3652207dbc4be62fa78d6fe10 \
-                            sha256  2f7a8bcf15c77f2e60dc387152d019bafd769636057bdde87c63ac52d77f0176
+checksums                   rmd160  010e3643641b2d4cbbb0223c1ae37f864a8d6a21 \
+                            sha256  7ddc7a651f0185451f7c457dcb9587c445d1a738a620bc16fb358f68f8938d2b
 
 depends_build               port:pkgconfig
 
-depends_lib                 port:gnutls \
+depends_lib                 path:lib/libavcodec.dylib:ffmpeg \
+                            port:gnutls \
+                            port:libao \
                             port:libgcrypt \
                             port:json-c
 
 configure.cflags-append     -std=c99
 
 # Prevent upgrade failure.
-configure.cppflags-append   -isystem${prefix}/include
-configure.cppflags-delete   -I${prefix}/include
+configure.cppflags-replace  -I${prefix}/include -isystem${prefix}/include
 
 use_configure               no
 
@@ -47,12 +47,6 @@
 
 destroot.args               PREFIX=${prefix}
 
-if {${subport} eq ${name}} {
-    depends_lib-append      port:faad2 \
-                            port:libao \
-                            port:libmad
-}
-
 subport libpiano {
     build.target            libpiano.so.0
     destroot.target         install-libpiano

Modified: trunk/dports/audio/pianobar/files/patch-Makefile.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-Makefile.diff	2014-12-18 20:20:51 UTC (rev 129670)
+++ trunk/dports/audio/pianobar/files/patch-Makefile.diff	2014-12-18 21:05:20 UTC (rev 129671)
@@ -1,15 +1,15 @@
---- Makefile.orig	2012-12-01 11:03:23.000000000 -0600
-+++ Makefile	2012-12-05 17:48:29.000000000 -0600
-@@ -88,7 +88,7 @@
+--- Makefile.orig	2014-09-28 08:17:29.000000000 -0500
++++ Makefile	2014-12-18 14:29:33.000000000 -0600
+@@ -95,7 +95,7 @@
  
  # build pianobar
  ifeq (${DYNLINK},1)
 -pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0
 +pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.0.dylib
  	@echo "  LINK  $@"
- 	@${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \
- 			${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS}
-@@ -103,15 +103,15 @@
+ 	@${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
+ else
+@@ -107,13 +107,13 @@
  endif
  
  # build shared and static libpiano
@@ -17,12 +17,9 @@
 +libpiano.0.dylib: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
  		${LIBWAITRESS_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
  	@echo "  LINK  $@"
--	@${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} \
--			-o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \
-+	@${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib ${CFLAGS} ${LDFLAGS} \
-+			-o libpiano.0.0.0.dylib ${LIBPIANO_RELOBJ} \
- 			${LIBWAITRESS_RELOBJ} ${LIBGNUTLS_LDFLAGS} ${LIBGCRYPT_LDFLAGS} \
- 			${LIBJSONC_LDFLAGS}
+-	@${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 \
+ 			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} ${ALL_LDFLAGS}
 -	@ln -s libpiano.so.0.0.0 libpiano.so.0
 -	@ln -s libpiano.so.0 libpiano.so
 +	@ln -s libpiano.0.0.0.dylib libpiano.0.dylib
@@ -30,7 +27,7 @@
  	@echo "    AR  libpiano.a"
  	@${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
  
-@@ -146,7 +146,7 @@
+@@ -135,7 +135,7 @@
  clean:
  	@echo " CLEAN"
  	@${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
@@ -39,16 +36,16 @@
  			libpiano.a waitress-test $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d) \
  			$(LIBWAITRESS_SRC:.c=.d)
  
-@@ -199,9 +199,9 @@
+@@ -159,9 +159,9 @@
  
  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.0.0.0.dylib ${DESTDIR}/${LIBDIR}/
-+	ln -s libpiano.0.0.0.dylib ${DESTDIR}/${LIBDIR}/libpiano.0.dylib
-+	ln -s libpiano.0.dylib ${DESTDIR}/${LIBDIR}/libpiano.dylib
- 	install -m644 libpiano.a ${DESTDIR}/${LIBDIR}/
- 	install -d ${DESTDIR}/${INCDIR}/
- 	install -m644 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.0.0.0.dylib ${DESTDIR}${LIBDIR}/
++	ln -s libpiano.0.0.0.dylib ${DESTDIR}${LIBDIR}/libpiano.0.dylib
++	ln -s libpiano.0.dylib ${DESTDIR}${LIBDIR}/libpiano.dylib
+ 	install -m644 libpiano.a ${DESTDIR}${LIBDIR}/
+ 	install -d ${DESTDIR}${INCDIR}/
+ 	install -m644 src/libpiano/piano.h ${DESTDIR}${INCDIR}/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141218/d4df3b09/attachment.html>


More information about the macports-changes mailing list