Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25099
Modified Files:
libsndfile1.info libsndfile1.patch
Log Message:
Update from tracker
http://sourceforge.net/tracker/index.php?func=detail&aid=1946161&group_id=17203&atid=414256
Index: libsndfile1.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libsndfile1.patch 27 Apr 2008 18:06:52 -0000 1.5
+++ libsndfile1.patch 22 May 2008 14:58:57 -0000 1.6
@@ -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
+diff -ruN 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,475 @@
++++ libsndfile-1.0.17.new/patches/flac-1.1.4.dpatch 2008-02-24
21:22:48.000000000 -0500
+@@ -0,0 +1,486 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## flac-1.1.4.dpatch by Samuel Mimram <[EMAIL PROTECTED]>
+##
@@ -10,8 +10,19 @@
+## DP: Patch stolen from
http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/lib/libsndfile/flac-1.1.4.patch.
+
[EMAIL PROTECTED]@
-+# removed configure.ac section because a later section implements
-+# the same change in configure directly
++diff -ruN libsndfile-1.0.17/configure libsndfile-1.0.17-new/configure
++--- libsndfile-1.0.17/configure 2006-08-31 12:55:50.000000000 +0200
+++++ libsndfile-1.0.17-new/configure 2008-04-18 18:56:48.000000000 +0200
++@@ -31226,7 +31226,8 @@
++ _ACEOF
++
++ fi
++- FLAC_LIBS="-lFLAC"
+++ # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence
we need -logg
+++ FLAC_LIBS="-lFLAC -logg"
++ fi
++ fi
++
+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
@@ -477,25 +488,9 @@
+
+ return ((sf_count_t) -1) ;
+ } ;
-diff -Nurd libsndfile-1.0.17/patches/flac-configure.patch
libsndfile-1.0.17-new/patches/flac-configure.patch
---- libsndfile-1.0.17/patches/flac-configure.patch 1969-12-31
19:00:00.000000000 -0500
-+++ libsndfile-1.0.17-new/patches/flac-configure.patch 2008-04-26
09:34:01.000000000 -0400
-@@ -0,0 +1,12 @@
-+diff -Nurd libsndfile-1.0.17/configure libsndfile-1.0.17-patched/configure
-+--- libsndfile-1.0.17/configure 2006-08-31 06:55:50.000000000 -0400
-++++ libsndfile-1.0.17-patched/configure 2008-04-26 09:33:40.000000000
-0400
-+@@ -31226,7 +31226,7 @@
-+ _ACEOF
-+
-+ fi
-+- FLAC_LIBS="-lFLAC"
-++ FLAC_LIBS="-lFLAC -logg"
-+ fi
-+ fi
-+
-diff -Nurd libsndfile-1.0.17/patches/lossy_comp_test-overflow.dpatch
libsndfile-1.0.17-new/patches/lossy_comp_test-overflow.dpatch
+diff -ruN libsndfile-1.0.17/patches/lossy_comp_test-overflow.dpatch
libsndfile-1.0.17.new/patches/lossy_comp_test-overflow.dpatch
--- libsndfile-1.0.17/patches/lossy_comp_test-overflow.dpatch 1969-12-31
19:00:00.000000000 -0500
-+++ libsndfile-1.0.17-new/patches/lossy_comp_test-overflow.dpatch
2008-04-26 09:22:47.000000000 -0400
++++ libsndfile-1.0.17.new/patches/lossy_comp_test-overflow.dpatch
2008-02-24 21:22:48.000000000 -0500
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lossy_comp_test-overflow.dpatch by Martin Michlmayr <[EMAIL PROTECTED]>
@@ -518,9 +513,9 @@
+ long datalen, seekpos ;
+ double scale ;
+
-diff -Nurd libsndfile-1.0.17/patches/overflow.dpatch
libsndfile-1.0.17-new/patches/overflow.dpatch
+diff -ruN libsndfile-1.0.17/patches/overflow.dpatch
libsndfile-1.0.17.new/patches/overflow.dpatch
--- libsndfile-1.0.17/patches/overflow.dpatch 1969-12-31 19:00:00.000000000
-0500
-+++ libsndfile-1.0.17-new/patches/overflow.dpatch 2008-04-26
09:22:47.000000000 -0400
++++ libsndfile-1.0.17.new/patches/overflow.dpatch 2008-02-24
21:22:48.000000000 -0500
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## overflow.dpatch by Samuel Mimram <[EMAIL PROTECTED]>
Index: libsndfile1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- libsndfile1.info 27 Apr 2008 18:06:52 -0000 1.16
+++ libsndfile1.info 22 May 2008 14:58:57 -0000 1.17
@@ -7,14 +7,13 @@
Source: http://www.mega-nerd.com/libsndfile/libsndfile-%v.tar.gz
Source-MD5: 2d126c35448503f6dbe33934d9581f6b
PatchFile: %n.patch
-PatchFile-MD5: 02430270b1ad9e04d2f13173a477b65e
+PatchFile-MD5: 110bae811030e56bc22afc65c0b6c9d0
PatchScript: <<
#!/bin/sh -ex
patch -p1 < %{PatchFile}
patch -p1 < patches/flac-1.1.4.dpatch
patch -p1 < patches/lossy_comp_test-overflow.dpatch
patch -p1 < patches/overflow.dpatch
- patch -p1 < patches/flac-configure.patch
<<
Conflicts: libsndfile, libsndfile0
Replaces: libsndfile, libsndfile0
@@ -22,7 +21,7 @@
SetMAKEFLAGS: -j1
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-sqlite
InstallScript: <<
- make -j1 install DESTDIR=%d
+ make install DESTDIR=%d
mkdir -p %i/share/doc/%n/html
cp doc/*.html doc/*.jpg doc/*.css %i/share/doc/%n/html/
<<
-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
