Attachment #65655 for bug #97224

View | Details | Raw Unified | Return to bug 97224
Collapse All | Expand All




#

PORTNAME=	volnorm
PORTVERSION=	0.8.3
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
PKGNAMEPREFIX=	xmms-

MAINTAINER=	ports@FreeBSD.org


LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms

PLIST_FILES=	lib/xmms/Effect/libnormvol.so
USE_X_PREFIX=	yes
USE_GNOME=	gnometarget gtk12
GNU_CONFIGURE=	yes

PLIST_FILES=	lib/xmms/Effect/libnormvol.so

post-patch:
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|tests||g' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e '/^COMMON/s|-O2|@CFLAGS@|g' ${WRKSRC}/src/Makefile.in

do-install:
	${INSTALL_DATA} ${WRKSRC}/src/.libs/libnormvol.so ${PREFIX}/lib/xmms/Effect

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)audio/xmms-volnorm/distinfo (-3 / +3 lines)
1	MD5 (volnorm-0.8.1.tar.gz) = f5d08347e7ff3e23ccdbf664e5f6f901	1	MD5 (volnorm-0.8.3.tar.gz) = 369e6b814143a94ff4d6666734e6af9a
2	SHA256 (volnorm-0.8.1.tar.gz) = 680b3411b5b425673e093f61010b1701c55579536274f23ee924c81577f62ecf	2	SHA256 (volnorm-0.8.3.tar.gz) = 85edb009c82b21759b03b0dc6b9b35a3c6302cb6da09205ef9edb91000b24451
3	SIZE (volnorm-0.8.1.tar.gz) = 254556	3	SIZE (volnorm-0.8.3.tar.gz) = 695631

Lines 1-11 Link Here

(-)audio/xmms-volnorm/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig Fri Aug 17 13:47:34 2001
2	+++ Makefile.in Fri Aug 17 13:47:50 2001
3	@@ -87,7 +87,7 @@
4	XMMS_PATH = @XMMS_PATH@
5	plugindir = @plugindir@
6
7	-SUBDIRS = src tests
8	+SUBDIRS = src
9
10	DISTCLEANFILES = .orig .rej ~ .bak core
11





$FreeBSD: ports/audio/xmms-volnorm/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:56 sobomax Exp $

--- ltmain.sh	2001/08/27 09:51:26	1.1
+++ ltmain.sh	2001/08/27 09:51:42
@@ -2408,6 +2408,9 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
+	  *-*-freebsd*)
+	    # FreeBSD doesn't need this...
+	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"




--- src/Makefile.in.orig	Sun Aug  5 14:11:52 2001
+++ src/Makefile.in	Fri Aug 17 13:24:06 2001
@@ -95,12 +95,12 @@
 libnormvol_la_LDFLAGS = -module -avoid-version
 libnormvol_la_LIBS = @GTK_LIBS@ @PTHREAD_LIBS@ @INTLLIBS@
 
-COMMON_CFLAGS = -O2 -Wall -W 	-I$(top_builddir) -I$(top_srcdir) 	-D_REENTRANT @GTK_CFLAGS@
+COMMON_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@
 
 COMMON_SRC = normvol.c normvol.h smooth.c smooth.h cfg.c cfg.h 	about.c about.h config.h monitor.c monitor.h 	support.c support.h interface.c interface.h callbacks.c callbacks.h
 
 
-CFLAGS = $(COMMON_CFLAGS)
+CFLAGS += $(COMMON_CFLAGS)
 libnormvol_la_SOURCES = $(COMMON_SRC)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h




