<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[143862] trunk/dports/audio/libsndfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/143862">143862</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-12-23 08:01:21 -0800 (Wed, 23 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libsndfile: update to 1.0.26; adjust patches; remove sqlite variant; +universal works; maintainer #49821</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiolibsndfilePortfile">trunk/dports/audio/libsndfile/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudiolibsndfilefilescarbonpatch">trunk/dports/audio/libsndfile/files/carbon.patch</a></li>
<li><a href="#trunkdportsaudiolibsndfilefilesconfighed">trunk/dports/audio/libsndfile/files/config.h.ed</a></li>
<li><a href="#trunkdportsaudiolibsndfilefilesspeexpatch">trunk/dports/audio/libsndfile/files/speex.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaudiolibsndfilefilesconfigurepatch">trunk/dports/audio/libsndfile/files/configure.patch</a></li>
<li><a href="#trunkdportsaudiolibsndfilefilesfixincludepatch">trunk/dports/audio/libsndfile/files/fix-include.patch</a></li>
<li><a href="#trunkdportsaudiolibsndfilefilessrc__confighed">trunk/dports/audio/libsndfile/files/src__config.h.ed</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiolibsndfilePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/libsndfile/Portfile (143861 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/Portfile 2015-12-23 15:01:22 UTC (rev 143861)
+++ trunk/dports/audio/libsndfile/Portfile 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libsndfile
</span><del>-version 1.0.25
</del><ins>+version 1.0.26
</ins><span class="cx"> categories audio
</span><span class="cx"> maintainers stare.cz:hans
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx">
</span><span class="cx"> master_sites ${homepage}files/
</span><span class="cx">
</span><del>-checksums rmd160 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7 \
- sha256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882
</del><ins>+checksums rmd160 e521b70af27b0a1bd6aebee3b46806d66aac230a \
+ sha256 cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092
</ins><span class="cx">
</span><del>-patchfiles fix-include.patch configure.patch
</del><ins>+patchfiles carbon.patch speex.patch
</ins><span class="cx">
</span><span class="cx"> configure.args \
</span><span class="cx"> --disable-alsa \
</span><span class="lines">@@ -40,10 +40,12 @@
</span><span class="cx"> --enable-external-libs
</span><span class="cx">
</span><span class="cx"> post-configure {
</span><del>- system "ed - ${worksrcpath}/src/config.h < ${filespath}/src__config.h.ed"
</del><ins>+ # https://trac.macports.org/changeset/42762
+ # http://www.mega-nerd.com/libsndfile/FAQ.html#Q018
+ system "ed - ${worksrcpath}/src/config.h < ${filespath}/config.h.ed"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset no_external_libs] && ![variant_isset sqlite]} {
</del><ins>+if {[variant_isset no_external_libs]} {
</ins><span class="cx"> depends_build-delete port:pkgconfig
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,10 +63,3 @@
</span><span class="cx"> configure.args-append --enable-octave
</span><span class="cx"> configure.args-delete --disable-octave
</span><span class="cx"> }
</span><del>-
-variant sqlite description {Enable support for SQLite} {
- depends_lib-append port:sqlite3
-
- configure.args-append --enable-sqlite
- configure.args-delete --disable-sqlite
-}
</del></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilescarbonpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/libsndfile/files/carbon.patch (0 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/carbon.patch (rev 0)
+++ trunk/dports/audio/libsndfile/files/carbon.patch 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+--- configure.orig 2015-11-26 16:20:24.000000000 +0100
++++ configure 2015-11-26 17:11:50.000000000 +0100
+@@ -19464,7 +19464,6 @@ case "$host_os" in
+ else
+ developer_path="/Developer"
+ fi
+- OS_SPECIFIC_CFLAGS="-I${developer_path}/Headers/FlatCarbon"
+ OS_SPECIFIC_LINKS="-framework CoreAudio -framework AudioToolbox -framework CoreFoundation"
+ ;
+ mingw*)
+--- man/sndfile-play.1.orig 2015-11-26 17:09:22.000000000 +0100
++++ man/sndfile-play.1 2015-11-26 17:08:28.000000000 +0100
+@@ -22,7 +22,7 @@ sndio
+ .It Solaris
+ /dev/audio
+ .It MacOSX 10.6
+-Carbon and CoreAudio
++CoreAudio
+ .It MacOSX 10.7
+ AudioToolbox
+ .It Win32
+@@ -30,6 +30,5 @@ waveOut
+ .El
+ .Sh SEE ALSO
+ .Lk http://www.mega-nerd.com/libsndfile/
+-.\" FIXME: links to ALSA, OSS, sndio, Sun audio, MacOSX audio
+ .Sh AUTHORS
+ .An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com
+--- programs/sndfile-play.c.orig 2015-11-26 16:26:09.000000000 +0100
++++ programs/sndfile-play.c 2015-11-26 17:08:58.000000000 +0100
+@@ -68,7 +68,6 @@
+ #elif (OSX_DARWIN_VERSION == 11)
+ #include <AudioToolbox/AudioToolbox.h>
+ #elif (OSX_DARWIN_VERSION > 0 && OSX_DARWIN_VERSION <= 10)
+- #include <Carbon.h>
+ #include <CoreAudio/AudioHardware.h>
+ #endif
+
+@@ -648,7 +647,7 @@ macosx_play (int argc, char *argv [])
+ #endif /* OSX_DARWIN_VERSION == 11 */
+
+ #if (OSX_DARWIN_VERSION > 0 && OSX_DARWIN_VERSION <= 10)
+-/* MacOSX 10.6 or earlier, use Carbon and AudioHardware API */
++/* MacOSX 10.6 or earlier, use AudioHardware API */
+
+ typedef struct
+ { AudioStreamBasicDescription format ;
</ins></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilesconfighedfromrev143861trunkdportsaudiolibsndfilefilessrc__confighed"></a>
<div class="copfile"><h4>Copied: trunk/dports/audio/libsndfile/files/config.h.ed (from rev 143861, trunk/dports/audio/libsndfile/files/src__config.h.ed) (0 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/config.h.ed (rev 0)
+++ trunk/dports/audio/libsndfile/files/config.h.ed 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+/CPU_CLIPS_NEGATIVE/c
+#ifdef __LP64__
+#define CPU_CLIPS_NEGATIVE 0
+#else
+#define CPU_CLIPS_NEGATIVE 1
+#endif
+.
+/CPU_CLIPS_POSITIVE/c
+#ifdef __LP64__
+#define CPU_CLIPS_POSITIVE 0
+#else
+#define CPU_CLIPS_POSITIVE 1
+#endif
+.
+/CPU_IS_BIG_ENDIAN/c
+#ifdef __BIG_ENDIAN__
+#define CPU_IS_BIG_ENDIAN 1
+#else
+#define CPU_IS_BIG_ENDIAN 0
+#endif
+.
+/CPU_IS_LITTLE_ENDIAN/c
+#ifdef __BIG_ENDIAN__
+#define CPU_IS_LITTLE_ENDIAN 0
+#else
+#define CPU_IS_LITTLE_ENDIAN 1
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_SIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/SIZEOF_SSIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SSIZE_T 8
+#else
+#define SIZEOF_SSIZE_T 4
+#endif
+.
+/SIZEOF_VOIDP/c
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+.
+w
</ins></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilesconfigurepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/libsndfile/files/configure.patch (143861 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/configure.patch 2015-12-23 15:01:22 UTC (rev 143861)
+++ trunk/dports/audio/libsndfile/files/configure.patch 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- configure.orig 2014-03-23 16:27:25.000000000 +0100
-+++ configure 2014-03-23 16:30:26.000000000 +0100
-@@ -18497,7 +18497,7 @@
- enable_external_libs=yes
-
- EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
-- EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $SPEEX_LIBS"
-+ EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $VORBIS_LIBS $OGG_LIBS $SPEEX_LIBS"
- else
- echo
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** One or more of the external libraries (ie libflac, libogg and" >&5
-@@ -18770,7 +18770,6 @@
- case "$host_os" in
- darwin* | rhapsody*)
- os_is_macosx=1
-- OS_SPECIFIC_CFLAGS="-I/Developer/Headers/FlatCarbon"
- OS_SPECIFIC_LINKS="-framework CoreAudio"
- ;
- mingw*)
</del></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilesfixincludepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/libsndfile/files/fix-include.patch (143861 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/fix-include.patch 2015-12-23 15:01:22 UTC (rev 143861)
+++ trunk/dports/audio/libsndfile/files/fix-include.patch 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- programs/sndfile-play.c.orig 2012-03-09 17:55:23.000000000 -0800
-+++ programs/sndfile-play.c 2012-03-09 17:55:39.000000000 -0800
-@@ -58,7 +58,6 @@
- #include <sys/soundcard.h>
-
- #elif (defined (__MACH__) && defined (__APPLE__))
-- #include <Carbon.h>
- #include <CoreAudio/AudioHardware.h>
-
- #elif defined (HAVE_SNDIO_H)
</del></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilesspeexpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/libsndfile/files/speex.patch (0 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/speex.patch (rev 0)
+++ trunk/dports/audio/libsndfile/files/speex.patch 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- configure.orig 2015-11-26 16:20:24.000000000 +0100
++++ configure 2015-11-26 16:21:17.000000000 +0100
+@@ -19148,8 +19148,8 @@ fi
+ HAVE_EXTERNAL_LIBS=1
+ enable_external_libs=yes
+
+- EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
+- EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS "
++ EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS"
++ EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS "
+ else
+ echo
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** One or more of the external libraries (ie libflac, libogg and" >&5
</ins></span></pre></div>
<a id="trunkdportsaudiolibsndfilefilessrc__confighed"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/libsndfile/files/src__config.h.ed (143861 => 143862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libsndfile/files/src__config.h.ed 2015-12-23 15:01:22 UTC (rev 143861)
+++ trunk/dports/audio/libsndfile/files/src__config.h.ed 2015-12-23 16:01:21 UTC (rev 143862)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/CPU_CLIPS_NEGATIVE/c
-#ifdef __LP64__
-#define CPU_CLIPS_NEGATIVE 0
-#else
-#define CPU_CLIPS_NEGATIVE 1
-#endif
-.
-/CPU_CLIPS_POSITIVE/c
-#ifdef __LP64__
-#define CPU_CLIPS_POSITIVE 0
-#else
-#define CPU_CLIPS_POSITIVE 1
-#endif
-.
-/CPU_IS_BIG_ENDIAN/c
-#ifdef __BIG_ENDIAN__
-#define CPU_IS_BIG_ENDIAN 1
-#else
-#define CPU_IS_BIG_ENDIAN 0
-#endif
-.
-/CPU_IS_LITTLE_ENDIAN/c
-#ifdef __BIG_ENDIAN__
-#define CPU_IS_LITTLE_ENDIAN 0
-#else
-#define CPU_IS_LITTLE_ENDIAN 1
-#endif
-.
-/SIZEOF_LONG/c
-#ifdef __LP64__
-#define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-.
-/SIZEOF_SIZE_T/c
-#ifdef __LP64__
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_SIZE_T 4
-#endif
-.
-/SIZEOF_SSIZE_T/c
-#ifdef __LP64__
-#define SIZEOF_SSIZE_T 8
-#else
-#define SIZEOF_SSIZE_T 4
-#endif
-.
-/SIZEOF_VOIDP/c
-#ifdef __LP64__
-#define SIZEOF_VOIDP 8
-#else
-#define SIZEOF_VOIDP 4
-#endif
-.
-w
</del></span></pre>
</div>
</div>
</body>
</html>