Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv31765

Added Files:
        flac-1.1.0-2.info flac-1.1.0-2.patch flac-nox-1.1.0-2.info 
        flac-nox-1.1.0-2.patch 
Removed Files:
        flac-1.1.0-1.info flac-1.1.0-1.patch flac-nox-1.1.0-1.info 
        flac-nox-1.1.0-1.patch 
Log Message:
Upgrade should work now


--- NEW FILE: flac-1.1.0-2.info ---
Package: flac
Version: 1.1.0
Revision: 2
BuildDepends: libogg, xmms, dlcompat-dev
Depends: %n-shlibs
Conflicts: flac-nox
Replaces: flac-nox
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
Patch: %f.patch
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.1
CompileScript: <<
mkdir -p %b/src/libOggFLAC/.libs 
mkdir -p %b/src/libFLAC/.libs 
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d 
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: dlcompat-shlibs
  Conflicts: flac-nox-shlibs
  Replaces: flac-nox-shlibs
  Suggests: %N-bin
  Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib
  Shlibs: <<
    %p/lib/libFLAC.4.dylib 6.0.0 %n (>= 1.1.0-1)
    %p/lib/libFLAC++.1.dylib 4.0.0 %n (>= 1.1.0-1)
  <<
  DocFiles: README COPYING.LGPL
  Description: Free lossless audio codec - shared libs
<<
SplitOff2: <<
  Package: %N-xmms
  Depends: xmms, dlcompat-shlibs, %N-shlibs (= %v-%r)
  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
*  libFLAC, a library encoders and decoders, and a metadata interface
*  libFLAC++, an object wrapper around libFLAC
*  flac, a CLI wrapper around libFLAC to encode/decode .flac files
*  metaflac, a command-line metadata editor for .flac files
*  Input plugins for various music players (Winamp, XMMS, etc)
<<
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.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Homepage: http://flac.sf.net/

--- NEW FILE: flac-1.1.0-2.patch ---
--- flac-1.0.3-2/configure      Wed Jul  3 14:01:22 2002
+++ flac-1.0.3-2/configure      Mon Sep 23 13:44:13 2002
@@ -5286,7 +5286,7 @@
     # 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.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='~'

--- NEW FILE: flac-nox-1.1.0-2.info ---
Package: flac-nox
Version: 1.1.0
Revision: 2
BuildDepends: libogg, dlcompat-dev
Conflicts: flac
Provides: flac
Replaces: flac
Depends: %n-shlibs
Source: mirror:sourceforge:flac/flac-%v.tar.gz
Source-MD5: 19b456a27b5fcf502c76cc33f33e1490
Patch: %f.patch
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.1
CompileScript: <<
mkdir -p %b/src/libOggFLAC/.libs 
mkdir -p %b/src/libFLAC/.libs 
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d 
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: dlcompat-shlibs
  Replaces: flac-shlibs
  Conflicts: flac-shlibs
  Provides: flac-shlibs
  Suggests: %N-bin
  Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib
  Shlibs: <<
    %p/lib/libFLAC.4.dylib 6.0.0 %n (>= 1.1.0-1)
    %p/lib/libFLAC++.1.dylib 4.0.0 %n (>= 1.1.0-1)
  <<
  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
*  libFLAC, a library encoders and decoders, and a metadata interface
*  libFLAC++, an object wrapper around libFLAC
*  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.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Homepage: http://flac.sf.net/

--- NEW FILE: flac-nox-1.1.0-2.patch ---
--- flac-1.0.3-2/configure      Wed Jul  3 14:01:22 2002
+++ flac-1.0.3-2/configure      Mon Sep 23 13:44:13 2002
@@ -5286,7 +5286,7 @@
     # 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.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@
 
-@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_xmms
-
 @FLaC__HAS_OGG_TRUE@OGGFLAC_DIRS = libOggFLAC libOggFLAC++
 @FLaC__HAS_OGG_TRUE@OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
 

--- flac-1.1.0-1.info DELETED ---

--- flac-1.1.0-1.patch DELETED ---

--- flac-nox-1.1.0-1.info DELETED ---

--- flac-nox-1.1.0-1.patch DELETED ---



-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to