Attachment #145392 for bug #192402

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




# $FreeBSD: head/audio/musepack/Makefile 342450 2014-02-03 14:31:32Z miwi $

PORTNAME=	musepack
PORTVERSION=	2011.08.10
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	http://files.musepack.net/source/
DISTNAME=	${PORTNAME}_src_r475

MAINTAINER=	shoesoft@gmx.net
COMMENT=	Decoder, encoder, and replaygain for musepack (mpc)

USE_LDCONFIG=	yes
USE_AUTOTOOLS=	aclocal autoheader libtoolize automake autoconf
USES=	libtool:oldver
ACLOCAL_ARGS=	-I. -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS=	--add-missing


Lines 1-2 Link Here

(-)musepack/distinfo (-2 / +2 lines)
1	SHA256 (musepack_src_r435.tar.gz) = 9fc1f4d0a88560590f377a3194a4b9b597966c9df91283aa7136fd3b120e43b2	1	SHA256 (musepack_src_r475.tar.gz) = a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b
2	SIZE (musepack_src_r435.tar.gz) = 194149	2	SIZE (musepack_src_r475.tar.gz) = 188737

Lines 1-7 Link Here

(-)musepack/files/patch-Makefile.am (-7 lines)
1	--- Makefile.am.orig 2008-03-25 15:31:41.000000000 +0100
2	+++ Makefile.am 2010-05-16 18:04:14.000000000 +0200
3	@@ -1,3 +1,3 @@
4	AUTOMAKE_OPTIONS = foreign
5	SUBDIRS = include libmpcdec libmpcenc libmpcpsy libwavformat mpcenc mpc2sv8 \
6	- mpcchap mpccut mpcdec mpcgain wavcmp
7	+ mpccut mpcdec wavcmp




--- configure.in.orig	2014-08-04 08:34:39.000000000 +0200
+++ configure.in	2014-08-04 08:35:20.000000000 +0200
@@ -30,7 +30,8 @@
 AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes])
 
 
