cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to ices-2.0.2

Browse Source 
- reformat Makefile to make it readable again
- use correct AUTOCONF_VERSION
- add rc script

ok aja@
This commit is contained in:
jasper 2015-04-15 10:13:21 +00:00
parent a182be0a79
commit 84d9aa303a
10 changed files with 86 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
net/ices2/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2013/03/21 08:46:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2015/04/15 10:13:21 jasper Exp $
COMMENT= icecast source for streaming Ogg Vorbis
DISTNAME= ices-2.0.1
REVISION= 7
DISTNAME= ices-2.0.2
CATEGORIES= net audio
HOMEPAGE= http://www.icecast.org/ices.php
@ -13,21 +12,25 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://downloads.xiph.org/releases/ices/
AUTOCONF_VERSION=2.59
AUTOMAKE_VERSION=1.9
CONFIGURE_STYLE=autoconf automake
CONFIGURE_ARGS= --program-suffix=2 --disable-sun-audio
WANTLIB += c m ogg pthread shout sndio speex theora vorbis vorbisenc
WANTLIB += xml2 z
# Needs AC_PROG_LIBTOOL
BUILD_DEPENDS += devel/libtool
MODULES= converters/libiconv
WANTLIB= c m ogg pthread sndio theora vorbis vorbisenc z \
shout>=3 speex>=4 xml2>=9
LIB_DEPENDS= net/libshout \
audio/speex \
textproc/libxml
MODULES= converters/libiconv
SEPARATE_BUILD= Yes
# Needs AC_PROG_LIBTOOL
BUILD_DEPENDS += devel/libtool
LIB_DEPENDS= audio/speex \
net/libshout \
textproc/libxml
AUTOCONF_VERSION= 2.61
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --program-suffix=2 \
--disable-sun-audio
SEPARATE_BUILD= Yes
post-extract:
cp ${FILESDIR}/im_sndio.{c,h} ${WRKSRC}/src/

4
net/ices2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ices-2.0.1.tar.gz) = uwJ9UKvuXgXSmJQaFz4puyw6blgUZGWFwvV+gOQsVkg=
SIZE (ices-2.0.1.tar.gz) = 412275
SHA256 (ices-2.0.2.tar.gz) = e/epxbzhtkZd+N0UkeMDVEmQAGuO8B+LqO6ziERYiFk=
SIZE (ices-2.0.2.tar.gz) = 446287

15
net/ices2/patches/patch-Makefile_am
View File

@ -1,15 +1,12 @@
$OpenBSD: patch-Makefile_am,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
--- Makefile.am.orig Mon Jan 18 03:48:33 2010
+++ Makefile.am Mon Jan 18 03:49:20 2010
@@ -3,9 +3,9 @@
AUTOMAKE_OPTIONS = foreign 1.6 dist-bzip2
ACLOCAL_AMFLAGS = -I m4
$OpenBSD: patch-Makefile_am,v 1.2 2015/04/15 10:13:21 jasper Exp $
--- Makefile.am.orig Wed Apr 15 11:07:45 2015
+++ Makefile.am Wed Apr 15 11:08:59 2015
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = debian src conf doc
+SUBDIRS = src conf doc
SUBDIRS = src conf doc
-EXTRA_DIST = README AUTHORS COPYING TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4 m4/xiph_compiler.m4 m4/xiph_xml2.m4
+EXTRA_DIST = AUTHORS TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4 m4/xiph_compiler.m4 m4/xiph_xml2.m4
+EXTRA_DIST = AUTHORS COPYING TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4 m4/xiph_compiler.m4 m4/xiph_xml2.m4
# SCCS Definitions (for BitKeeper)
GET = true

