Attachment 52814 Details for Bug 79970 – file.diff

[patch] file.diff

file.diff (text/plain), 4.33 KB, created by tkato432 on 2005-04-15 17:10:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-04-15 17:10:26 UTC

Size: 4.33 KB

patch

obsolete

>diff -urN /usr/ports/audio/darkice/Makefile audio/darkice/Makefile
>--- /usr/ports/audio/darkice/Makefile	Tue Apr 12 14:01:06 2005
>+++ audio/darkice/Makefile	Fri Apr 15 04:20:01 2005
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	darkice
>-PORTVERSION=	0.14
>+PORTVERSION=	0.15
> CATEGORIES=	audio net
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,21 +15,36 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
> 
>-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
>-		vorbis.3:${PORTSDIR}/audio/libvorbis
>+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
> 
> USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ARGS=	--with-lame-prefix=${LOCALBASE} \
>+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
>+CONFIGURE_ARGS=	--without-alsa \
> 		--with-vorbis-prefix=${LOCALBASE}
> 
> MAN1=		darkice.1
> MAN5=		darkice.cfg.5
> PLIST_FILES=	bin/darkice etc/darkice.cfg
> 
>+.if defined(WITH_LAME)
>+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
>+CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
>+.else
>+CONFIGURE_ARGS+=	--without-lame
>+.endif
>+
>+.if defined(WITH_JACK)
>+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
>+.else
>+CONFIGURE_ARGS+=	--without-jack
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|PTHREAD_CFLAGS=.*$$|PTHREAD_CFLAGS=|g ; \
>+		 s|PTHREAD_LIBS=.*$$|PTHREAD_LIBS=|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/audio/darkice/distinfo audio/darkice/distinfo
>--- /usr/ports/audio/darkice/distinfo	Thu Feb 19 13:49:30 2004
>+++ audio/darkice/distinfo	Fri Apr 15 03:31:44 2005
>@@ -1,2 +1,2 @@
>-MD5 (darkice-0.14.tar.gz) = e196487f376ab29c43277add33be15be
>-SIZE (darkice-0.14.tar.gz) = 337956
>+MD5 (darkice-0.15.tar.gz) = 313470008e387b70745ae2d75d5626c9
>+SIZE (darkice-0.15.tar.gz) = 1181764
>diff -urN /usr/ports/audio/darkice/files/patch-src_JackDspSource.cpp audio/darkice/files/patch-src_JackDspSource.cpp
>--- /usr/ports/audio/darkice/files/patch-src_JackDspSource.cpp	Thu Jan  1 09:00:00 1970
>+++ audio/darkice/files/patch-src_JackDspSource.cpp	Fri Apr 15 04:15:32 2005
>@@ -0,0 +1,32 @@
>+--- src/JackDspSource.cpp.orig	Mon Apr  4 17:36:17 2005
>++++ src/JackDspSource.cpp	Fri Apr 15 04:15:23 2005
>+@@ -38,6 +38,18 @@
>+ #include "config.h"
>+ #endif
>+ 
>++#ifdef HAVE_STDIO_H
>++#include <stdio.h>
>++#else
>++#error need stdio.h
>++#endif
>++
>++#ifdef HAVE_STDLIB_H
>++#include <stdlib.h>
>++#else
>++#error need stdlib.h
>++#endif
>++
>+ #ifdef HAVE_UNISTD_H
>+ #include <unistd.h>
>+ #else
>+@@ -60,6 +72,10 @@
>+ #include <math.h>
>+ #else
>+ #error need math.h
>++#endif
>++
>++#ifdef __FreeBSD__
>++#define lrintf(x) rintf(x)
>+ #endif
>+ 
>+ #include "Util.h"
>diff -urN /usr/ports/audio/darkice/files/patch-src_Makefile.in audio/darkice/files/patch-src_Makefile.in
>--- /usr/ports/audio/darkice/files/patch-src_Makefile.in	Thu Feb 19 13:49:30 2004
>+++ audio/darkice/files/patch-src_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/audio/darkice/files/patch-src_Makefile.in,v 1.4 2004/02/18 16:24:50 krion Exp $
>-
>---- src/Makefile.in.orig	Mon Feb 16 07:33:35 2004
>-+++ src/Makefile.in	Mon Feb 16 18:28:54 2004
>-@@ -80,7 +80,7 @@
>- am__quote = @am__quote@
>- install_sh = @install_sh@
>- bin_PROGRAMS = darkice
>--CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
>-+CXXFLAGS = @CXXFLAGS@ @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
>- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @ALSA_INCFLAGS@
>- LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @ALSA_LDFLAGS@
>- 
>diff -urN /usr/ports/audio/darkice/files/patch-src_OssDspSource.cpp audio/darkice/files/patch-src_OssDspSource.cpp
>--- /usr/ports/audio/darkice/files/patch-src_OssDspSource.cpp	Fri Jan  9 02:21:56 2004
>+++ audio/darkice/files/patch-src_OssDspSource.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,16 +0,0 @@
>---- src/OssDspSource.cpp.orig	Thu Feb 13 00:48:22 2003
>-+++ src/OssDspSource.cpp	Thu Jan  8 12:15:07 2004
>-@@ -86,6 +86,13 @@
>- #error need sys/soundcard.h
>- #endif
>- 
>-+#if !defined(AFMT_S16_NE)
>-+#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
>-+#define AFMT_S16_NE AFMT_S16_BE
>-+#else
>-+#define AFMT_S16_NE AFMT_S16_LE
>-+#endif
>-+#endif
>- 
>- #include "Util.h"
>- #include "Exception.h"

Actions: View | Diff

Attachments on bug 79970: 52814