[143862] trunk/dports/audio/libsndfile
khindenburg at macports.org
khindenburg at macports.org
Wed Dec 23 08:01:21 PST 2015
Revision: 143862
https://trac.macports.org/changeset/143862
Author: khindenburg at macports.org
Date: 2015-12-23 08:01:21 -0800 (Wed, 23 Dec 2015)
Log Message:
-----------
libsndfile: update to 1.0.26; adjust patches; remove sqlite variant; +universal works; maintainer #49821
Modified Paths:
--------------
trunk/dports/audio/libsndfile/Portfile
Added Paths:
-----------
trunk/dports/audio/libsndfile/files/carbon.patch
trunk/dports/audio/libsndfile/files/config.h.ed
trunk/dports/audio/libsndfile/files/speex.patch
Removed Paths:
-------------
trunk/dports/audio/libsndfile/files/configure.patch
trunk/dports/audio/libsndfile/files/fix-include.patch
trunk/dports/audio/libsndfile/files/src__config.h.ed
Modified: trunk/dports/audio/libsndfile/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortSystem 1.0
name libsndfile
-version 1.0.25
+version 1.0.26
categories audio
maintainers stare.cz:hans
platforms darwin
@@ -27,10 +27,10 @@
master_sites ${homepage}files/
-checksums rmd160 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7 \
- sha256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882
+checksums rmd160 e521b70af27b0a1bd6aebee3b46806d66aac230a \
+ sha256 cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092
-patchfiles fix-include.patch configure.patch
+patchfiles carbon.patch speex.patch
configure.args \
--disable-alsa \
@@ -40,10 +40,12 @@
--enable-external-libs
post-configure {
- system "ed - ${worksrcpath}/src/config.h < ${filespath}/src__config.h.ed"
+ # 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"
}
-if {[variant_isset no_external_libs] && ![variant_isset sqlite]} {
+if {[variant_isset no_external_libs]} {
depends_build-delete port:pkgconfig
}
@@ -61,10 +63,3 @@
configure.args-append --enable-octave
configure.args-delete --disable-octave
}
-
-variant sqlite description {Enable support for SQLite} {
- depends_lib-append port:sqlite3
-
- configure.args-append --enable-sqlite
- configure.args-delete --disable-sqlite
-}
Added: trunk/dports/audio/libsndfile/files/carbon.patch
===================================================================
--- 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)
@@ -0,0 +1,47 @@
+--- 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 at 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 ;
Copied: trunk/dports/audio/libsndfile/files/config.h.ed (from rev 143861, trunk/dports/audio/libsndfile/files/src__config.h.ed)
===================================================================
--- 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)
@@ -0,0 +1,57 @@
+/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
Deleted: trunk/dports/audio/libsndfile/files/configure.patch
===================================================================
--- 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)
@@ -1,19 +0,0 @@
---- 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*)
Deleted: trunk/dports/audio/libsndfile/files/fix-include.patch
===================================================================
--- 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)
@@ -1,10 +0,0 @@
---- 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)
Added: trunk/dports/audio/libsndfile/files/speex.patch
===================================================================
--- 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)
@@ -0,0 +1,13 @@
+--- 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
Deleted: trunk/dports/audio/libsndfile/files/src__config.h.ed
===================================================================
--- 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)
@@ -1,57 +0,0 @@
-/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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151223/2eec3ce2/attachment-0001.html>
More information about the macports-changes
mailing list