Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32364
Modified Files:
flac-nox.info flac-nox.patch flac.info flac.patch
Log Message:
stable
Index: flac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound/flac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac.patch 7 Mar 2004 22:14:26 -0000 1.1
+++ flac.patch 20 Feb 2005 02:12:44 -0000 1.2
@@ -1,295 +1,19 @@
-Index: src/flac/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/flac/Makefile.am,v
-retrieving revision 1.1.1.9
-retrieving revision 1.3
-diff -u -r1.1.1.9 -r1.3
---- flac-1.1.0/src/flac/Makefile.am 25 Jan 2003 18:14:42 -0000 1.1.1.9
-+++ flac-1.1.0/src/flac/Makefile.am 2 Feb 2003 23:03:33 -0000 1.3
-@@ -41,10 +41,10 @@
-
- flac_LDADD = \
- $(NEED_OGGFLAC_LIB) \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/share/getopt/libgetopt.a \
-- $(top_builddir)/src/share/utf8/libutf8.a \
-+ $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- @OGG_LIBS@ \
- @LIBICONV@ \
-Index: src/metaflac/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/metaflac/Makefile.am,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -r1.1.1.5 -r1.2
---- flac-1.1.0/src/metaflac/Makefile.am 25 Jan 2003 18:14:53 -0000
1.1.1.5
-+++ flac-1.1.0/src/metaflac/Makefile.am 2 Feb 2003 23:03:34 -0000
1.2
-@@ -39,10 +39,10 @@
- metaflac_LDFLAGS =
-
- metaflac_LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/share/getopt/libgetopt.a \
-- $(top_builddir)/src/share/utf8/libutf8.a \
-+ $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- @LIBICONV@ \
- -lm
-Index: src/monkeys_audio_utilities/Makefile.am
-===================================================================
-RCS file:
/var/lib/cvs/debian/packages/flac/src/monkeys_audio_utilities/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -r1.1.1.3 -r1.4
-Index: src/monkeys_audio_utilities/flac_mac/Makefile.am
-===================================================================
-RCS file:
/var/lib/cvs/debian/packages/flac/src/monkeys_audio_utilities/flac_mac/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -r1.1.1.3 -r1.4
-Index: src/monkeys_audio_utilities/flac_ren/Makefile.am
-===================================================================
-RCS file:
/var/lib/cvs/debian/packages/flac/src/monkeys_audio_utilities/flac_ren/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -r1.1.1.3 -r1.4
-Index: src/plugin_common/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/plugin_common/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.5
-diff -u -r1.1.1.2 -r1.5
---- flac-1.1.0/src/plugin_common/Makefile.am 25 Jan 2003 18:15:48 -0000
1.1.1.2
-+++ flac-1.1.0/src/plugin_common/Makefile.am 7 Feb 2003 02:04:04 -0000
1.5
-@@ -6,7 +6,7 @@
-
- INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@
-
--noinst_LIBRARIES = libplugin_common.a
-+noinst_LTLIBRARIES = libplugin_common.la
-
- noinst_HEADERS = \
- all.h \
-@@ -20,7 +20,7 @@
- replaygain_synthesis.h \
- vorbiscomment.h
-
--libplugin_common_a_SOURCES = \
-+libplugin_common_la_SOURCES = \
- canonical_tag.c \
- charset.c \
- dither.c \
-Index: src/plugin_winamp2/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/plugin_winamp2/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.4
-diff -u -r1.1.1.4 -r1.4
-Index: src/plugin_winamp3/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/plugin_winamp3/Makefile.am,v
-retrieving revision 1.1.1.5
-retrieving revision 1.4
-diff -u -r1.1.1.5 -r1.4
-Index: src/plugin_xmms/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/plugin_xmms/Makefile.am,v
-retrieving revision 1.1.1.5
-retrieving revision 1.10
-diff -u -r1.1.1.5 -r1.10
---- flac-1.1.0/src/plugin_xmms/Makefile.am 14 Jan 2003 01:33:03 -0000
1.1.1.5
-+++ flac-1.1.0/src/plugin_xmms/Makefile.am 2 Feb 2003 23:03:38 -0000
1.10
-@@ -57,10 +57,10 @@
- # 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/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-- $(top_builddir)/src/share/utf8/libutf8.a \
-+ $(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 \
- -L$(top_builddir)/src/libFLAC/.libs \
- @XMMS_LIBS@ \
-Index: src/share/gain_analysis/Makefile.am
-===================================================================
-RCS file:
/var/lib/cvs/debian/packages/flac/src/share/gain_analysis/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- flac-1.1.0/src/share/gain_analysis/Makefile.am 25 Jan 2003 18:15:37
-0000 1.1.1.1
-+++ flac-1.1.0/src/share/gain_analysis/Makefile.am 2 Feb 2003 23:03:39
-0000 1.2
-@@ -4,9 +4,9 @@
-
- INCLUDES = -I$(top_srcdir)/include/share
-
--noinst_LIBRARIES = libgain_analysis.a
-+noinst_LTLIBRARIES = libgain_analysis.la
-
--libgain_analysis_a_SOURCES = gain_analysis.c
-+libgain_analysis_la_SOURCES = gain_analysis.c
-
- EXTRA_DIST = \
- Makefile.lite \
-Index: src/share/grabbag/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/share/grabbag/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- flac-1.1.0/src/share/grabbag/Makefile.am 25 Jan 2003 18:15:39 -0000
1.1.1.1
-+++ flac-1.1.0/src/share/grabbag/Makefile.am 2 Feb 2003 23:03:41 -0000
1.2
-@@ -4,9 +4,9 @@
-
- INCLUDES = -I$(top_srcdir)/include
-
--noinst_LIBRARIES = libgrabbag.a
-+noinst_LTLIBRARIES = libgrabbag.la
-
--libgrabbag_a_SOURCES = \
-+libgrabbag_la_SOURCES = \
- cuesheet.c \
- file.c \
- replaygain.c \
-Index: src/share/utf8/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/share/utf8/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- flac-1.1.0/src/share/utf8/Makefile.am 25 Jan 2003 18:15:36 -0000
1.1.1.1
-+++ flac-1.1.0/src/share/utf8/Makefile.am 2 Feb 2003 23:03:42 -0000
1.2
-@@ -4,9 +4,9 @@
-
- INCLUDES = -I$(top_srcdir)/include/share
-
--noinst_LIBRARIES = libutf8.a
-+noinst_LTLIBRARIES = libutf8.la
-
--libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
-+libutf8_la_SOURCES = charset.c charset.h iconvert.c utf8.c
-
- EXTRA_DIST = \
- Makefile.lite \
-Index: src/test_grabbag/cuesheet/Makefile.am
-===================================================================
-RCS file:
/var/lib/cvs/debian/packages/flac/src/test_grabbag/cuesheet/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- flac-1.1.0/src/test_grabbag/cuesheet/Makefile.am 25 Jan 2003 18:15:58
-0000 1.1.1.1
-+++ flac-1.1.0/src/test_grabbag/cuesheet/Makefile.am 2 Feb 2003 23:03:43
-0000 1.2
-@@ -25,8 +25,8 @@
- test_cuesheet_SOURCES = \
- main.c
- test_cuesheet_LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -lm
-
-Index: src/test_libFLAC++/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/test_libFLAC++/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -r1.1.1.4 -r1.2
---- flac-1.1.0/src/test_libFLAC++/Makefile.am 25 Jan 2003 18:15:42 -0000
1.1.1.4
-+++ flac-1.1.0/src/test_libFLAC++/Makefile.am 2 Feb 2003 23:03:45 -0000
1.2
-@@ -24,8 +24,8 @@
-
- noinst_PROGRAMS = test_libFLAC++
- test_libFLAC___LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/libFLAC++/libFLAC++.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -lm
-Index: src/test_libFLAC/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/test_libFLAC/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -r1.1.1.3 -r1.2
---- flac-1.1.0/src/test_libFLAC/Makefile.am 25 Jan 2003 18:15:40 -0000
1.1.1.3
-+++ flac-1.1.0/src/test_libFLAC/Makefile.am 2 Feb 2003 23:03:44 -0000
1.2
-@@ -24,8 +24,8 @@
-
- noinst_PROGRAMS = test_libFLAC
- test_libFLAC_LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -lm
- test_libFLAC_SOURCES = \
-Index: src/test_libOggFLAC++/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/test_libOggFLAC++/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -r1.1.1.2 -r1.2
---- flac-1.1.0/src/test_libOggFLAC++/Makefile.am 25 Jan 2003 18:15:46
-0000 1.1.1.2
-+++ flac-1.1.0/src/test_libOggFLAC++/Makefile.am 2 Feb 2003 23:03:48
-0000 1.2
-@@ -24,8 +24,8 @@
-
- noinst_PROGRAMS = test_libOggFLAC++
- test_libOggFLAC___LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
- $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
-Index: src/test_libOggFLAC/Makefile.am
-===================================================================
-RCS file: /var/lib/cvs/debian/packages/flac/src/test_libOggFLAC/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -r1.1.1.2 -r1.2
---- flac-1.1.0/src/test_libOggFLAC/Makefile.am 25 Jan 2003 18:15:45 -0000
1.1.1.2
-+++ flac-1.1.0/src/test_libOggFLAC/Makefile.am 2 Feb 2003 23:03:46 -0000
1.2
-@@ -24,8 +24,8 @@
+#this first patch fixes:
+#libtool-disable-static: line 3664: Mach-O dynamically linked shared library:
command not found
+--- flac-1.1.1/ltmain.sh.orig Sat Nov 6 14:12:46 2004
++++ flac-1.1.1/ltmain.sh Sat Nov 6 14:14:23 2004
+@@ -54,6 +54,10 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
- noinst_PROGRAMS = test_libOggFLAC
- test_libOggFLAC_LDADD = \
-- $(top_builddir)/src/share/grabbag/libgrabbag.a \
-- $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+ $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+ $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- @OGG_LIBS@ \
---- flac-1.1.0/confgure.in.orig 2003-02-11 08:46:25.000000000 -0800
-+++ flac-1.1.0/configure.in 2003-02-11 08:46:34.000000000 -0800
-@@ -70,7 +70,7 @@
- dnl There is some confusion over what libraries libid3 needs
- dnl so we must be pessimistic and try all permutations:
- dnl "-lid3" "-lid3 -lstdc++" "-lid3 -lz" "-lid3 -lz -lstdc++"
-- for xtra_stdcpp in "" " -lstdc++" ; do
-+ for xtra_stdcpp in "" " " ; do
- for xtra_z in "" " -lz" ; do
- if test "x$id3lib_found" = "x" ; then
- ac_save_CFLAGS="$CFLAGS"
---- flac-1.0.3/ltmain.sh 2002-07-02 16:28:18.000000000 -0700
-+++ flac-1.0.3-patched/ltmain.sh 2002-09-23 15:45:51.000000000 -0700
-@@ -1739,7 +1739,7 @@
++SED=sed
++EGREP=egrep
++max_cmd_len=4096
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -2280,7 +2280,7 @@
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
@@ -298,21 +22,21 @@
fi
if test -n "$old_archive_from_expsyms_cmds"; then
-@@ -2894,6 +2894,11 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval cmds=\"$archive_cmds\"
- fi
- save_ifs="$IFS"; IFS='~'
---- flac-1.1.0/aclocal.m4.orig Sun Nov 2 23:33:50 2003
-+++ flac-1.1.0/aclocal.m4 Sun Nov 2 23:38:30 2003
-@@ -2321,13 +2321,13 @@
+@@ -3883,6 +3883,11 @@
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
++ if test "x$verstring" = "x0.0"; then
++ tmp_verstring=
++ else
++ tmp_verstring="$verstring"
++ fi
+ cmds=$archive_cmds
+ fi
+ fi
+--- flac-1.1.0/configure.orig Sun Nov 2 23:33:50 2003
++++ flac-1.1.0/configure Sun Nov 2 23:38:30 2003
+@@ -2530,13 +2530,13 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -324,7 +48,36 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
++ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
+--- flac-1.1.1/src/plugin_common/canonical_tag.c.orig Sat Nov 6 16:37:55 2004
++++ flac-1.1.1/src/plugin_common/canonical_tag.c Sat Nov 6 16:38:12 2004
+@@ -66,7 +66,7 @@
+ wcsdup (s)
+
+ const wchar_t *s;
+
+ {
+
+- size_t len = (__wcslen (s) + 1) * sizeof (wchar_t);
+
++ size_t len = (wcslen (s) + 1) * sizeof (wchar_t);
+
+ void *new = malloc (len);
+
+
+
+ if (new == NULL)
+
+--- flac-1.1.1/src/plugin_xmms/Makefile.in.bak Tue Dec 7 20:47:20 2004
++++ flac-1.1.1/src/plugin_xmms/Makefile.in Tue Dec 7 20:47:32 2004
+@@ -278,7 +278,6 @@
+
$(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 \
+ @XMMS_LIBS@
+
+ libxmms_flac_la_LDFLAGS = -module -avoid-version
Index: flac-nox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound/flac-nox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac-nox.patch 7 Mar 2004 22:14:25 -0000 1.1
+++ flac-nox.patch 20 Feb 2005 02:12:44 -0000 1.2
@@ -1,40 +1,6 @@
---- flac-1.0.3/ltmain.sh 2002-07-02 16:28:18.000000000 -0700
-+++ flac-1.0.3-patched/ltmain.sh 2002-09-23 15:45:51.000000000 -0700
-@@ -1739,7 +1739,7 @@
-
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ # need_relink=yes
- fi
-
- if test -n "$old_archive_from_expsyms_cmds"; then
-@@ -2894,6 +2894,11 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval cmds=\"$archive_cmds\"
- fi
- save_ifs="$IFS"; IFS='~'
---- flac-1.1.0/src/Makefile.in.orig 2003-01-27 01:51:11.000000000 -0800
-+++ flac-1.1.0/src/Makefile.in 2003-01-27 01:51:19.000000000 -0800
-@@ -132,8 +132,6 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
-
[EMAIL PROTECTED]@XMMS_DIRS = plugin_xmms
--
- @[EMAIL PROTECTED] = libOggFLAC libOggFLAC++
- @[EMAIL PROTECTED] = test_libOggFLAC test_libOggFLAC++
-
---- flac-1.1.0/configure.orig Sun Nov 2 23:20:39 2003
-+++ flac-1.1.0/configure Sun Nov 2 23:29:26 2003
-@@ -5327,13 +5327,13 @@
+--- flac-1.1.0/configure.orig Sun Nov 2 23:33:50 2003
++++ flac-1.1.0/configure Sun Nov 2 23:38:30 2003
+@@ -2530,13 +2530,13 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -46,7 +12,62 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
++ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
+--- flac-1.1.1/ltmain.sh.orig Sat Nov 6 14:12:46 2004
++++ flac-1.1.1/ltmain.sh Sat Nov 6 14:14:23 2004
+@@ -54,6 +54,10 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++SED=sed
++EGREP=egrep
++max_cmd_len=4096
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -2280,7 +2280,7 @@
+
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ # need_relink=yes
+ fi
+
+ if test -n "$old_archive_from_expsyms_cmds"; then
+@@ -3883,6 +3883,11 @@
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
++ if test "x$verstring" = "x0.0"; then
++ tmp_verstring=
++ else
++ tmp_verstring="$verstring"
++ fi
+ cmds=$archive_cmds
+ fi
+ fi
+--- flac-1.1.1/src/plugin_common/canonical_tag.c.orig Sat Nov 6 16:37:55 2004
++++ flac-1.1.1/src/plugin_common/canonical_tag.c Sat Nov 6 16:38:12 2004
+@@ -66,7 +66,7 @@
+ wcsdup (s)
+ const wchar_t *s;
+ {
+- size_t len = (__wcslen (s) + 1) * sizeof (wchar_t);
++ size_t len = (wcslen (s) + 1) * sizeof (wchar_t);
+ void *new = malloc (len);
+
+ if (new == NULL)
+--- flac-1.1.1/src/plugin_xmms/Makefile.in.bak Tue Dec 7 20:47:20 2004
++++ flac-1.1.1/src/plugin_xmms/Makefile.in Tue Dec 7 20:47:32 2004
+@@ -278,7 +278,6 @@
+
$(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 \
+ @XMMS_LIBS@
+
+ libxmms_flac_la_LDFLAGS = -module -avoid-version
Index: flac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound/flac.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flac.info 16 Aug 2004 14:13:50 -0000 1.3
+++ flac.info 20 Feb 2005 02:12:44 -0000 1.4
@@ -1,21 +1,23 @@
Package: flac
-Version: 1.1.0
-Revision: 28
-BuildDepends: popt, libtool14 (>= 1.5-1), libogg, xmms, readline,
id3lib3.7-dev, automake1.6, autoconf2.5, glib, gtk+, libiconv-dev, gettext-dev,
gettext-bin
+Version: 1.1.1
+Revision: 11
+BuildDepends: xmms,popt, libtool14 (>= 1.5-1), libogg, xmms, readline,
id3lib4-dev, glib, gtk+, libiconv-dev, gettext-dev, gettext-bin
+#automake1.6,
Depends: %n-shlibs (= %v-%r)
Conflicts: flac-nox
Replaces: flac-nox
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
+Source-MD5: c6ccddccf8ad344065698047c2fc7280
PatchScript: <<
sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
-perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
-perl -pi -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
+perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
+perl -pi.bak -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
<<
NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-I%p/include
NoSetLDFLAGS: true
-#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libFLAC/.libs
-L%b/src/libFLAC++/.libs -L%p/lib
+#hardcode_direct avoids this:
+#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libOggFLAC++/.libs
-L%b/src/libFLAC/.libs -L%b/src/libFLAC++/.libs
ConfigureParams: --mandir=%p/share/man
BuildDependsOnly: True
GCC: 3.3
@@ -24,8 +26,9 @@
# mkdir -p %b/src/libOggFLAC/.libs
# mkdir -p %b/src/libFLAC/.libs
# mkdir -p %b/src/libFLAC++/.libs
- %p/bin/glibtoolize --force
- ./autogen.sh
+# %p/bin/glibtoolize --force
+# ./autogen.sh
+ rm -rf plugin_xmms
./configure %c
make
<<
@@ -41,17 +44,17 @@
Suggests: %N-bin
Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib lib/libOggFLAC.*.dylib
lib/libOggFLAC++.*.dylib
Shlibs: <<
- %p/lib/libFLAC.4.dylib 6.0.0 %n (>= 1.1.0-15)
- %p/lib/libFLAC++.1.dylib 4.0.0 %n (>= 1.1.0-15)
- %p/lib/libOggFLAC.1.dylib 2.0.0 %n (>= 1.1.0-15)
- %p/lib/libOggFLAC++.1.dylib 1.0.0 %n (>= 1.1.0-15)
+ %p/lib/libFLAC.6.dylib 7.0.0 %n (>= 1.1.1-10)
+ %p/lib/libFLAC++.4.dylib 5.0.0 %n (>= 1.1.1-10)
+ %p/lib/libOggFLAC.1.dylib 3.0.0 %n (>= 1.1.1-10)
+ %p/lib/libOggFLAC++.0.dylib 2.0.0 %n (>= 1.1.1-10)
<<
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - shared libs
<<
SplitOff2: <<
Package: %N-xmms
- Depends: xmms, %N-shlibs (= %v-%r), id3lib3.7-shlibs, popt-shlibs
+ Depends: xmms-bin, %N-shlibs (= %v-%r), id3lib4-shlibs, popt-shlibs
Suggests: %N-bin
Files: lib/xmms/Input/libxmms*
DocFiles: README COPYING.LGPL
Index: flac-nox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound/flac-nox.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flac-nox.info 16 Aug 2004 14:13:50 -0000 1.3
+++ flac-nox.info 20 Feb 2005 02:12:44 -0000 1.4
@@ -1,23 +1,23 @@
Package: flac-nox
-Version: 1.1.0
-Revision: 28
+Version: 1.1.1
+Revision: 11
BuildDepends: libogg, libiconv-dev
Conflicts: flac
Provides: flac
Replaces: flac
Depends: %n-shlibs
Source: mirror:sourceforge:flac/flac-%v.tar.gz
-Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
+Source-MD5: c6ccddccf8ad344065698047c2fc7280
PatchScript: <<
sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
-perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
-perl -pi -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
+perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
+perl -pi.bak -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
<<
NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
NoSetLDFLAGS: true
#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libFLAC/.libs
-ConfigureParams: --mandir=%p/share/man
+ConfigureParams: --mandir=%p/share/man
BuildDependsOnly: True
GCC: 3.3
CompileScript: <<
@@ -39,10 +39,10 @@
Suggests: %N-bin
Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib lib/libOggFLAC.*.dylib
lib/libOggFLAC++.*.dylib
Shlibs: <<
- %p/lib/libFLAC.4.dylib 6.0.0 %n (>= 1.1.0-13)
- %p/lib/libFLAC++.1.dylib 4.0.0 %n (>= 1.1.0-13)
- %p/lib/libOggFLAC.1.dylib 2.0.0 %n (>= 1.1.0-15)
- %p/lib/libOggFLAC++.1.dylib 1.0.0 %n (>= 1.1.0-15)
+ %p/lib/libFLAC.6.dylib 7.0.0 %n (>= 1.1.1-10)
+ %p/lib/libFLAC++.4.dylib 5.0.0 %n (>= 1.1.1-10)
+ %p/lib/libOggFLAC.1.dylib 3.0.0 %n (>= 1.1.1-10)
+ %p/lib/libOggFLAC++.0.dylib 2.0.0 %n (>= 1.1.1-10)
<<
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - shared libs
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
