Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22622
Modified Files:
flac-nox.info flac-nox.patch
Log Message:
Sync patch with non-nox
Index: flac-nox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/flac-nox.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flac-nox.patch 8 Nov 2004 00:08:54 -0000 1.3
+++ flac-nox.patch 28 Dec 2004 08:27:29 -0000 1.4
@@ -1,8 +1,24 @@
-#this first patch fixes:
-#libtool-disable-static: line 3664: Mach-O dynamically linked shared library:
command not found
+--- 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
+- 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 $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
-@@ -24,6 +24,10 @@
+@@ -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.
@@ -34,32 +50,24 @@
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
-@@ -5850,13 +5850,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.1/src/Makefile.in.orig Sat Nov 6 14:54:39 2004
-+++ flac-1.1.1/src/Makefile.in Sat Nov 6 14:54:48 2004
-@@ -219,7 +219,6 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
[EMAIL PROTECTED]@XMMS_DIRS = plugin_xmms
- @[EMAIL PROTECTED] = libOggFLAC libOggFLAC++
- @[EMAIL PROTECTED] = test_libOggFLAC test_libOggFLAC++
- SUBDIRS = \
+--- 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.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/flac-nox.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flac-nox.info 7 Nov 2004 00:44:12 -0000 1.5
+++ flac-nox.info 28 Dec 2004 08:27:29 -0000 1.6
@@ -1,6 +1,6 @@
Package: flac-nox
Version: 1.1.1
-Revision: 10
+Revision: 11
BuildDepends: libogg, libiconv-dev
Conflicts: flac
Provides: flac
-------------------------------------------------------
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://productguide.itmanagersjournal.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
