I've committed ezstream+libshout.

On 2020/02/27 01:08, Moritz Grimm wrote:
> Tweaked update attached:
> 
> * Switch to new and more concise DESCR
> * Take MAINTAINER
> 
> On 23.02.20 01:14, Moritz Grimm wrote:
> > First maintenance release of a recent feature update. Makes most sense
> > with an update to net/libshout (see separate update submission).
> > 
> > * Supports all the new features of the latest libshout:
> >    * WebM and Matroska formats
> >    * ICY and RoarAudio protocols
> >    * TLS
> > * Major refactoring with many bug fixes and a regression test suite
> > * New configuration file format (comes with configuration migration tool)

> diff --git a/Makefile b/Makefile
> index 5b0f972..93b9dc0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2,20 +2,22 @@
>  
>  COMMENT=     streaming source client that uses external en-/decoders
>  
> -DISTNAME=    ezstream-0.6.0
> -REVISION=    0
> +DISTNAME=    ezstream-1.0.1
>  CATEGORIES=  net multimedia
>  
>  HOMEPAGE=    https://icecast.org/ezstream/
>  
> +MAINTAINER=  Moritz Grimm <[email protected]>
> +
>  # GPLv2
>  PERMIT_PACKAGE=      Yes
>  
> -WANTLIB=     c iconv m ogg pthread theora vorbis \
> -             shout>=3 speex>=4 xml2>=9 tag_c>=1
> +WANTLIB+=    ${COMPILER_LIBCXX} c crypto iconv lzma m ogg shout \
> +             speex ssl tag tag_c theora vorbis xml2 z
>  
>  MASTER_SITES=        https://downloads.xiph.org/releases/ezstream/
>  
> +BUILD_DEPENDS=       devel/check
>  LIB_DEPENDS= converters/libiconv \
>               net/libshout \
>               audio/speex \
> @@ -26,5 +28,7 @@ SEPARATE_BUILD=     Yes
>  
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS+= --with-taglib="${LOCALBASE}"
> +CONFIGURE_ENV+=      CPPFLAGS="-I${LOCALBASE}/include" \
> +             LDFLAGS="-L${LOCALBASE}/lib"
>  
>  .include <bsd.port.mk>
> diff --git a/distinfo b/distinfo
> index 91dcc23..f0d2ff7 100644
> --- a/distinfo
> +++ b/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ezstream-0.6.0.tar.gz) = +G64FjtHDDrLwYK0JAbwgxP4UYe9kBevuLebAvA2Nck=
> -SIZE (ezstream-0.6.0.tar.gz) = 250448
> +SHA256 (ezstream-1.0.1.tar.gz) = /Ev0lIl6ixz3Xc7vsesi69NpZ+XDtc4q+YWNu5TPEVc=
> +SIZE (ezstream-1.0.1.tar.gz) = 512284
> diff --git a/patches/patch-examples_ezstream-full_xml 
> b/patches/patch-examples_ezstream-full_xml
> new file mode 100644
> index 0000000..5d214c5
> --- /dev/null
> +++ b/patches/patch-examples_ezstream-full_xml
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +* Use the OpenBSD CA bundle to verify server identities
> +
> +Index: examples/ezstream-full.xml
> +--- examples/ezstream-full.xml.orig
> ++++ examples/ezstream-full.xml
> +@@ -67,7 +67,7 @@
> +         One of the <ca_dir /> or <ca_file /> settings must be enabled for
> +         certificate verification to succeed.
> +         -->
> +-      <!-- <ca_file>/etc/ssl/certs/ca-certificates.crt</ca_file> -->
> ++      <ca_file>/etc/ssl/cert.pem</ca_file>
> + 
> +       <!--
> +         X.503 client certificate, in PEM format, containing both certificate
> diff --git a/pkg/DESCR b/pkg/DESCR
> index 513e1e5..35f2bec 100644
> --- a/pkg/DESCR
> +++ b/pkg/DESCR
> @@ -1,12 +1,8 @@
> -Ezstream is a command line source client for Icecast media streaming servers.
> +Ezstream is a command line source client for media streams, primarily
> +for streaming to Icecast servers.
>  
> -In its basic mode of operation, it streams media files or data from standard
> -input without reencoding and thus requires only very little CPU resources. It
> -can also use various external decoders and encoders to reencode from one
> -format to another, and stream the result to an Icecast server. Additional
> -features include scriptable playlist and metadata handling. All of its
> -features make ezstream a very flexible source client.
> -
> -Supported media formats for streaming are MP3, Ogg Vorbis and Ogg Theora.
> -Metadata is supported through TagLib, which can read information from many
> -media file formats.
> +It allows the creation of media streams in different formats based on
> +input from files or standard input that is piped through an optional
> +external de- and encoder. As every part of this chain is highly
> +configurable, ezstream can be useful in a large number of streaming
> +setups.
> diff --git a/pkg/PLIST b/pkg/PLIST
> index 665efec..894e35d 100644
> --- a/pkg/PLIST
> +++ b/pkg/PLIST
> @@ -1,21 +1,24 @@
>  @comment $OpenBSD: PLIST,v 1.3 2011/01/16 20:01:22 naddy Exp $
>  @bin bin/ezstream
> +@bin bin/ezstream-cfgmigrate
>  bin/ezstream-file.sh
> +@man man/man1/ezstream-cfgmigrate.1
>  @man man/man1/ezstream-file.sh.1
>  @man man/man1/ezstream.1
>  share/doc/ezstream/
>  @comment share/doc/ezstream/COPYING
>  share/doc/ezstream/NEWS
> -share/doc/ezstream/README
> +share/doc/ezstream/README.md
>  share/examples/ezstream/
> +share/examples/ezstream/artist.txt
>  share/examples/ezstream/ezstream-file_template.xml
> -share/examples/ezstream/ezstream_metadata.xml
> -share/examples/ezstream/ezstream_mp3.xml
> -share/examples/ezstream/ezstream_reencode_mp3.xml
> -share/examples/ezstream/ezstream_reencode_theora.xml
> -share/examples/ezstream/ezstream_reencode_vorbis.xml
> -share/examples/ezstream/ezstream_stdin_vorbis.xml
> -share/examples/ezstream/ezstream_vorbis.xml
> +share/examples/ezstream/ezstream-full.xml
> +share/examples/ezstream/ezstream-metadata.xml
> +share/examples/ezstream/ezstream-minimal.xml
> +share/examples/ezstream/ezstream-stdin.xml
> +share/examples/ezstream/ezstream-video.xml
>  share/examples/ezstream/meta.sh
> +share/examples/ezstream/metadata.txt
>  share/examples/ezstream/play.sh
>  share/examples/ezstream/playlist-logger.sh
> +share/examples/ezstream/title.txt

Reply via email to