Author: chris Date: Tue Feb 19 01:52:46 2008 New Revision: 282 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=282&repname=user%3a+chris Log: more testing... cant forget to fix/disable asm on intel...
Modified: trunk/finkinfo/sound/flac.info trunk/finkinfo/sound/flac.patch Modified: trunk/finkinfo/sound/flac.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/finkinfo/sound/flac.info&rev=282&repname=user%3a+chris ============================================================================== --- trunk/finkinfo/sound/flac.info (original) +++ trunk/finkinfo/sound/flac.info Tue Feb 19 01:52:46 2008 @@ -8,26 +8,28 @@ Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 153c8b15a54da428d1f0fadc756c22c7 PatchFile: %n.patch -PatchFile-MD5: 3a11d5d256841646cba4aa5c3ecf3649 +PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0 PatchScript: << #!/bin/sh -ex patch -p1 < %{PatchFile} - patch -p0 < patch/ltmain.sh.patch - patch -p0 < patch/nasm.h.patch + patch -p0 < patches/ltmain.sh.patch + patch -p0 < patches/nasm.h.patch << NoSetCPPFLAGS: true SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I%p/include NoSetLDFLAGS: true -ConfigureParams: --mandir='${prefix}/share/man' +ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath BuildDependsOnly: True GCC: 4.0 CompileScript: << #!/bin/sh -ex ./configure %c + #/bin/sh patches/fixrpath.sh make OBJ_FORMAT=macho << InstallScript: << #!/bin/sh -ex + perl -pi -e 's#/[^' ]*%b/src/libFLAC#%p/lib#g' src/plugin_xmms/libxmms-flac.la make install DESTDIR=%d mv %i/share/doc/%n-%v %i/share/doc/%n << Modified: trunk/finkinfo/sound/flac.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/finkinfo/sound/flac.patch&rev=282&repname=user%3a+chris ============================================================================== --- trunk/finkinfo/sound/flac.patch (original) +++ trunk/finkinfo/sound/flac.patch Tue Feb 19 01:52:46 2008 @@ -1,6 +1,38 @@ -diff -ruN flac-1.2.1/patch/ltmain.sh.patch flac-1.2.1.new/patch/ltmain.sh.patch ---- flac-1.2.1/patch/ltmain.sh.patch 1969-12-31 19:00:00.000000000 -0500 -+++ flac-1.2.1.new/patch/ltmain.sh.patch 2007-01-25 21:34:54.000000000 -0500 +diff -ruN flac-1.2.1/patches/fixrpath.sh flac-1.2.1.new/patches/fixrpath.sh +--- flac-1.2.1/patches/fixrpath.sh 1969-12-31 19:00:00.000000000 -0500 ++++ flac-1.2.1.new/patches/fixrpath.sh 2008-02-18 10:51:07.000000000 -0500 +@@ -0,0 +1,28 @@ ++#!/bin/sh ++# $Id: fixrpath,v 1.1 2004/05/27 10:48:25 kobras Exp $ ++# libtool -rpath workaround based on a suggestion by Yann Dirson ++# <[EMAIL PROTECTED]> ++# ++# It is supposed to be inserted in configure.in, but I didn't want ++# to re-run autoconf (since that bloats the Debian diff unnecessarily), ++# so I just patch libtool after running configure. -- Richard Braakman ++# <[EMAIL PROTECTED]> ++# ++# The version of libtool included with LessTif unfortunately insists on ++# linking with -rpath, i.e. hardwiring locations. This is not desirable. ++# ++# The dummy define is improbable enough not to conflict with anything; it is ++# just here to fool libtool by making it believe it gave some useful info to ++# gcc. ++# ++# This will also patch the generated libtool to explicitly ++# link libraries against the libraries they depend on. (particularly libc) ++ ++for i in libtool libtool-disable-static; do ++sed < $i > $i-2 \ ++ -e 's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \ ++ -e '/^archive_cmds="/s/"$/ \$deplibs"/' ++mv $i-2 $i ++chmod 755 $i ++done ++ +diff -ruN flac-1.2.1/patches/ltmain.sh.patch flac-1.2.1.new/patches/ltmain.sh.patch +--- flac-1.2.1/patches/ltmain.sh.patch 1969-12-31 19:00:00.000000000 -0500 ++++ flac-1.2.1.new/patches/ltmain.sh.patch 2008-02-18 10:48:01.000000000 -0500 @@ -0,0 +1,11 @@ +--- ltmain.sh.orig Fri Feb 4 21:22:19 2005 ++++ ltmain.sh Wed Feb 23 19:09:37 2005 @@ -9,13 +41,13 @@ + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes -++ #need_relink=yes +++ need_relink=no + fi + # This is a shared library + -diff -ruN flac-1.2.1/patch/nasm.h.patch flac-1.2.1.new/patch/nasm.h.patch ---- flac-1.2.1/patch/nasm.h.patch 1969-12-31 19:00:00.000000000 -0500 -+++ flac-1.2.1.new/patch/nasm.h.patch 2007-01-25 21:34:54.000000000 -0500 +diff -ruN flac-1.2.1/patches/nasm.h.patch flac-1.2.1.new/patches/nasm.h.patch +--- flac-1.2.1/patches/nasm.h.patch 1969-12-31 19:00:00.000000000 -0500 ++++ flac-1.2.1.new/patches/nasm.h.patch 2007-01-25 21:34:54.000000000 -0500 @@ -0,0 +1,14 @@ +--- src/libFLAC/ia32/nasm.h~ 2005-01-25 13:14:22.000000000 +0900 ++++ src/libFLAC/ia32/nasm.h 2006-03-15 18:07:23.000000000 +0900 @@ -31,3 +63,14 @@ + %else + %error unsupported object format! + %endif +diff -ruN flac-1.2.1/src/plugin_xmms/Makefile.in flac-1.2.1.new/src/plugin_xmms/Makefile.in +--- flac-1.2.1/src/plugin_xmms/Makefile.in 2007-09-16 16:05:18.000000000 -0400 ++++ flac-1.2.1.new/src/plugin_xmms/Makefile.in 2008-02-18 19:48:45.000000000 -0500 +@@ -265,7 +265,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 \ + @OGG_LIBS@ \ + @XMMS_LIBS@ \ + @LIBICONV@ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs