Update to 1.1.2:

* better Ogg FLAC support
* speedups
* several new options to flac and metaflac
* several API additions
* streaming support in the XMMS plugin
* bugfixes
This commit is contained in:
naddy 2005-03-09 00:15:13 +00:00
parent a98424fb78
commit eb69de1228
19 changed files with 230 additions and 151 deletions

View File

@ -1,37 +1,36 @@
# $OpenBSD: Makefile,v 1.21 2005/02/19 21:48:47 alek Exp $
# $OpenBSD: Makefile,v 1.22 2005/03/09 00:15:13 naddy Exp $
COMMENT= "free lossless audio codec"
DISTNAME= flac-1.1.0
PKGNAME= ${DISTNAME}p0
DISTNAME= flac-1.1.2
CATEGORIES= audio archivers
HOMEPAGE= http://flac.sourceforge.net/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# (L)GPL, GFDL
# BSD, GPL, GFDL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
WANTLIB= c m
MODULES= converters/libiconv
LIB_DEPENDS= ogg.4::audio/libogg
LIB_DEPENDS= ogg.5::audio/libogg
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= ::devel/nasm
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-3dnow \
--with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}"
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include" \
XMMS_CONFIG=/usr/bin/false
CONFIGURE_ENV= ac_cv_path_XMMS_CONFIG=no
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include"
# "obj" is magic to our make(1)
post-configure:

View File

@ -1,4 +1,4 @@
MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
RMD160 (flac-1.1.0.tar.gz) = 55151dcaebb6323539c2206c7dc3fa3d2550fd5b
SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
SIZE (flac-1.1.0.tar.gz) = 1201861
MD5 (flac-1.1.2.tar.gz) = 2bfc127cdda02834d0491ab531a20960
RMD160 (flac-1.1.2.tar.gz) = 58656837b02e211eaed5010d84c4ed59841c82d3
SHA1 (flac-1.1.2.tar.gz) = 65501f3547df99b153951edb2ee7bfc13dd56946
SIZE (flac-1.1.2.tar.gz) = 1516235

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2003/04/18 00:28:40 naddy Exp $
--- Makefile.in.orig Sat Jan 25 19:42:16 2003
+++ Makefile.in Mon Feb 24 01:41:36 2003
@@ -145,7 +145,7 @@ am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
$OpenBSD: patch-Makefile_in,v 1.3 2005/03/09 00:15:14 naddy Exp $
--- Makefile.in.orig Thu Feb 3 16:37:07 2005
+++ Makefile.in Thu Feb 3 16:37:17 2005
@@ -258,7 +258,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = doc include man src test build flac.pbproj obj
+SUBDIRS = doc include man src test build flac.pbproj
DISTCLEANFILES = libtool-disable-static
EXTRA_DIST = \
COPYING.FDL \

View File

