Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21807
Modified Files:
Tag: pangocairo-branch
libsndfile1.info libsndfile1.patch
Log Message:
Same feature is patched into configure.ac and configure, so just patch
configure and avoid the need to redo autoconf (due to changed configure.ac
timestamp). Avoids need to figure out what aclocal fails.
Index: libsndfile1.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.patch,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- libsndfile1.patch 26 Apr 2008 13:42:59 -0000 1.3.2.3
+++ libsndfile1.patch 27 Apr 2008 16:35:58 -0000 1.3.2.4
@@ -1,7 +1,7 @@
diff -Nurd libsndfile-1.0.17/patches/flac-1.1.4.dpatch
libsndfile-1.0.17-new/patches/flac-1.1.4.dpatch
--- libsndfile-1.0.17/patches/flac-1.1.4.dpatch 1969-12-31
19:00:00.000000000 -0500
+++ libsndfile-1.0.17-new/patches/flac-1.1.4.dpatch 2008-04-26
09:22:47.000000000 -0400
-@@ -0,0 +1,486 @@
+@@ -0,0 +1,475 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## flac-1.1.4.dpatch by Samuel Mimram <[EMAIL PROTECTED]>
+##
@@ -10,19 +10,8 @@
+## DP: Patch stolen from
http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/lib/libsndfile/flac-1.1.4.patch.
+
[EMAIL PROTECTED]@
-+diff -urNad libsndfile-1.0.17~/configure.ac libsndfile-1.0.17/configure.ac
-+--- libsndfile-1.0.17~/configure.ac 2006-08-31 11:39:37.000000000 +0200
-++++ libsndfile-1.0.17/configure.ac 2007-06-15 12:38:53.000000000 +0200
-+@@ -339,7 +339,8 @@
-+ if test "x$HAVE_FLAC_1_1_1" = xyes ; then
-+ AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you
have libflac 1.1.1])
-+ fi
-+- FLAC_LIBS="-lFLAC"
-++ # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we
need -logg
-++ FLAC_LIBS="-lFLAC -logg"
-+ fi
-+ fi
-+
++# removed configure.ac section because a later section implements
++# the same change in configure directly
+diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c
+--- libsndfile-1.0.17~/src/flac.c 2006-08-31 11:22:19.000000000 +0200
++++ libsndfile-1.0.17/src/flac.c 2007-06-15 12:38:53.000000000 +0200
Index: libsndfile1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.info,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -d -r1.7.2.5 -r1.7.2.6
--- libsndfile1.info 26 Apr 2008 13:42:59 -0000 1.7.2.5
+++ libsndfile1.info 27 Apr 2008 16:35:58 -0000 1.7.2.6
@@ -7,7 +7,7 @@
Source: http://www.mega-nerd.com/libsndfile/libsndfile-%v.tar.gz
Source-MD5: 2d126c35448503f6dbe33934d9581f6b
PatchFile: %n.patch
-PatchFile-MD5: 0e07e7a190361a92b270f4e06509c879
+PatchFile-MD5: 02430270b1ad9e04d2f13173a477b65e
PatchScript: <<
#!/bin/sh -ex
patch -p1 < %{PatchFile}
@@ -62,8 +62,6 @@
just inline wrappers (no compiled C++ library implementation). Therefore,
no need for different libsndfile1 packages for different g++ ABI. The
testing of the C++ interface does not leak any compiled code into the .deb.
-
- Patches include changes to configure.ac, so autoreconf needs to be rerun.
<<
License: LGPL
Homepage: http://www.zip.com.au/~erikd/libsndfile
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