8
net/ices2/patches/patch-conf_Makefile_am
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-conf_Makefile_am,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
--- conf/Makefile.am.orig Mon Jan 18 03:49:43 2010
+++ conf/Makefile.am Mon Jan 18 03:51:10 2010
$OpenBSD: patch-conf_Makefile_am,v 1.2 2015/04/15 10:13:21 jasper Exp $
--- conf/Makefile.am.orig Tue Aug 7 00:21:59 2012
+++ conf/Makefile.am Wed Apr 15 11:13:57 2015
@@ -2,5 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-dist_pkgdata_DATA = ices-oss.xml ices-alsa.xml ices-playlist.xml
-dist_pkgdata_DATA = ices-oss.xml ices-alsa.xml ices-playlist.xml ices-roar.xml
+pkgdatadir = $(datadir)/examples/@PACKAGE@2
+
+dist_pkgdata_DATA = ices-sndio.xml ices-playlist.xml

34
net/ices2/patches/patch-configure_in
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-configure_in,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
--- configure.in.orig Mon Jan 18 03:43:35 2010
+++ configure.in Mon Jan 18 03:46:35 2010
@@ -63,6 +63,15 @@ if test "$have_oss" = yes; then
AC_DEFINE(HAVE_OSS,,[Define to enable OSS input module])
fi
$OpenBSD: patch-configure_in,v 1.2 2015/04/15 10:13:21 jasper Exp $
--- configure.in.orig Tue Aug 7 00:22:01 2012
+++ configure.in Wed Apr 15 11:15:31 2015
@@ -73,7 +73,19 @@ fi
AM_CONDITIONAL(HAVE_OSS,test "$have_oss" = yes)
+dnl ================================================================
+dnl Check for sndio
+
+dnl ================================================================
+AC_CHECK_HEADER(sndio.h, have_sndio=yes, have_sndio=no)
+AM_CONDITIONAL(HAVE_SNDIO, test "$have_sndio" = yes)
+if test "$have_sndio" = yes; then
@ -14,14 +16,24 @@ $OpenBSD: patch-configure_in,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
+ AC_DEFINE(HAVE_SNDIO,,[Define to enable sndio input module])
+fi
+
+AM_CONDITIONAL(HAVE_SNDIO,test "$have_sndio" = yes)
+
dnl ================================================================
dnl Check for Sun audio
AC_C_BIGENDIAN
@@ -120,6 +129,7 @@ XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBISENC_LIBS $VORBIS
dnl ================================================================
@@ -173,6 +185,7 @@ XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBISENC_LIBS $VORBIS
dnl Make substitutions
AC_SUBST(ALSA_LIBS)
+AC_SUBST(SNDIO_LIBS)
AC_SUBST(ROARAUDIO_LIBS)
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
AC_SUBST(LIBTOOL_DEPS)
@@ -198,6 +211,7 @@ echo "
Build with alsa: $have_alsa
Build with OSS: $have_oss
+ Build with sndio: $have_sndio
Build with Sun audio: $have_sun_audio
Build with RoarAudio: $have_roaraudio

