Attachment 145392 Details for Bug 192402 – patch to update musepack to 2011.08.10

[patch] patch to update musepack to 2011.08.10

musepack-2011.08.10.diff (text/plain), 4.86 KB, created by Stefan Ehmann on 2014-08-05 12:39:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Ehmann

Created: 2014-08-05 12:39:43 UTC

Size: 4.86 KB

patch

obsolete

>diff -ruN musepack.orig/Makefile musepack/Makefile
>--- musepack.orig/Makefile	2014-02-03 15:31:32.000000000 +0100
>+++ musepack/Makefile	2014-08-04 09:13:04.000000000 +0200
>@@ -2,17 +2,17 @@
> # $FreeBSD: head/audio/musepack/Makefile 342450 2014-02-03 14:31:32Z miwi $
> 
> PORTNAME=	musepack
>-PORTVERSION=	2009.03.01
>-PORTREVISION=	1
>+PORTVERSION=	2011.08.10
> CATEGORIES=	audio
> MASTER_SITES=	http://files.musepack.net/source/
>-DISTNAME=	${PORTNAME}_src_r435
>+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 libtool
>+USE_AUTOTOOLS=	aclocal autoheader libtoolize automake autoconf
>+USES=	libtool:oldver
> ACLOCAL_ARGS=	-I. -I ${LOCALBASE}/share/aclocal
> AUTOMAKE_ARGS=	--add-missing
> 
>diff -ruN musepack.orig/distinfo musepack/distinfo
>--- musepack.orig/distinfo	2014-01-22 16:30:13.000000000 +0100
>+++ musepack/distinfo	2014-08-04 06:41:59.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (musepack_src_r435.tar.gz) = 9fc1f4d0a88560590f377a3194a4b9b597966c9df91283aa7136fd3b120e43b2
>-SIZE (musepack_src_r435.tar.gz) = 194149
>+SHA256 (musepack_src_r475.tar.gz) = a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b
>+SIZE (musepack_src_r475.tar.gz) = 188737
>diff -ruN musepack.orig/files/patch-Makefile.am musepack/files/patch-Makefile.am
>--- musepack.orig/files/patch-Makefile.am	2014-01-22 18:40:44.000000000 +0100
>+++ musepack/files/patch-Makefile.am	1970-01-01 01:00:00.000000000 +0100
>@@ -1,7 +0,0 @@
>---- Makefile.am.orig	2008-03-25 15:31:41.000000000 +0100
>-+++ Makefile.am	2010-05-16 18:04:14.000000000 +0200
>-@@ -1,3 +1,3 @@
>- AUTOMAKE_OPTIONS = foreign
>- SUBDIRS = include libmpcdec libmpcenc libmpcpsy libwavformat mpcenc mpc2sv8 \
>--	mpcchap mpccut mpcdec mpcgain wavcmp
>-+	mpccut mpcdec wavcmp
>diff -ruN musepack.orig/files/patch-configure.in musepack/files/patch-configure.in
>--- musepack.orig/files/patch-configure.in	1970-01-01 01:00:00.000000000 +0100
>+++ musepack/files/patch-configure.in	2014-08-04 08:35:47.000000000 +0200
>@@ -0,0 +1,12 @@
>+--- 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
>diff -ruN musepack.orig/files/patch-encode_sv7.c musepack/files/patch-encode_sv7.c
>--- musepack.orig/files/patch-encode_sv7.c	2014-01-22 18:40:44.000000000 +0100
>+++ musepack/files/patch-encode_sv7.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,25 +0,0 @@
>---- ./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;
>diff -ruN musepack.orig/files/patch-huffman-bcl.c musepack/files/patch-huffman-bcl.c
>--- musepack.orig/files/patch-huffman-bcl.c	2014-01-22 18:40:44.000000000 +0100
>+++ musepack/files/patch-huffman-bcl.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,27 +0,0 @@
>---- ./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);

Actions: View | Diff

Attachments on bug 192402: 145392