--- src/normvol.c.orig	Mon Aug  6 01:50:25 2001
+++ src/normvol.c	Tue May  9 18:26:33 2006
@@ -256,8 +256,10 @@
 	/* Add the power level to the smoothing queue */
 	{
 		static const double NORMAL = 1.0/( (double)G_MAXSHORT );
-		static const double NORMAL_SQUARED = NORMAL*NORMAL;
+		static const double NORMAL_SQUARED;
 		double channel_length = 2.0/length;
+
+		NORMAL_SQUARED = NORMAL*NORMAL;
 		
 		for (channel = 0; channel < nch; ++channel) {
 			double level = sum[channel] * channel_length * NORMAL_SQUARED;

Return to bug 97224

Lines 6-15 Link Here

(-)audio/xmms-volnorm/Makefile (-6 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= volnorm	8	PORTNAME= volnorm
9	PORTVERSION= 0.8.1	9	PORTVERSION= 0.8.3
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= http://volnorm.sourceforge.net/	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		13	MASTER_SITE_SUBDIR= ${PORTNAME}
13	PKGNAMEPREFIX= xmms-	14	PKGNAMEPREFIX= xmms-
14		15
15	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
Lines 17-27 Link Here
17		18
18	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms	19	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
19		20
20	PLIST_FILES= lib/xmms/Effect/libnormvol.so
21	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
22	USE_GNOME= gtk12	22	USE_GNOME= gnometarget gtk12
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}	24
25	INSTALLS_SHLIB= yes	25	PLIST_FILES= lib/xmms/Effect/libnormvol.so
		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e '/^SUBDIRS/s\|tests\|\|g' ${WRKSRC}/Makefile.in
		29	@${REINPLACE_CMD} -e '/^COMMON/s\|-O2\|@CFLAGS@\|g' ${WRKSRC}/src/Makefile.in
		30
		31	do-install:
		32	${INSTALL_DATA} ${WRKSRC}/src/.libs/libnormvol.so ${PREFIX}/lib/xmms/Effect
26		33
27	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)audio/xmms-volnorm/files/patch-ltmain.sh (-28 lines)
1
2	$FreeBSD: ports/audio/xmms-volnorm/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:56 sobomax Exp $
3
4	--- ltmain.sh 2001/08/27 09:51:26 1.1
5	+++ ltmain.sh 2001/08/27 09:51:42
6	@@ -2408,6 +2408,9 @@
7	--netbsd*)
8	# Don't link with libc until the a.out ld.so is fixed.
9	;;
10	+ --freebsd*)
11	+ # FreeBSD doesn't need this...
12	+ ;;
13	*)
14	# Add libc to deplibs on all other systems if necessary.
15	if test "$build_libtool_need_lc" = "yes"; then
16	@@ -4175,10 +4178,12 @@
17	fi
18
19	# Install the pseudo-library for information purposes.
20	+ if /usr/bin/false; then
21	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
22	instname="$dir/$name"i
23	$show "$install_prog $instname $destdir/$name"
24	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
25	+ fi
26
27	# Maybe install the static library, too.
28	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-17 Link Here

(-)audio/xmms-volnorm/files/patch-src::Makefile.in (-17 lines)
1	--- src/Makefile.in.orig Sun Aug 5 14:11:52 2001
2	+++ src/Makefile.in Fri Aug 17 13:24:06 2001
3	@@ -95,12 +95,12 @@
4	libnormvol_la_LDFLAGS = -module -avoid-version
5	libnormvol_la_LIBS = @GTK_LIBS@ @PTHREAD_LIBS@ @INTLLIBS@
6
7	-COMMON_CFLAGS = -O2 -Wall -W -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@
8	+COMMON_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@
9
10	COMMON_SRC = normvol.c normvol.h smooth.c smooth.h cfg.c cfg.h about.c about.h config.h monitor.c monitor.h support.c support.h interface.c interface.h callbacks.c callbacks.h
11
12
13	-CFLAGS = $(COMMON_CFLAGS)
14	+CFLAGS += $(COMMON_CFLAGS)
15	libnormvol_la_SOURCES = $(COMMON_SRC)
16	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17	CONFIG_HEADER = config.h

Line 0 Link Here

(-)audio/xmms-volnorm/files/patch-src__normvol.c (+14 lines)
	1	--- src/normvol.c.orig Mon Aug 6 01:50:25 2001
	2	+++ src/normvol.c Tue May 9 18:26:33 2006
	3	@@ -256,8 +256,10 @@
	4	/* Add the power level to the smoothing queue */
	5	{
	6	static const double NORMAL = 1.0/( (double)G_MAXSHORT );
	7	- static const double NORMAL_SQUARED = NORMAL*NORMAL;
	8	+ static const double NORMAL_SQUARED;
	9	double channel_length = 2.0/length;
	10	+
	11	+ NORMAL_SQUARED = NORMAL*NORMAL;
	12
	13	for (channel = 0; channel < nch; ++channel) {
	14	double level = sum[channel] * channel_length * NORMAL_SQUARED;