Update to 1.1.0 and fix for ELF.

This commit is contained in:
naddy 2003-04-18 00:28:40 +00:00
parent 0f6e84cd07
commit 6c5f036baa
15 changed files with 159 additions and 181 deletions

View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.17 2003/02/25 00:02:38 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2003/04/18 00:28:40 naddy Exp $
COMMENT= "free lossless audio codec"
DISTNAME= flac-1.0.4
DISTNAME= flac-1.1.0
CATEGORIES= audio archivers
HOMEPAGE= http://flac.sourceforge.net/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# (L)GPL, GFDL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -16,7 +17,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
MODULES= iconv
BUILD_DEPENDS= ::converters/libiconv:extract
LIB_DEPENDS= ogg.4::audio/libogg
.if ${MACHINE_ARCH} == "i386"
@ -24,19 +24,12 @@ BUILD_DEPENDS+= ::devel/nasm
.endif
CONFIGURE_STYLE= gnu
# id3lib is only used by the XMMS plugin
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-3dnow \
--with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}"
CONFIGURE_ENV= XMMS_CONFIG=/usr/bin/false \
CPPFLAGS="-I${WRKSRC}/include"
# missing auxiliary script
post-extract:
@cp ${WRKDIR}/converters/libiconv/libiconv-*/autoconf/config.rpath \
${WRKSRC}
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include" \
XMMS_CONFIG=/usr/bin/false
# "obj" is magic to our make(1)
post-configure:

View File

@ -1,3 +1,3 @@
MD5 (flac-1.0.4.tar.gz) = b1523e6ad8ef85d1df5b18f20a8cfad6
RMD160 (flac-1.0.4.tar.gz) = e6d923e7283fa530eadfbc9f0016f9018441e147
SHA1 (flac-1.0.4.tar.gz) = d16beeb8b1f37044d59ba7f2b80a2c3c8db3e7e3
MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
RMD160 (flac-1.1.0.tar.gz) = 55151dcaebb6323539c2206c7dc3fa3d2550fd5b
SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/10/31 21:15:08 naddy Exp $
--- Makefile.in.orig Thu Oct 31 17:01:59 2002
+++ Makefile.in Thu Oct 31 17:02:12 2002
@@ -144,7 +144,7 @@ am__include = @am__include@
$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@

View File

@ -1,39 +1,39 @@
$OpenBSD: patch-configure,v 1.7 2002/11/03 01:55:16 naddy Exp $
--- configure.orig Wed Sep 25 06:53:08 2002
+++ configure Sun Nov 3 02:48:51 2002
@@ -5388,7 +5388,7 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -5398,7 +5398,7 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
@@ -9519,7 +9519,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
+ . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -11113,7 +11113,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
$OpenBSD: patch-configure,v 1.8 2003/04/18 00:28:40 naddy Exp $
--- configure.orig Sat Jan 25 19:41:21 2003
+++ configure Fri Apr 18 01:41:28 2003
@@ -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
if test x$debug = xtrue; then
OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
- OUR_CFLAGS_TAIL="-O3 -DNDEBUG"
+ OUR_CFLAGS_TAIL="-DNDEBUG"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
if test x$GCC = xyes; then
OUR_CFLAGS_TAIL="$OUR_CFLAGS_TAIL -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
fi

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_flac_Makefile_in,v 1.1 2002/10/31 21:15:08 naddy Exp $
--- src/flac/Makefile.in.orig Thu Oct 31 16:51:49 2002
+++ src/flac/Makefile.in Thu Oct 31 16:52:25 2002
@@ -155,7 +155,7 @@ flac_SOURCES = \
vorbiscomment.h
-flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ -lm
+flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm
subdir = src/flac
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_metaflac_Makefile_in,v 1.1 2002/10/31 21:15:08 naddy Exp $
--- src/metaflac/Makefile.in.orig Thu Oct 31 16:52:36 2002
+++ src/metaflac/Makefile.in Thu Oct 31 16:52:54 2002
@@ -144,7 +144,7 @@ metaflac_SOURCES = \
metaflac_LDFLAGS =
-metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ -lm
+metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
subdir = src/metaflac
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2002/10/31 21:15:08 naddy Exp $
lib/libFLAC++.so.2.1
lib/libFLAC.so.4.1
lib/libOggFLAC++.so.0.1
lib/libOggFLAC.so.0.1
@comment $OpenBSD: PFRAG.shared,v 1.6 2003/04/18 00:28:40 naddy Exp $
lib/libFLAC++.so.3.2
lib/libFLAC.so.5.2
lib/libOggFLAC++.so.0.4
lib/libOggFLAC.so.1.2
DYNLIBDIR(%B)