-CHECK_VISIBILITY
+gl_VISIBILITY
+AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" = x1])
 
 AC_CONFIG_FILES([
 Makefile




--- ./libmpcenc/encode_sv7.c.orig	2009-02-23 19:15:46.000000000 +0100
+++ ./libmpcenc/encode_sv7.c	2010-05-16 17:59:52.000000000 +0200
@@ -24,6 +24,8 @@
 #include "libmpcenc.h"
 #include <mpc/minimax.h>
 
+#define log2(x)             ( log (x) * (1./M_LN2) )
+
 void Klemm ( void );
 void Init_Skalenfaktoren ( void );
 
@@ -437,11 +439,11 @@
 			total_cnt += sym[j][i].Count;
 			total_size += sym[j][i].Count * sym[j][i].Bits;
 			if (sym[j][i].Count != 0)
-				optim_size += sym[j][i].Count * __builtin_log2(sym[j][i].Count);
+				optim_size += sym[j][i].Count * log2(sym[j][i].Count);
 		}
 		full_count += total_cnt;
 		full_size += total_size;
-		optim_size = total_cnt * __builtin_log2(total_cnt) - optim_size;
+		optim_size = total_cnt * log2(total_cnt) - optim_size;
 		full_optim += optim_size;
 		size[j] = total_size;
 		cnt[j] = total_cnt;




--- ./common/huffman-bcl.c.orig	2007-03-17 00:25:28.000000000 +0100
+++ ./common/huffman-bcl.c	2010-05-16 18:01:56.000000000 +0200
@@ -30,9 +30,12 @@
 * marcus.geelnard at home.se
 *************************************************************************/
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#define log2(x)             ( log (x) * (1./M_LN2) )
+
 typedef struct {
     int Symbol;
     unsigned int Count;
@@ -265,9 +268,9 @@
 				total_cnt += sym[i].Count;
 				total_size += sym[i].Count * sym[i].Bits;
 				if (sym[i].Count != 0)
-					optim_size += sym[i].Count * __builtin_log2(sym[i].Count);
+					optim_size += sym[i].Count * log2(sym[i].Count);
 			}
-			optim_size = total_cnt * __builtin_log2(total_cnt) - optim_size;
+			optim_size = total_cnt * log2(total_cnt) - optim_size;
 			printf("\ncount : %u huff : %f bps ", total_cnt, (float)total_size / total_cnt);
 			printf("opt : %f bps ", (float)optim_size / total_cnt);
 			printf("loss : %f bps (%f %%)\n", (float)(total_size - optim_size) / total_cnt, (float)(total_size - optim_size) * 100 / optim_size);

Return to bug 192402

Lines 2-18 Link Here

(-)musepack/Makefile (-4 / +4 lines)
2	# $FreeBSD: head/audio/musepack/Makefile 342450 2014-02-03 14:31:32Z miwi $	2	# $FreeBSD: head/audio/musepack/Makefile 342450 2014-02-03 14:31:32Z miwi $
3		3
4	PORTNAME= musepack	4	PORTNAME= musepack
5	PORTVERSION= 2009.03.01	5	PORTVERSION= 2011.08.10
6	PORTREVISION= 1
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= http://files.musepack.net/source/	7	MASTER_SITES= http://files.musepack.net/source/
9	DISTNAME= ${PORTNAME}_src_r435	8	DISTNAME= ${PORTNAME}_src_r475
10		9
11	MAINTAINER= shoesoft@gmx.net	10	MAINTAINER= shoesoft@gmx.net
12	COMMENT= Decoder, encoder, and replaygain for musepack (mpc)	11	COMMENT= Decoder, encoder, and replaygain for musepack (mpc)
13		12
14	USE_LDCONFIG= yes	13	USE_LDCONFIG= yes
15	USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf libtool	14	USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf
		15	USES= libtool:oldver
16	ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal	16	ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal
17	AUTOMAKE_ARGS= --add-missing	17	AUTOMAKE_ARGS= --add-missing
18		18

Line 0 Link Here

(-)musepack/files/patch-configure.in (+12 lines)
	1	--- configure.in.orig 2014-08-04 08:34:39.000000000 +0200
	2	+++ configure.in 2014-08-04 08:35:20.000000000 +0200
	3	@@ -30,7 +30,8 @@
	4	AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes])
	5
	6
	7	-CHECK_VISIBILITY
	8	+gl_VISIBILITY
	9	+AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" = x1])
	10
	11	AC_CONFIG_FILES([
	12	Makefile

Lines 1-25 Link Here

(-)musepack/files/patch-encode_sv7.c (-25 lines)
1	--- ./libmpcenc/encode_sv7.c.orig 2009-02-23 19:15:46.000000000 +0100
2	+++ ./libmpcenc/encode_sv7.c 2010-05-16 17:59:52.000000000 +0200
3	@@ -24,6 +24,8 @@
4	#include "libmpcenc.h"
5	#include <mpc/minimax.h>
6
7	+#define log2(x) ( log (x) * (1./M_LN2) )
8	+
9	void Klemm ( void );
10	void Init_Skalenfaktoren ( void );
11
12	@@ -437,11 +439,11 @@
13	total_cnt += sym[j][i].Count;
14	total_size += sym[j][i].Count * sym[j][i].Bits;
15	if (sym[j][i].Count != 0)
16	- optim_size += sym[j][i].Count * __builtin_log2(sym[j][i].Count);
17	+ optim_size += sym[j][i].Count * log2(sym[j][i].Count);
18	}
19	full_count += total_cnt;
20	full_size += total_size;
21	- optim_size = total_cnt * __builtin_log2(total_cnt) - optim_size;
22	+ optim_size = total_cnt * log2(total_cnt) - optim_size;
23	full_optim += optim_size;
24	size[j] = total_size;
25	cnt[j] = total_cnt;

Lines 1-27 Link Here

(-)musepack/files/patch-huffman-bcl.c (-27 lines)
1	--- ./common/huffman-bcl.c.orig 2007-03-17 00:25:28.000000000 +0100
2	+++ ./common/huffman-bcl.c 2010-05-16 18:01:56.000000000 +0200
3	@@ -30,9 +30,12 @@
4	* marcus.geelnard at home.se
5	*************************************************************************/
6
7	+#include <math.h>
8	#include <stdio.h>
9	#include <stdlib.h>
10
11	+#define log2(x) ( log (x) * (1./M_LN2) )
12	+
13	typedef struct {
14	int Symbol;
15	unsigned int Count;
16	@@ -265,9 +268,9 @@
17	total_cnt += sym[i].Count;
18	total_size += sym[i].Count * sym[i].Bits;
19	if (sym[i].Count != 0)
20	- optim_size += sym[i].Count * __builtin_log2(sym[i].Count);
21	+ optim_size += sym[i].Count * log2(sym[i].Count);
22	}
23	- optim_size = total_cnt * __builtin_log2(total_cnt) - optim_size;
24	+ optim_size = total_cnt * log2(total_cnt) - optim_size;
25	printf("\ncount : %u huff : %f bps ", total_cnt, (float)total_size / total_cnt);
26	printf("opt : %f bps ", (float)optim_size / total_cnt);
27	printf("loss : %f bps (%f %%)\n", (float)(total_size - optim_size) / total_cnt, (float)(total_size - optim_size) * 100 / optim_size);