1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

- Update to 2009.03.01

PR:		146643
Submitted by:	"Stefan Ehmann" <shoesoft@gmx.net> (maintainer)
This commit is contained in:
Martin Wilke 2010-05-22 04:39:31 +00:00
parent 7401a4e0af
commit 43cc26ad97
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254784
6 changed files with 86 additions and 36 deletions

View File

@ -6,43 +6,17 @@
#
PORTNAME= musepack
PORTVERSION= 1.15v
PORTVERSION= 2009.03.01
CATEGORIES= audio
MASTER_SITES= http://files.musepack.net/source/
DISTNAME= mpcsv7-src-${PORTVERSION}
DISTNAME= ${PORTNAME}_src_r435
MAINTAINER= shoesoft@gmx.net
COMMENT= Decoder, encoder and replaygain for musepack (mpc)
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound
USE_LDCONFIG= yes
USE_AUTOTOOLS= aclocal:110 autoheader:262 libtoolize automake:110 autoconf:262 libtool:22
ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
PLIST_FILES= bin/mppdec bin/mppenc bin/replaygain
BINS= mppdec mppenc replaygain
ALL_TARGET= ${BINS}
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/sv7
.include <bsd.port.pre.mk>
.if ${ARCH} == alpha
BROKEN= Does not compile on alpha
.endif
.if ${ARCH} == i386
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
post-patch:
.if ${ARCH} != i386
${REINPLACE_CMD} -e "s|#define USE_ASM|//#define USE_ASM|" ${WRKSRC}/mpp.h
.endif
${REINPLACE_CMD} -e "s|#define USE_IRIX_AUDIO|//#define USE_IRIX_AUDIO|" ${WRKSRC}/mpp.h
${REINPLACE_CMD} -e "s|<machine/soundcard.h>|<sys/soundcard.h>|" ${WRKSRC}/mppdec.h
do-install:
.for _BIN in ${BINS}
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${LOCALBASE}/bin
.endfor
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (mpcsv7-src-1.15v.tar.bz2) = eb3e6b64b1f7d68aaeb04e39936d87fb
SHA256 (mpcsv7-src-1.15v.tar.bz2) = ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
SIZE (mpcsv7-src-1.15v.tar.bz2) = 416868
MD5 (musepack_src_r435.tar.gz) = 0e858972978fe480fd1400b7331061de
SHA256 (musepack_src_r435.tar.gz) = 9fc1f4d0a88560590f377a3194a4b9b597966c9df91283aa7136fd3b120e43b2
SIZE (musepack_src_r435.tar.gz) = 194149

View File

@ -0,0 +1,7 @@
--- 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

View File

@ -0,0 +1,25 @@
--- ./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;

View File

@ -0,0 +1,27 @@
--- ./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);

17
audio/musepack/pkg-plist Normal file
View File

@ -0,0 +1,17 @@
bin/mpc2sv8
bin/mpccut
bin/mpcdec
bin/mpcenc
bin/wavcmp
include/mpc/datatypes.h
include/mpc/minimax.h
include/mpc/mpc_types.h
include/mpc/mpcdec.h
include/mpc/mpcmath.h
include/mpc/reader.h
include/mpc/streaminfo.h
lib/libmpcdec.a
lib/libmpcdec.la
lib/libmpcdec.so
lib/libmpcdec.so.7
@dirrm include/mpc