Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29674
Modified Files:
flac-nox.info flac-nox.patch flac.info flac.patch
Log Message:
latest version to stable
Index: flac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/flac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac.patch 9 Feb 2006 01:08:54 -0000 1.1
+++ flac.patch 14 Mar 2006 19:24:27 -0000 1.2
@@ -1,6 +1,7 @@
---- 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 @@
+diff -ru flac-1.1.1.orig/configure flac-1.1.1/configure
+--- flac-1.1.1.orig/configure 2004-09-29 00:17:41.000000000 -0400
++++ flac-1.1.1/configure 2006-03-09 18:51:05.000000000 -0500
+@@ -5858,13 +5858,13 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -16,11 +17,12 @@
# 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
+diff -ru flac-1.1.1.orig/ltmain.sh flac-1.1.1/ltmain.sh
+--- flac-1.1.1.orig/ltmain.sh 2004-09-29 00:17:31.000000000 -0400
++++ flac-1.1.1/ltmain.sh 2006-03-09 18:51:05.000000000 -0500
@@ -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.
+ TIMESTAMP=" (1.1220.2.94 2004/04/10 16:27:27)"
+
+SED=sed
+EGREP=egrep
@@ -29,16 +31,16 @@
# 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 @@
-
+@@ -2280,7 +2284,7 @@
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ # need_relink=yes
fi
+ # This is a shared library
- if test -n "$old_archive_from_expsyms_cmds"; then
-@@ -3883,6 +3883,11 @@
+@@ -3883,6 +3887,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
cmds=$archive_expsym_cmds
else
@@ -50,8 +52,24 @@
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
+diff -ru flac-1.1.1.orig/src/libFLAC/ia32/nasm.h
flac-1.1.1/src/libFLAC/ia32/nasm.h
+--- flac-1.1.1.orig/src/libFLAC/ia32/nasm.h 2004-01-16 22:58:40.000000000
-0500
++++ flac-1.1.1/src/libFLAC/ia32/nasm.h 2006-03-09 19:03:30.000000000 -0500
+@@ -49,6 +49,11 @@
+ %idefine code_section section .text align=16
+ %idefine data_section section .data align=32
+ %idefine bss_section section .bss align=32
++%elifdef OBJ_FORMAT_macho
++ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
++ %idefine code_section section .text
++ %idefine data_section section .data
++ %idefine bss_section section .bss
+ %else
+ %error unsupported object format!
+ %endif
+diff -ru flac-1.1.1.orig/src/plugin_common/canonical_tag.c
flac-1.1.1/src/plugin_common/canonical_tag.c
+--- flac-1.1.1.orig/src/plugin_common/canonical_tag.c 2004-09-27
21:00:55.000000000 -0400
++++ flac-1.1.1/src/plugin_common/canonical_tag.c 2006-03-09
18:51:05.000000000 -0500
@@ -66,7 +66,7 @@
wcsdup (s)
const wchar_t *s;
@@ -61,8 +79,9 @@
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
+diff -ru flac-1.1.1.orig/src/plugin_xmms/Makefile.in
flac-1.1.1/src/plugin_xmms/Makefile.in
+--- flac-1.1.1.orig/src/plugin_xmms/Makefile.in 2004-09-29
00:18:47.000000000 -0400
++++ flac-1.1.1/src/plugin_xmms/Makefile.in 2006-03-09 18:51:05.000000000
-0500
@@ -278,7 +278,6 @@
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
Index: flac-nox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/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 9 Feb 2006 01:08:54 -0000 1.1
+++ flac-nox.patch 14 Mar 2006 19:24:27 -0000 1.2
@@ -1,6 +1,7 @@
---- 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 @@
+diff -ru flac-1.1.1.orig/configure flac-1.1.1/configure
+--- flac-1.1.1.orig/configure 2004-09-29 00:17:41.000000000 -0400
++++ flac-1.1.1/configure 2006-03-09 18:51:05.000000000 -0500
+@@ -5858,13 +5858,13 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -16,11 +17,12 @@
# 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
+diff -ru flac-1.1.1.orig/ltmain.sh flac-1.1.1/ltmain.sh
+--- flac-1.1.1.orig/ltmain.sh 2004-09-29 00:17:31.000000000 -0400
++++ flac-1.1.1/ltmain.sh 2006-03-09 18:51:05.000000000 -0500
@@ -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.
+ TIMESTAMP=" (1.1220.2.94 2004/04/10 16:27:27)"
+
+SED=sed
+EGREP=egrep
@@ -29,16 +31,16 @@
# 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 @@
-
+@@ -2280,7 +2284,7 @@
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ # need_relink=yes
fi
+ # This is a shared library
- if test -n "$old_archive_from_expsyms_cmds"; then
-@@ -3883,6 +3883,11 @@
+@@ -3883,6 +3887,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
cmds=$archive_expsym_cmds
else
@@ -50,8 +52,24 @@
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
+diff -ru flac-1.1.1.orig/src/libFLAC/ia32/nasm.h
flac-1.1.1/src/libFLAC/ia32/nasm.h
+--- flac-1.1.1.orig/src/libFLAC/ia32/nasm.h 2004-01-16 22:58:40.000000000
-0500
++++ flac-1.1.1/src/libFLAC/ia32/nasm.h 2006-03-09 19:03:30.000000000 -0500
+@@ -49,6 +49,11 @@
+ %idefine code_section section .text align=16
+ %idefine data_section section .data align=32
+ %idefine bss_section section .bss align=32
++%elifdef OBJ_FORMAT_macho
++ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
++ %idefine code_section section .text
++ %idefine data_section section .data
++ %idefine bss_section section .bss
+ %else
+ %error unsupported object format!
+ %endif
+diff -ru flac-1.1.1.orig/src/plugin_common/canonical_tag.c
flac-1.1.1/src/plugin_common/canonical_tag.c
+--- flac-1.1.1.orig/src/plugin_common/canonical_tag.c 2004-09-27
21:00:55.000000000 -0400
++++ flac-1.1.1/src/plugin_common/canonical_tag.c 2006-03-09
18:51:05.000000000 -0500
@@ -66,7 +66,7 @@
wcsdup (s)
const wchar_t *s;
@@ -61,8 +79,9 @@
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
+diff -ru flac-1.1.1.orig/src/plugin_xmms/Makefile.in
flac-1.1.1/src/plugin_xmms/Makefile.in
+--- flac-1.1.1.orig/src/plugin_xmms/Makefile.in 2004-09-29
00:18:47.000000000 -0400
++++ flac-1.1.1/src/plugin_xmms/Makefile.in 2006-03-09 18:51:05.000000000
-0500
@@ -278,7 +278,6 @@
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
Index: flac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/flac.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac.info 9 Feb 2006 01:08:54 -0000 1.1
+++ flac.info 14 Mar 2006 19:24:27 -0000 1.2
@@ -1,6 +1,6 @@
Package: flac
Version: 1.1.1
-Revision: 1011
+Revision: 1012
BuildDepends: xmms,popt, libtool14 (>= 1.5-1), libogg, xmms, readline (>=
4.3-1028), id3lib4-dev (>= 3.8.3-1014), glib, gtk+, libiconv-dev, gettext-dev,
gettext-bin, gettext-tools
#automake1.6,
Depends: %n-shlibs (= %v-%r)
@@ -30,7 +30,7 @@
# ./autogen.sh
rm -rf plugin_xmms
./configure %c
- make
+ make OBJ_FORMAT=macho
<<
InstallScript: <<
#!/bin/sh -ex
Index: flac-nox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/flac-nox.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac-nox.info 9 Feb 2006 01:08:54 -0000 1.1
+++ flac-nox.info 14 Mar 2006 19:24:27 -0000 1.2
@@ -1,6 +1,6 @@
Package: flac-nox
Version: 1.1.1
-Revision: 1011
+Revision: 1012
BuildDepends: libogg, libiconv-dev
Conflicts: flac
Provides: flac
@@ -25,7 +25,7 @@
#mkdir -p %b/src/libOggFLAC/.libs
#mkdir -p %b/src/libFLAC/.libs
./configure %c
-make
+make OBJ_FORMAT=macho
<<
InstallScript: <<
make install DESTDIR=%d
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