@ -1,48 +1,24 @@
$OpenBSD: patch-configure,v 1.9 2005/02/19 21:48:47 alek Exp $
--- configure.orig Sat Jan 25 19:41:21 2003
+++ configure Sat Feb 19 22:35:25 2005
@@ -7920,7 +7920,7 @@ else
fi
case "$host" in
- i[3-6]86-*-openbsd*) OBJ_FORMAT=aoutb ;;
+ i386-*-openbsd3.[0-2]) OBJ_FORMAT=aoutb ;;
*) OBJ_FORMAT=elf ;;
esac
@@ -9361,6 +9361,8 @@ _ACEOF
fi
+# Disable id3lib detection
+if false; then
# Check whether --with-id3lib or --without-id3lib was given.
if test "${with_id3lib+set}" = set; then
@@ -9545,6 +9547,8 @@ echo "$as_me: WARNING: *** id3lib not fo
rm -f conf.id3libtest
+fi
+have_id3lib=no
if test x$have_id3lib = xyes; then
@@ -11251,7 +11255,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
$OpenBSD: patch-configure,v 1.10 2005/03/09 00:15:14 naddy Exp $
--- configure.orig Sat Feb 5 03:22:32 2005
+++ configure Tue Mar 8 00:21:45 2005
@@ -10541,9 +10541,9 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
if test x$debug = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
if test x$GCC = xyes; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
fi
@@ -12134,7 +12138,7 @@ s,@XMMS_GENERAL_PLUGIN_DIR@,$XMMS_GENERA
fi
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
@@ -11586,7 +11586,7 @@ s,@XMMS_GENERAL_PLUGIN_DIR@,$XMMS_GENERA
s,@XMMS_EFFECT_PLUGIN_DIR@,$XMMS_EFFECT_PLUGIN_DIR,;t t
s,@FLaC__HAS_XMMS_TRUE@,$FLaC__HAS_XMMS_TRUE,;t t
s,@FLaC__HAS_XMMS_FALSE@,$FLaC__HAS_XMMS_FALSE,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@ID3LIB_CFLAGS@,$ID3LIB_CFLAGS,;t t
s,@ID3LIB_LIBS@,$ID3LIB_LIBS,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@FLaC__HAS_DOXYGEN_TRUE@,$FLaC__HAS_DOXYGEN_TRUE,;t t

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-doc_html_Makefile_in,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- doc/html/Makefile.in.orig Sat Feb 5 03:23:28 2005
+++ doc/html/Makefile.in Mon Mar 7 23:21:18 2005
@@ -577,13 +577,13 @@ uninstall-info: uninstall-info-recursive
# The install targets don't copy whole directories so we have to
# handle 'api/' specially:
-@FLaC__HAS_DOXYGEN_TRUE@install-data-local:
-@FLaC__HAS_DOXYGEN_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docdir)/api
-@FLaC__HAS_DOXYGEN_TRUE@ (cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
-@FLaC__HAS_DOXYGEN_TRUE@uninstall-local:
-@FLaC__HAS_DOXYGEN_TRUE@ rm -rf $(DESTDIR)$(docdir)/api
-@FLaC__HAS_DOXYGEN_TRUE@maintainer-clean-local:
-@FLaC__HAS_DOXYGEN_TRUE@ rm -rf api
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/api
+ (cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
+uninstall-local:
+ rm -rf $(DESTDIR)$(docdir)/api
+maintainer-clean-local:
+ rm -rf api
# 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.
.NOEXPORT:

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libFLAC++_Makefile_in,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- src/libFLAC++/Makefile.in.orig Tue Mar 8 00:04:40 2005
+++ src/libFLAC++/Makefile.in Tue Mar 8 00:05:08 2005
@@ -280,7 +280,7 @@ EXTRA_DIST = \
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
libFLAC___la_LDFLAGS = -version-info 5:0:0
-libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
+libFLAC___la_LIBADD =
libFLAC___la_SOURCES = \
file_decoder.cpp \
file_encoder.cpp \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libFLAC_Makefile_in,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- src/libFLAC/Makefile.in.orig Tue Mar 8 00:03:42 2005
+++ src/libFLAC/Makefile.in Tue Mar 8 00:03:49 2005
@@ -316,7 +316,7 @@ EXTRA_DIST = \
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 7:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
+libFLAC_la_LDFLAGS = -version-info 7:0:0 $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitbuffer.c \
bitmath.c \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libOggFLAC++_Makefile_in,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- src/libOggFLAC++/Makefile.in.orig Tue Mar 8 00:06:37 2005
+++ src/libOggFLAC++/Makefile.in Tue Mar 8 00:06:51 2005
@@ -279,7 +279,7 @@ EXTRA_DIST = \
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
libOggFLAC___la_LDFLAGS = -version-info 2:0:0
-libOggFLAC___la_LIBADD = ../libOggFLAC/libOggFLAC.la
+libOggFLAC___la_LIBADD =
libOggFLAC___la_SOURCES = \
file_decoder.cpp \
file_encoder.cpp \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libOggFLAC_Makefile_in,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- src/libOggFLAC/Makefile.in.orig Tue Mar 8 00:05:51 2005
+++ src/libOggFLAC/Makefile.in Tue Mar 8 00:06:17 2005
@@ -291,7 +291,7 @@ EXTRA_DIST = \
libOggFLAC_static.dsp \
libOggFLAC.m4
-libOggFLAC_la_LIBADD = @OGG_LIBS@ ../libFLAC/libFLAC.la
+libOggFLAC_la_LIBADD =
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
libOggFLAC_la_LDFLAGS = -version-info 3:0:0
libOggFLAC_la_SOURCES = \

View File

@ -1,21 +1,12 @@
FLAC stands for Free Lossless Audio Codec. The FLAC project consists of:
- the stream format
- libFLAC, a library which implements a reference encoder, stream decoder,
and file decoder
- flac, which is a command-line wrapper around libFLAC to encode and
decode .flac files
- input plugins for various music players (Winamp, XMMS, and more in the
works)
FLAC is an Open Source lossless audio codec.
What FLAC is:
- FLAC is patent free.
- FLAC is lossless.
- FLAC is designed to compress audio data.
- The compression capabilities of FLAC are extendable.
- The currently implemented compression methods in the reference encoder
yield streams smaller than shorten.
- FLAC is asymmetric in favor of decode speed.
- FLAC is suitable for archiving.
- FLAC is suitable for streaming.
- FLAC supports fast sample-accurate seeking.
- FLAC has an extendable metadata system.
FLAC is comprised of
* libFLAC, a library which implements reference encoders and
decoders, and a metadata interface
* libFLAC++, a C++ object wrapper library around libFLAC
* libOggFLAC and libOggFLAC++, which provide encoders and
decoders for FLAC streams in an Ogg container
* flac, a command-line program for encoding and decoding files
* metaflac, a command-line program for viewing and editing FLAC
metadata
* user and API documentation

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2004/08/10 07:27:48 espie Exp $
@lib lib/libFLAC++.so.3.2
@lib lib/libFLAC.so.5.2
@lib lib/libOggFLAC++.so.0.4
@lib lib/libOggFLAC.so.1.2
@comment $OpenBSD: PFRAG.shared,v 1.9 2005/03/09 00:15:14 naddy Exp $
@lib lib/libFLAC++.so.5.0
@lib lib/libFLAC.so.7.0
@lib lib/libOggFLAC++.so.2.0
@lib lib/libOggFLAC.so.3.0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2004/08/05 03:28:12 espie Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/03/09 00:15:14 naddy Exp $
bin/flac
bin/metaflac
include/FLAC/
@ -10,6 +10,7 @@ include/FLAC++/export.h
include/FLAC++/metadata.h
include/FLAC/all.h
include/FLAC/assert.h
include/FLAC/callback.h
include/FLAC/export.h
include/FLAC/file_decoder.h
include/FLAC/file_encoder.h
@ -28,6 +29,10 @@ include/OggFLAC++/encoder.h
include/OggFLAC++/export.h
include/OggFLAC/all.h
include/OggFLAC/export.h
include/OggFLAC/file_decoder.h
include/OggFLAC/file_encoder.h
include/OggFLAC/seekable_stream_decoder.h
include/OggFLAC/seekable_stream_encoder.h
include/OggFLAC/stream_decoder.h
include/OggFLAC/stream_encoder.h
lib/libFLAC++.a
@ -59,6 +64,10 @@ share/doc/flac/html/api/FLAC++_2encoder_8h.html
share/doc/flac/html/api/FLAC++_2export_8h-source.html
share/doc/flac/html/api/FLAC_2all_8h-source.html
share/doc/flac/html/api/FLAC_2export_8h-source.html
share/doc/flac/html/api/FLAC_2file__encoder_8h-source.html
share/doc/flac/html/api/FLAC_2file__encoder_8h.html
share/doc/flac/html/api/FLAC_2seekable__stream__encoder_8h-source.html
share/doc/flac/html/api/FLAC_2seekable__stream__encoder_8h.html
share/doc/flac/html/api/FLAC_2stream__decoder_8h-source.html
share/doc/flac/html/api/FLAC_2stream__decoder_8h.html
share/doc/flac/html/api/FLAC_2stream__encoder_8h-source.html
@ -71,12 +80,18 @@ share/doc/flac/html/api/OggFLAC++_2encoder_8h.html
share/doc/flac/html/api/OggFLAC++_2export_8h-source.html
share/doc/flac/html/api/OggFLAC_2all_8h-source.html
share/doc/flac/html/api/OggFLAC_2export_8h-source.html
share/doc/flac/html/api/OggFLAC_2file__encoder_8h-source.html
share/doc/flac/html/api/OggFLAC_2file__encoder_8h.html
share/doc/flac/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
share/doc/flac/html/api/OggFLAC_2seekable__stream__encoder_8h.html
share/doc/flac/html/api/OggFLAC_2stream__decoder_8h-source.html
share/doc/flac/html/api/OggFLAC_2stream__decoder_8h.html
share/doc/flac/html/api/OggFLAC_2stream__encoder_8h-source.html
share/doc/flac/html/api/OggFLAC_2stream__encoder_8h.html
share/doc/flac/html/api/annotated.html
share/doc/flac/html/api/assert_8h-source.html
share/doc/flac/html/api/callback_8h-source.html
share/doc/flac/html/api/callback_8h.html
share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File-members.html
share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File.html
share/doc/flac/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
@ -123,8 +138,16 @@ share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1File.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1File.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
share/doc/flac/html/api/classes.html
@ -132,14 +155,13 @@ share/doc/flac/html/api/doxygen.css
share/doc/flac/html/api/doxygen.gif
share/doc/flac/html/api/file__decoder_8h-source.html
share/doc/flac/html/api/file__decoder_8h.html
share/doc/flac/html/api/file__encoder_8h-source.html
share/doc/flac/html/api/file__encoder_8h.html
share/doc/flac/html/api/files.html
share/doc/flac/html/api/format_8h-source.html
share/doc/flac/html/api/format_8h.html
share/doc/flac/html/api/functions.html
share/doc/flac/html/api/globals.html
share/doc/flac/html/api/group__flac.html
share/doc/flac/html/api/group__flac__callbacks.html
share/doc/flac/html/api/group__flac__decoder.html
share/doc/flac/html/api/group__flac__encoder.html
share/doc/flac/html/api/group__flac__file__decoder.html
@ -171,11 +193,17 @@ share/doc/flac/html/api/group__flacpp__stream__encoder.html
share/doc/flac/html/api/group__oggflac.html
share/doc/flac/html/api/group__oggflac__decoder.html
share/doc/flac/html/api/group__oggflac__encoder.html
share/doc/flac/html/api/group__oggflac__file__encoder.html
share/doc/flac/html/api/group__oggflac__seekable__stream__encoder.html
share/doc/flac/html/api/group__oggflac__stream__decoder.html
share/doc/flac/html/api/group__oggflac__stream__encoder.html
share/doc/flac/html/api/group__oggflacpp.html
share/doc/flac/html/api/group__oggflacpp__decoder.html
share/doc/flac/html/api/group__oggflacpp__encoder.html
share/doc/flac/html/api/group__oggflacpp__file__decoder.html
share/doc/flac/html/api/group__oggflacpp__file__encoder.html
share/doc/flac/html/api/group__oggflacpp__seekable__stream__decoder.html
share/doc/flac/html/api/group__oggflacpp__seekable__stream__encoder.html
share/doc/flac/html/api/group__oggflacpp__stream__decoder.html
share/doc/flac/html/api/group__oggflacpp__stream__encoder.html
share/doc/flac/html/api/hierarchy.html
@ -186,8 +214,6 @@ share/doc/flac/html/api/modules.html
share/doc/flac/html/api/ordinals_8h-source.html
share/doc/flac/html/api/seekable__stream__decoder_8h-source.html
share/doc/flac/html/api/seekable__stream__decoder_8h.html
share/doc/flac/html/api/seekable__stream__encoder_8h-source.html
share/doc/flac/html/api/seekable__stream__encoder_8h.html
share/doc/flac/html/api/structFLAC____EntropyCodingMethod-members.html
share/doc/flac/html/api/structFLAC____EntropyCodingMethod.html
share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
@ -204,6 +230,8 @@ share/doc/flac/html/api/structFLAC____FrameFooter-members.html
share/doc/flac/html/api/structFLAC____FrameFooter.html
share/doc/flac/html/api/structFLAC____FrameHeader-members.html
share/doc/flac/html/api/structFLAC____FrameHeader.html
share/doc/flac/html/api/structFLAC____IOCallbacks-members.html
share/doc/flac/html/api/structFLAC____IOCallbacks.html
share/doc/flac/html/api/structFLAC____SeekableStreamDecoder-members.html
share/doc/flac/html/api/structFLAC____SeekableStreamDecoder.html
share/doc/flac/html/api/structFLAC____SeekableStreamEncoder-members.html
@ -246,14 +274,21 @@ share/doc/flac/html/api/structFLAC____Subframe__LPC-members.html
share/doc/flac/html/api/structFLAC____Subframe__LPC.html
share/doc/flac/html/api/structFLAC____Subframe__Verbatim-members.html
share/doc/flac/html/api/structFLAC____Subframe__Verbatim.html
share/doc/flac/html/api/structOggFLAC____FileEncoder-members.html
share/doc/flac/html/api/structOggFLAC____FileEncoder.html
share/doc/flac/html/api/structOggFLAC____SeekableStreamEncoder-members.html
share/doc/flac/html/api/structOggFLAC____SeekableStreamEncoder.html
share/doc/flac/html/api/structOggFLAC____StreamDecoder-members.html
share/doc/flac/html/api/structOggFLAC____StreamDecoder.html
share/doc/flac/html/api/structOggFLAC____StreamEncoder-members.html
share/doc/flac/html/api/structOggFLAC____StreamEncoder.html
share/doc/flac/html/changelog.html
share/doc/flac/html/comparison.html
share/doc/flac/html/developers.html
share/doc/flac/html/documentation.html
share/doc/flac/html/download.html
share/doc/flac/html/faq.html
share/doc/flac/html/favicon.ico
share/doc/flac/html/features.html
share/doc/flac/html/format.html
share/doc/flac/html/goals.html
@ -261,9 +296,13 @@ share/doc/flac/html/id.html
share/doc/flac/html/images/
share/doc/flac/html/images/1x1.gif
share/doc/flac/html/images/cafebug.gif
share/doc/flac/html/images/logo.jpg
share/doc/flac/html/images/logo100.gif
share/doc/flac/html/images/logo130.gif
share/doc/flac/html/index.html
share/doc/flac/html/license.html
share/doc/flac/html/links.html
share/doc/flac/html/news.html
share/doc/flac/html/ogg_mapping.html
share/doc/flac/html/ru/
share/doc/flac/html/ru/authors.html
share/doc/flac/html/ru/comparison.html

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2004/11/21 17:51:48 espie Exp $
# $OpenBSD: Makefile,v 1.12 2005/03/09 00:15:14 naddy Exp $
SHARED_ONLY= Yes
COMMENT= "XMMS input plugin for playing FLAC files"
VERSION= 1.1.0
VERSION= 1.1.2
PKGNAME= xmms-flac-${VERSION}
DISTNAME= flac-${VERSION}
CATEGORIES= audio
@ -20,15 +20,12 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi gdk glib gmodule gtk iconv intl m
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
MASTER_SITES0= ftp://ftp.debian.org/debian/pool/main/f/flac/ \
ftp://ftp.de.debian.org/debian/pool/main/f/flac/
PATCHFILES= flac_${VERSION}-11.diff.gz:0
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= xmms.3::audio/xmms \
FLAC.5::audio/flac
LIB_DEPENDS= xmms.4::audio/xmms \
FLAC.7::audio/flac
CONFIGURE_STYLE= gnu
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
--with-xmms-prefix="${LOCALBASE}"

View File

@ -1,8 +1,4 @@
MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
MD5 (flac_1.1.0-11.diff.gz) = 56285480c9a3c029bdad6d3226e6eaa2
RMD160 (flac-1.1.0.tar.gz) = 55151dcaebb6323539c2206c7dc3fa3d2550fd5b
RMD160 (flac_1.1.0-11.diff.gz) = 8e9cbc9aba0cbd5cbd04b09ff362d3baa93f4939
SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
SHA1 (flac_1.1.0-11.diff.gz) = 47cf1d9d13e0d8e5c6b058d6353d80ae2993445f
SIZE (flac-1.1.0.tar.gz) = 1201861
SIZE (flac_1.1.0-11.diff.gz) = 51614
MD5 (flac-1.1.2.tar.gz) = 2bfc127cdda02834d0491ab531a20960
RMD160 (flac-1.1.2.tar.gz) = 58656837b02e211eaed5010d84c4ed59841c82d3
SHA1 (flac-1.1.2.tar.gz) = 65501f3547df99b153951edb2ee7bfc13dd56946
SIZE (flac-1.1.2.tar.gz) = 1516235

View File

@ -1,30 +1,24 @@
$OpenBSD: patch-configure,v 1.5 2003/04/18 00:28:40 naddy Exp $
--- configure.orig Mon Feb 24 01:42:48 2003
+++ configure Mon Feb 24 01:44:20 2003
@@ -9818,6 +9818,8 @@ _ACEOF
fi
+# Disable id3lib detection
+if false; then
# Check whether --with-id3lib or --without-id3lib was given.
if test "${with_id3lib+set}" = set; then
@@ -10006,6 +10008,8 @@ echo "$as_me: WARNING: *** id3lib not fo
rm -f conf.id3libtest
+fi
+have_id3lib=no
if test x$have_id3lib = xyes; then
@@ -11713,7 +11717,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
$OpenBSD: patch-configure,v 1.6 2005/03/09 00:15:14 naddy Exp $
--- configure.orig Sat Feb 5 03:22:32 2005
+++ configure Tue Mar 8 17:28:12 2005
@@ -10541,9 +10541,9 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
if test x$debug = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
if test x$GCC = xyes; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
fi
fi
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
@@ -11586,7 +11586,7 @@ s,@XMMS_GENERAL_PLUGIN_DIR@,$XMMS_GENERA
s,@XMMS_EFFECT_PLUGIN_DIR@,$XMMS_EFFECT_PLUGIN_DIR,;t t
s,@FLaC__HAS_XMMS_TRUE@,$FLaC__HAS_XMMS_TRUE,;t t
s,@FLaC__HAS_XMMS_FALSE@,$FLaC__HAS_XMMS_FALSE,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@FLaC__HAS_DOXYGEN_TRUE@,$FLaC__HAS_DOXYGEN_TRUE,;t t

View File

@ -1,23 +1,23 @@
$OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.1 2003/04/18 00:28:40 naddy Exp $
--- src/plugin_xmms/Makefile.in.orig Mon Feb 24 13:51:50 2003
+++ src/plugin_xmms/Makefile.in Mon Feb 24 13:53:37 2003
@@ -173,8 +173,7 @@ libxmms_flac_la_LIBADD = \
$OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.2 2005/03/09 00:15:14 naddy Exp $
--- src/plugin_xmms/Makefile.in.orig Tue Mar 8 03:28:56 2005
+++ src/plugin_xmms/Makefile.in Tue Mar 8 03:29:56 2005
@@ -77,8 +77,7 @@ libxmms_flac_la_DEPENDENCIES = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
- $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la
+ $(top_builddir)/src/share/utf8/libutf8.la
am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
tag.lo
am_libxmms_flac_la_OBJECTS = $(am__objects_1)
@@ -296,8 +295,7 @@ libxmms_flac_la_LIBADD = \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -L$(top_builddir)/src/libFLAC/.libs \
+ -lFLAC \
@XMMS_LIBS@ \
@ID3LIB_LIBS@
@LIBICONV@
@@ -189,8 +188,7 @@ libxmms_flac_la_DEPENDENCIES = \
$(top_builddir)/src/plugin_common/libplugin_common.la \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la
+ $(top_builddir)/src/share/utf8/libutf8.la
am__objects_1 = charset.lo configure.lo plugin.lo wrap_id3.lo \
fileinfo.lo
@FLaC__HAS_ID3LIB_TRUE@am_libxmms_flac_la_OBJECTS = $(am__objects_1)

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_plugin_xmms_plugin_c,v 1.1 2005/03/09 00:15:14 naddy Exp $
--- src/plugin_xmms/plugin.c.orig Tue Mar 8 23:18:19 2005
+++ src/plugin_xmms/plugin.c Tue Mar 8 23:19:31 2005
@@ -259,6 +259,12 @@ void FLAC_XMMS__init()
/* stream */
+ /* allow indiscriminate use of g_free() */
+ flac_cfg.stream.proxy_host = g_strdup("");
+ flac_cfg.stream.proxy_user = g_strdup("");
+ flac_cfg.stream.proxy_pass = g_strdup("");
+ flac_cfg.stream.save_http_path = g_strdup("");
+
xmms_cfg_read_int(cfg, "flac", "stream.http_buffer_size", &flac_cfg.stream.http_buffer_size);
xmms_cfg_read_int(cfg, "flac", "stream.http_prebuffer", &flac_cfg.stream.http_prebuffer);
xmms_cfg_read_boolean(cfg, "flac", "stream.use_proxy", &flac_cfg.stream.use_proxy);

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/02/01 15:44:31 naddy Exp $
lib/xmms/Input/libxmms-flac.so

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/14 23:16:56 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2005/03/09 00:15:14 naddy Exp $
@comment lib/xmms/Input/libxmms-flac.a
@comment lib/xmms/Input/libxmms-flac.la
%%SHARED%%
lib/xmms/Input/libxmms-flac.so