Update to 0.10:

* both encoder and decoder are significantly faster
* flac now has gzip-like command-line usage (should be more intuitive)
* the -# options have been tweaked for efficiency; -5 is the new default
* flac now autodetects WAVE input
* flac now ignores (with warning) unsupported WAVE subchunks
* new -o and --delete-input-file options
* new SEEKTABLE metadata block for storing seek points (speeds up seeking)
This commit is contained in:
naddy 2001-06-07 20:17:49 +00:00
parent a05b6134bc
commit 164ce0b1d1
6 changed files with 46 additions and 58 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2001/05/20 12:06:51 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2001/06/07 20:17:49 naddy Exp $
COMMENT= "free lossless audio codec"
PKGNAME= ${DISTNAME:S/-src//}
DISTNAME= flac-0.9-src
DISTNAME= flac-0.10-src
CATEGORIES= audio archivers
NEED_VERSION= 1.365
NEED_VERSION= 1.402
HOMEPAGE= http://flac.sourceforge.net/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -18,7 +18,10 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= flac
USE_GMAKE= Yes
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS= nasm::devel/nasm
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
CONFIGURE_ENV= XMMS_CONFIG=no

View File

@ -1,3 +1,3 @@
MD5 (flac-0.9-src.tar.gz) = 6b90c829c6224b43a3d304895bfd7d81
RMD160 (flac-0.9-src.tar.gz) = 29abf5861e48e9bf925a4602dd65c2712cd1b299
SHA1 (flac-0.9-src.tar.gz) = dde50ca5b7e5035a80c17ded8d84f403913c9f8e
MD5 (flac-0.10-src.tar.gz) = d8369dde641b984c96759f6c081171ab
RMD160 (flac-0.10-src.tar.gz) = f818ece847e65291b53ebdd04137edb9b7bbfab5
SHA1 (flac-0.10-src.tar.gz) = c4255fb0f7811cedbf5af5c93b32b91de3a3978c

View File

@ -1,18 +1,20 @@
$OpenBSD: patch-configure,v 1.1 2001/05/19 19:12:37 naddy Exp $
--- configure.orig Sat May 19 21:07:15 2001
+++ configure Sat May 19 21:07:49 2001
@@ -1747,11 +1747,11 @@ else
XMMS_FALSE=
$OpenBSD: patch-configure,v 1.2 2001/06/07 20:17:50 naddy Exp $
--- configure.orig Thu Jun 7 20:02:11 2001
+++ configure Thu Jun 7 20:03:22 2001
@@ -1899,14 +1899,11 @@ EOF
fi
-CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W'
+CFLAGS="$CFLAGS -I./include -I \$(top_srcdir)/include"
if test x$debug = xtrue; then
- CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ CFLAGS="$CFLAGS -g -DDEBUG"
CFLAGS="$CFLAGS -g -O0 -DDEBUG"
else
- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG"
+ CFLAGS="$CFLAGS -DNDEBUG"
- CFLAGS="$CFLAGS -O3 -DNDEBUG"
- if test x$GCC = xyes; then
- CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions"
- fi
+ CFLAGS="$CFLAGS -DNDEBUG"
fi
trap '' 1 2 15

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_libFLAC_fixed_c,v 1.1 2001/05/20 12:06:51 naddy Exp $
--- src/libFLAC/fixed.c.orig Sun Apr 1 07:35:25 2001
+++ src/libFLAC/fixed.c Sun May 20 13:42:24 2001
@@ -81,11 +81,11 @@ unsigned FLAC__fixed_compute_best_predic
residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_3 / (real) data_len) / M_LN2 : 0.0);
residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_4 / (real) data_len) / M_LN2 : 0.0);
#else
- residual_bits_per_sample[0] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[1] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[2] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[0] = (real)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[1] = (real)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[2] = (real)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[3] = (real)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[4] = (real)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0);
#endif
return order;
@@ -152,7 +152,7 @@ unsigned FLAC__fixed_compute_best_predic
void FLAC__fixed_compute_residual(const int32 data[], unsigned data_len, unsigned order, int32 residual[])
{
- unsigned i;
+ int i;
switch(order) {
case 0:
@@ -190,7 +190,7 @@ void FLAC__fixed_compute_residual(const
void FLAC__fixed_restore_signal(const int32 residual[], unsigned data_len, unsigned order, int32 data[])
{
- unsigned i;
+ int i;
switch(order) {
case 0:

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_libFLAC_i386_Makefile_in,v 1.1 2001/06/07 20:17:50 naddy Exp $
--- src/libFLAC/i386/Makefile.in.orig Thu Jun 7 09:18:44 2001
+++ src/libFLAC/i386/Makefile.in Thu Jun 7 20:55:12 2001
@@ -295,8 +295,14 @@ mostlyclean-generic distclean-generic cl
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-%.lo: %.s
- $(NASM) -f elf -d ELF $< -o $@
+cpu_asm.lo: cpu_asm.s
+ $(NASM) -f aoutb -d AOUT $? -o $@
+
+fixed_asm.lo: fixed_asm.s
+ $(NASM) -f aoutb -d AOUT $? -o $@
+
+lpc_asm.lo: lpc_asm.s
+ $(NASM) -f aoutb -d AOUT $? -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/28 12:27:20 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/06/07 20:17:50 naddy Exp $
bin/flac
bin/metaflac
lib/libFLAC.a
lib/libFLAC.la
%%SHARED%%
share/doc/flac/comparison.html
share/doc/flac/developers.html
share/doc/flac/documentation.html
@ -12,9 +11,11 @@ share/doc/flac/features.html
share/doc/flac/format.html
share/doc/flac/goals.html
share/doc/flac/id.html
share/doc/flac/images/1x1.gif
share/doc/flac/images/cafebug.gif
share/doc/flac/images/logo.jpg
share/doc/flac/index.html
share/doc/flac/news.html
share/doc/flac/images/1x1.gif
share/doc/flac/images/logo.jpg
%%SHARED%%
@dirrm share/doc/flac/images
@dirrm share/doc/flac