Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18429

Added Files:
        flac-nox.info flac-nox.patch flac.info flac.patch 
Removed Files:
        flac-1.1.0-15.info flac-1.1.0-15.patch flac-nox-1.1.0-13.info 
        flac-nox-1.1.0-13.patch 
Log Message:
Stable


--- NEW FILE: flac-nox.info ---
Package: flac-nox
Version: 1.1.0
Revision: 28
BuildDepends: libogg, libiconv-dev
Conflicts: flac
Provides: flac
Replaces: flac
Depends: %n-shlibs
Source: mirror:sourceforge:flac/flac-%v.tar.gz
Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
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
<<
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
BuildDependsOnly: True
GCC: 3.3
CompileScript: <<
#!/bin/sh -ex
#mkdir -p %b/src/libOggFLAC/.libs 
#mkdir -p %b/src/libFLAC/.libs 
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d 
mv %i/share/doc/flac-%v %i/share/doc/%n 
<<
SplitOff: <<
  Package: %N-shlibs
  Replaces: flac-shlibs, flac
  Conflicts: flac-shlibs
  Provides: flac-shlibs
  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)
  <<
  DocFiles: README COPYING.LGPL
  Description: Free lossless audio codec - shared libs
<<
SplitOff2: <<
  Package: %N-bin
  Conflicts: flac-bin
  Provides: flac-bin
  Replaces: flac-bin
  Files: bin/flac bin/metaflac
  Depends: libogg-shlibs, %N-shlibs
  DocFiles: README COPYING.LGPL
  Description: Free lossless audio codec - encoder/decoder
<<
DocFiles: README AUTHORS COPYING.FDL COPYING.GPL COPYING.LGPL
Description: Free lossless audio codec - No X11
DescDetail: <<
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
*  The stream format
In the flac-nox and flac-nox-shlibs packages:
*  libFLAC, a library encoders and decoders, and a metadata interface
*  libFLAC++, an object wrapper around libFLAC
In the flac-nox-bin package:
*  flac, a CLI wrapper around libFLAC to encode/decode .flac files
*  metaflac, a command-line metadata editor for .flac files

This non X11 version does not build the XMMS plugin.
<<
DescPackaging: <<
Does not use pbxbuild method since we want dylibs, and
the xmms plugin. Also the make/config method puts everything in
the right place.
libtool relink and bash versioning patches applied.
patch to disable xmms plugin applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Homepage: http://flac.sourceforge.net/

--- NEW FILE: flac-nox.patch ---
--- 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 @@
       allow_undefined_flag='-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
+      allow_undefined_flag='-flat_namespace -undefined dynamic_lookup'
       ;;
     esac
     # FIXME: Relying on posixy $() will cause problems for
     #        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)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes

--- NEW FILE: flac.info ---
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
Depends: %n-shlibs (= %v-%r)
Conflicts: flac-nox
Replaces: flac-nox
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
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
<<
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
ConfigureParams: --mandir=%p/share/man
BuildDependsOnly: True
GCC: 3.3
CompileScript: <<
  #!/bin/sh -ex
#  mkdir -p %b/src/libOggFLAC/.libs 
#  mkdir -p %b/src/libFLAC/.libs 
#  mkdir -p %b/src/libFLAC++/.libs 
  %p/bin/glibtoolize --force
  ./autogen.sh
  ./configure %c
  make
<<
InstallScript: <<
  #!/bin/sh -ex
  make install DESTDIR=%d 
  mv %i/share/doc/%n-%v %i/share/doc/%n 
<<
SplitOff: <<
  Package: %N-shlibs
  Conflicts: flac-nox-shlibs
  Replaces: flac-nox-shlibs, flac
  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)
  <<
  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
  Suggests: %N-bin
  Files: lib/xmms/Input/libxmms*
  DocFiles: README COPYING.LGPL
  Description: Free lossless audio codec - xmms plugin
<<
SplitOff3: <<
  Package: %N-bin
  Conflicts: flac-nox-bin
  Replaces: flac-nox-bin
  Files: bin/flac bin/metaflac
  Depends: libogg-shlibs, %N-shlibs
  DocFiles: README COPYING.LGPL
  Description: Free lossless audio codec - encoder/decoder
<<
DocFiles: README AUTHORS COPYING.FDL COPYING.GPL COPYING.LGPL
Description: Free lossless audio codec
DescDetail: <<
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
*  The stream format
In the flac and flac-shlibs packages:
*  libFLAC, a library encoders and decoders, and a metadata interface
*  libFLAC++, an object wrapper around libFLAC
In the flac-bin package:
*  flac, a CLI wrapper around libFLAC to encode/decode .flac files
*  metaflac, a command-line metadata editor for .flac files
In the flac-xmms package:
*  Input plugin for XMMS
<<
DescPackaging: <<
Does not use pbxbuild method since we want dylibs, and
the xmms plugin. Also the make/config method puts everything in
the right place.
libtool relink and bash versioning patches applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Homepage: http://flac.sourceforge.net/

--- NEW FILE: flac.patch ---
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 @@
 
 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 @@
 
          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/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 @@
       allow_undefined_flag='-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
+      allow_undefined_flag='-flat_namespace -undefined dynamic_lookup'
       ;;
     esac
     # FIXME: Relying on posixy $() will cause problems for
     #        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)'
     # 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.0-15.info DELETED ---

--- flac-1.1.0-15.patch DELETED ---

--- flac-nox-1.1.0-13.info DELETED ---

--- flac-nox-1.1.0-13.patch DELETED ---



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to