FreeBSD Bugzilla – Attachment 106090 Details for
Bug 146643
update audio/musepack to 2009.03.01
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
musepack-2009.03.01-patch
musepack-2009.03.01-patch (text/plain), 9.15 KB, created by
Stefan Ehmann
on 2010-05-16 19:40:03 UTC
(
hide
)
Description:
musepack-2009.03.01-patch
Filename:
MIME Type:
Creator:
Stefan Ehmann
Created:
2010-05-16 19:40:03 UTC
Size:
9.15 KB
patch
obsolete
>diff -ruN musepack.bak/Makefile musepack/Makefile >--- musepack.bak/Makefile 2008-07-31 23:00:41.000000000 +0200 >+++ musepack/Makefile 2010-05-16 20:32:09.000000000 +0200 >@@ -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> >diff -ruN musepack.bak/distinfo musepack/distinfo >--- musepack.bak/distinfo 2006-01-22 09:12:54.000000000 +0100 >+++ musepack/distinfo 2010-05-16 14:45:10.000000000 +0200 >@@ -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 >diff -ruN musepack.bak/files/patch-Makefile musepack/files/patch-Makefile >--- musepack.bak/files/patch-Makefile 2005-03-06 14:28:35.000000000 +0100 >+++ musepack/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100 >@@ -1,73 +0,0 @@ >---- Makefile.orig Fri Jan 28 16:56:12 2005 >-+++ Makefile Sun Mar 6 12:56:51 2005 >-@@ -98,7 +98,7 @@ >- >- ifndef MINGW >- LDADD = -lm >--#LDADD += -lesd >-+LDADD += -L$(LOCALBASE)/lib -lesd >- else >- LDADD = -lwinmm -lws2_32 >- endif >-@@ -161,7 +161,7 @@ >- >- FLAGS = \ >- -fomit-frame-pointer -funroll-loops \ >-- -mno-ieee-fp -ffast-math -pipe >-+ -pipe >- >- ifneq ($(CC_MAJ),4) >- FLAGS += -fmove-all-movables >-@@ -211,9 +211,9 @@ >- >- # Merge all options together for CFLAGS and CFLAG_SIZE >- >--CFLAGS += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\" >-+CFLAGS += $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\" >- ifndef MINGW >--CFLAGS += -I$(XINCLDIR) -L$(XLIBDIR) >-+CFLAGS += -I$(LOCALBASE)/include >- endif >- #CFLAGS += $(ASSEM) >- CFLAGS_SIZE = $(CFLAGS) $(OPTIM_SIZE) >-@@ -254,12 +254,15 @@ >- >- # Lists of object and C files >- >--MPPDEC_OBJ = cpu_feat.o decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthasm.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o >-+MPPDEC_OBJ = decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o >- MPPDEC_SRC = decode.c http.c huffsv7.c huffsv46.c id3tag.c mppdec.c profile.c requant.c synth.c synthtab.c tools.c wave_out.c stderr.c _setargv.c >- MPPDEC_ASO = cpu_feat.o synthasm.o >-+ifeq ($(ARCH),i386) >-+MPPDEC_OBJ+= cpu_feat.o synthasm.o >-+endif >- >- >--MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft4gasm.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o >-+MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o >- ifdef MINGW >- MPPENC_OBJ += winmsg.o >- endif >-@@ -268,6 +271,9 @@ >- MPPENC_SRC += winmsg.c >- endif >- MPPENC_ASO = fft4gasm.o >-+ifeq ($(ARCH),i386) >-+MPPENC_OBJ+= fft4gasm.o >-+endif >- >- >- REPLAY_OBJ = replaygain.o gain_analysis.o pipeopen.o stderr.o _setargv.o >-@@ -393,8 +399,10 @@ >- # >- # Compile mppdec source code files >- >--config.h: mpp.h config.c >-- $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD) &> $(LOGFILE) >-+config: mpp.h config.c >-+ $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD) >-+ >-+config.h: config >- @$(RM_F) config.h >- @./config "$(CC) $(CFLAGS) -o <<EXE>> <<SRC>> $(LDADD)" "./<<EXE>>" >- @$(RM_F) config >diff -ruN musepack.bak/files/patch-Makefile.am musepack/files/patch-Makefile.am >--- musepack.bak/files/patch-Makefile.am 1970-01-01 01:00:00.000000000 +0100 >+++ musepack/files/patch-Makefile.am 2010-05-16 19:33:45.000000000 +0200 >@@ -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 >diff -ruN musepack.bak/files/patch-encode_sv7.c musepack/files/patch-encode_sv7.c >--- musepack.bak/files/patch-encode_sv7.c 1970-01-01 01:00:00.000000000 +0100 >+++ musepack/files/patch-encode_sv7.c 2010-05-16 18:02:38.000000000 +0200 >@@ -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; >diff -ruN musepack.bak/files/patch-huffman-bcl.c musepack/files/patch-huffman-bcl.c >--- musepack.bak/files/patch-huffman-bcl.c 1970-01-01 01:00:00.000000000 +0100 >+++ musepack/files/patch-huffman-bcl.c 2010-05-16 18:02:57.000000000 +0200 >@@ -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); >diff -ruN musepack.bak/files/patch-mppenc.c musepack/files/patch-mppenc.c >--- musepack.bak/files/patch-mppenc.c 2006-12-16 13:06:19.000000000 +0100 >+++ musepack/files/patch-mppenc.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- mppenc.c.orig Fri Dec 15 13:34:57 2006 >-+++ mppenc.c Fri Dec 15 13:35:14 2006 >-@@ -1864,7 +1864,7 @@ >- } >- >- >--static void >-+void >- OverdriveReport ( void ) >- { >- if ( Overflows > 0 ) { // >Files musepack.bak/musepack-2009.03.01.tbz and musepack/musepack-2009.03.01.tbz differ >diff -ruN musepack.bak/pkg-plist musepack/pkg-plist >--- musepack.bak/pkg-plist 1970-01-01 01:00:00.000000000 +0100 >+++ musepack/pkg-plist 2010-05-16 19:26:09.000000000 +0200 >@@ -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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=106090">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 146643
: 106090