View File

@ -1,12 +1,14 @@
@comment $OpenBSD: PLIST,v 1.6 2002/10/31 21:15:08 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2003/04/18 00:28:40 naddy Exp $
bin/flac
bin/metaflac
include/FLAC++/all.h
include/FLAC++/decoder.h
include/FLAC++/encoder.h
include/FLAC++/export.h
include/FLAC++/metadata.h
include/FLAC/all.h
include/FLAC/assert.h
include/FLAC/export.h
include/FLAC/file_decoder.h
include/FLAC/file_encoder.h
include/FLAC/format.h
@ -19,7 +21,9 @@ include/FLAC/stream_encoder.h
include/OggFLAC++/all.h
include/OggFLAC++/decoder.h
include/OggFLAC++/encoder.h
include/OggFLAC++/export.h
include/OggFLAC/all.h
include/OggFLAC/export.h
include/OggFLAC/stream_decoder.h
include/OggFLAC/stream_encoder.h
lib/libFLAC++.a
@ -31,6 +35,7 @@ lib/libOggFLAC++.la
lib/libOggFLAC.a
lib/libOggFLAC.la
man/man1/flac.1
man/man1/metaflac.1
share/aclocal/libFLAC++.m4
share/aclocal/libFLAC.m4
share/aclocal/libOggFLAC++.m4
@ -43,7 +48,9 @@ share/doc/flac/html/api/FLAC++_2decoder_8h-source.html
share/doc/flac/html/api/FLAC++_2decoder_8h.html
share/doc/flac/html/api/FLAC++_2encoder_8h-source.html
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_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
@ -53,7 +60,9 @@ share/doc/flac/html/api/OggFLAC++_2decoder_8h-source.html
share/doc/flac/html/api/OggFLAC++_2decoder_8h.html
share/doc/flac/html/api/OggFLAC++_2encoder_8h-source.html
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_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
@ -77,6 +86,11 @@ share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
@ -93,6 +107,9 @@ share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
@ -191,6 +208,12 @@ share/doc/flac/html/api/structFLAC____StreamMetadata-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Application-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Application.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Padding-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Padding.html
share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
@ -199,6 +222,8 @@ share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable.html
share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown.html
share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment.html
share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
@ -248,6 +273,7 @@ share/doc/flac/html/ru/news.html
@dirrm share/doc/flac/html/api
@dirrm share/doc/flac/html
@dirrm share/doc/flac
@comment @dirrm share/aclocal
@dirrm include/OggFLAC++
@dirrm include/OggFLAC
@dirrm include/FLAC++

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2002/11/03 02:14:54 naddy Exp $
# $OpenBSD: Makefile,v 1.6 2003/04/18 00:28:40 naddy Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "XMMS input plugin for playing FLAC files"
VERSION= 1.0.4
VERSION= 1.1.0
PKGNAME= xmms-flac-${VERSION}
DISTNAME= flac-${VERSION}
CATEGORIES= audio
@ -12,41 +12,32 @@ HOMEPAGE= http://flac.sourceforge.net/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
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}-3.diff.gz:0
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= xmms.3::audio/xmms \
FLAC.4::audio/flac
FLAC.5::audio/flac
WRKSRC= ${WRKDIST}/src/plugin_xmms
MODGNU_CONFIG_GUESS_DIRS= ${WRKDIST}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
--with-xmms-prefix="${LOCALBASE}"
CONFIGURE_STYLE= gnu automake
CONFIGURE_ARGS= --without-id3lib
MAKE_FILE= ${FILESDIR}/Makefile
# libtool doesn't handle linking a module against a convenience library
# "obj" is magic to our make(1)
post-configure:
@rm -rf ${WRKSRC}/obj
PLUGIN_COMMON_FILES= all.h canonical_tag.c canonical_tag.h \
charset.c:charset_common.c charset.h:charset_common.h \
dither.c dither.h id3v1.c id3v1.h id3v2.c id3v2.h \
locale_hack.h vorbiscomment.c vorbiscomment.h
pre-patch:
.for file in ${PLUGIN_COMMON_FILES}
@cp ${WRKDIST}/src/plugin_common/${file:C/:.*//} \
${WRKSRC}/${file:C/.*://}
.endfor
post-patch:
@cd ${WRKDIST}; automake -v -i src/plugin_xmms/Makefile
pre-configure:
@echo '#!/bin/sh' >${WRKSRC}/configure
@echo 'cd ../..; exec ./configure "$$@"' >>${WRKSRC}/configure
@chmod a+x ${WRKSRC}/configure
NO_REGRESS= Yes
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
MD5 (flac-1.0.4.tar.gz) = b1523e6ad8ef85d1df5b18f20a8cfad6
RMD160 (flac-1.0.4.tar.gz) = e6d923e7283fa530eadfbc9f0016f9018441e147
SHA1 (flac-1.0.4.tar.gz) = d16beeb8b1f37044d59ba7f2b80a2c3c8db3e7e3
MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
MD5 (flac_1.1.0-3.diff.gz) = 28443cf10cbc7fc29ddfa5df48474b06
RMD160 (flac-1.1.0.tar.gz) = 55151dcaebb6323539c2206c7dc3fa3d2550fd5b
RMD160 (flac_1.1.0-3.diff.gz) = 25aa9d9fc04c588ce216a229637fb4d43dc7386f
SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
SHA1 (flac_1.1.0-3.diff.gz) = df7a3270b2f3a9cc412b10abe35324e909251aea

View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1 2003/04/18 00:28:40 naddy Exp $
SUBDIRS= src/share src/plugin_common src/plugin_xmms
all install:
@for d in ${SUBDIRS}; do \
(cd $$d; ${MAKE} $@); \
done

View File

@ -1,39 +1,30 @@
$OpenBSD: patch-configure,v 1.4 2002/11/03 02:14:54 naddy Exp $
--- configure.orig Wed Sep 25 06:53:08 2002
+++ configure Sun Nov 3 02:45:50 2002
@@ -5388,7 +5388,7 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -5398,7 +5398,7 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
@@ -9519,7 +9519,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
+ . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -11113,7 +11113,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
$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
if test x$debug = xtrue; then
OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
- OUR_CFLAGS_TAIL="-O3 -DNDEBUG"
+ OUR_CFLAGS_TAIL="-DNDEBUG"
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
if test x$GCC = xyes; then
OUR_CFLAGS_TAIL="$OUR_CFLAGS_TAIL -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
fi

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_plugin_xmms_Makefile_am,v 1.2 2002/11/03 02:14:54 naddy Exp $
--- src/plugin_xmms/Makefile.am.orig Mon Sep 9 22:11:30 2002
+++ src/plugin_xmms/Makefile.am Sat Nov 2 01:46:34 2002
@@ -36,7 +36,9 @@ LIBTOOL = $(top_builddir)/libtool-disabl
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
-plugin_sources = charset.c configure.c plugin.c wrap_id3.c
+plugin_sources = charset.c configure.c plugin.c wrap_id3.c \
+ canonical_tag.c charset_common.c dither.c id3v1.c id3v2.c \
+ vorbiscomment.c
if FLaC__HAS_ID3LIB
libxmms_flac_la_SOURCES = $(plugin_sources)
@@ -52,5 +54,5 @@ endif
# for fix info see:
# http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
# the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@
+libxmms_flac_la_LIBADD = -lFLAC @XMMS_LIBS@ @ID3LIB_LIBS@
libxmms_flac_la_LDFLAGS = -module -avoid-version

View File

@ -0,0 +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 = \
$(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 \
- -L$(top_builddir)/src/libFLAC/.libs \
+ -lFLAC \
@XMMS_LIBS@ \
@ID3LIB_LIBS@
@@ -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

@ -1,12 +0,0 @@
$OpenBSD: patch-src_plugin_xmms_charset_common_c,v 1.1 2002/11/03 02:14:54 naddy Exp $
--- src/plugin_xmms/charset_common.c.orig Sat Nov 2 01:38:58 2002
+++ src/plugin_xmms/charset_common.c Sat Nov 2 01:39:09 2002
@@ -33,7 +33,7 @@
#include <langinfo.h>
#endif
-#include "charset.h"
+#include "charset_common.h"
/*************