Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2019 16:33:58 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r501387 - in head/audio/libshout: . files
Message-ID:  <201905121633.x4CGXw1L008714@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun May 12 16:33:58 2019
New Revision: 501387
URL: https://svnweb.freebsd.org/changeset/ports/501387

Log:
  Update to 2.4.2
  
  Changes:	https://icecast.org/news/libshout-release-2_4_2/

Modified:
  head/audio/libshout/Makefile
  head/audio/libshout/distinfo
  head/audio/libshout/files/patch-src-tls.c
  head/audio/libshout/pkg-plist

Modified: head/audio/libshout/Makefile
==============================================================================
--- head/audio/libshout/Makefile	Sun May 12 16:31:02 2019	(r501386)
+++ head/audio/libshout/Makefile	Sun May 12 16:33:58 2019	(r501387)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libshout
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	audio net
 MASTER_SITES=	https://downloads.xiph.org/releases/libshout/ \
 		https://svn.xiph.org/releases/libshout/ \
@@ -27,8 +27,6 @@ INSTALL_TARGET=	install-strip
 LDFLAGS+=	-lcrypto
 USE_LDCONFIG=	yes
 
-PORTDOCS=	*
-
 SPEEX_CONFIGURE_ENABLE=	speex
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 THEORA_CONFIGURE_ENABLE=theora
@@ -36,8 +34,7 @@ THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^DATA = / s| $$(ckport_DATA)||; /^install-data-am:/ s| install-ckportDATA||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-ffast-math||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|^Requires: |Requires.private: |' ${WRKSRC}/shout.pc.in
+	@${REINPLACE_CMD} -e 's| -ffast-math||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in
 	@${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/common/net/sock.c
 

Modified: head/audio/libshout/distinfo
==============================================================================
--- head/audio/libshout/distinfo	Sun May 12 16:31:02 2019	(r501386)
+++ head/audio/libshout/distinfo	Sun May 12 16:33:58 2019	(r501387)
@@ -1,2 +1,3 @@
-SHA256 (libshout-2.4.1.tar.gz) = f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d
-SIZE (libshout-2.4.1.tar.gz) = 516161
+TIMESTAMP = 1557673776
+SHA256 (libshout-2.4.2.tar.gz) = d51ba4003ca2b81669d37430beaa584e868fe46f46b7a6fef0d25c717156fc61
+SIZE (libshout-2.4.2.tar.gz) = 519249

Modified: head/audio/libshout/files/patch-src-tls.c
==============================================================================
--- head/audio/libshout/files/patch-src-tls.c	Sun May 12 16:31:02 2019	(r501386)
+++ head/audio/libshout/files/patch-src-tls.c	Sun May 12 16:33:58 2019	(r501387)
@@ -1,18 +1,18 @@
---- src/tls.c.orig	2015-06-18 04:27:45 UTC
+--- src/tls.c.orig	2019-04-29 10:00:11 UTC
 +++ src/tls.c
-@@ -63,10 +63,15 @@ static inline int tls_setup(shout_tls_t 
+@@ -88,10 +88,15 @@ static inline int tls_setup(shout_tls_t 
  {
- 	SSL_METHOD *meth;
+     SSL_METHOD *meth;
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	SSL_library_init();
- 	SSL_load_error_strings();
- 	SSLeay_add_all_algorithms();
-  	SSLeay_add_ssl_algorithms();
+     SSL_library_init();
+     SSL_load_error_strings();
+     SSLeay_add_all_algorithms();
+     SSLeay_add_ssl_algorithms();
 +#else
-+	OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
-+	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
++    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
++    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 +#endif
  
- 	meth = TLSv1_client_method();
- 	if (!meth)
+     meth = TLSv1_client_method();
+     if (!meth)

Modified: head/audio/libshout/pkg-plist
==============================================================================
--- head/audio/libshout/pkg-plist	Sun May 12 16:31:02 2019	(r501386)
+++ head/audio/libshout/pkg-plist	Sun May 12 16:33:58 2019	(r501387)
@@ -5,3 +5,8 @@ lib/libshout.so.3
 lib/libshout.so.3.2.0
 libdata/pkgconfig/shout.pc
 share/aclocal/shout.m4
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/example.c
+%%PORTDOCS%%%%DOCSDIR%%/nonblocking.c



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905121633.x4CGXw1L008714>