20
net/ices2/patches/patch-src_Makefile_am
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
--- src/Makefile.am.orig Mon Jan 18 03:42:30 2010
+++ src/Makefile.am Mon Jan 18 03:47:44 2010
$OpenBSD: patch-src_Makefile_am,v 1.2 2015/04/15 10:13:21 jasper Exp $
--- src/Makefile.am.orig Wed Apr 15 11:10:56 2015
+++ src/Makefile.am Wed Apr 15 11:11:45 2015
@@ -14,6 +14,10 @@ if HAVE_OSS
oss = im_oss.c
endif
@ -12,19 +12,19 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
if HAVE_SUN_AUDIO
sun = im_sun.c
endif
@@ -24,13 +28,13 @@ endif
@@ -28,13 +32,13 @@ endif
dist_noinst_HEADERS = cfgparse.h input.h inputmodule.h im_playlist.h signals.h stream.h reencode.h encode.h playlist_basic.h logging.h im_stdinpcm.h event.h stream_shared.h metadata.h audio.h resample.h im_sun.h im_oss.h im_alsa.h
dist_noinst_HEADERS = cfgparse.h input.h inputmodule.h im_playlist.h signals.h stream.h reencode.h encode.h playlist_basic.h logging.h im_stdinpcm.h event.h stream_shared.h metadata.h audio.h resample.h im_sun.h im_oss.h im_alsa.h im_roar.h
-ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa)
+ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sndio) $(sun) $(alsa)
-ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa) $(roar)
+ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa) $(roar) $(sndio)
ices_LDADD = log/libicelog.la \
timing/libicetiming.la \
thread/libicethread.la \
avl/libiceavl.la \
- @ALSA_LIBS@ @XIPH_LIBS@
+ @ALSA_LIBS@ @SNDIO_LIBS@ @XIPH_LIBS@
- @ROARAUDIO_LIBS@ \
+ @ROARAUDIO_LIBS@ @SNDIO_LIBS@ \
@ALSA_LIBS@ @XIPH_LIBS@
debug:
$(MAKE) all CFLAGS="@DEBUG@"

12
net/ices2/patches/patch-src_input_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_c,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
--- src/input.c.orig Mon Jan 18 03:06:33 2010
+++ src/input.c Mon Jan 18 03:08:36 2010
@@ -40,6 +40,10 @@
$OpenBSD: patch-src_input_c,v 1.2 2015/04/15 10:13:21 jasper Exp $
--- src/input.c.orig Tue Aug 7 00:22:01 2012
+++ src/input.c Wed Apr 15 11:13:57 2015
@@ -47,6 +47,10 @@
#include "im_oss.h"
#endif
@ -12,8 +12,8 @@ $OpenBSD: patch-src_input_c,v 1.1 2010/04/23 05:54:26 jakemsr Exp $
#ifdef HAVE_SUN_AUDIO
#include "im_sun.h"
#endif
@@ -79,6 +83,9 @@ static module modules[] = {
{ "stdinpcm", stdin_open_module},
@@ -89,6 +93,9 @@ static module modules[] = {
#endif
#ifdef HAVE_OSS
{ "oss", oss_open_module},
+#endif

16
net/ices2/patches/patch-src_stream_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_stream_c,v 1.2 2006/02/05 15:34:54 alek Exp $
--- src/stream.c.orig Fri Nov 5 20:19:54 2004
+++ src/stream.c Tue Nov 15 16:28:24 2005
@@ -295,9 +295,10 @@ void *ices_instance_stream(void *arg)
stream->reconnect_attempts==-1) &&
!ices_config->shutdown)
{
- i++;
LOG_WARN0("Trying reconnect after server socket error");
- shout_close(sdsc->shout);
+ if(i == 0)
+ shout_close(sdsc->shout);
+ i++;
if((shouterr = shout_open(sdsc->shout)) == SHOUTERR_SUCCESS)
{
LOG_INFO3("Connected to server: %s:%d%s",

5
net/ices2/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2010/04/23 05:54:26 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/04/15 10:13:21 jasper Exp $
@option no-default-conflict
@conflict ices-2.*
@extraunexec rm -rf /var/log/ices/*
@bin bin/ices2
share/doc/ices2/
share/doc/ices2/basic.html
@ -16,3 +17,5 @@ share/examples/ices2/ices-playlist.xml
@sample ${SYSCONFDIR}/ices2.xml
@mode
share/examples/ices2/ices-sndio.xml
@sample /var/log/ices/
@rcscript ${RCDIR}/ices2

12
net/ices2/pkg/ices2.rc Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
#
# $OpenBSD: ices2.rc,v 1.1 2015/04/15 10:13:21 jasper Exp $
daemon="${TRUEPREFIX}/bin/ices2"
daemon_flags="${SYSCONFDIR}/ices2.xml"
. /etc/rc.d/rc.subr
rc_bg=YES
rc_cmd $1