From 3f5db04dd01c80abdb94ba9ce0ea39f1ace19a32 Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 23 May 2005 23:49:27 +0000 Subject: [PATCH] update to 1.0.11: various bug fixes and some new formats --- audio/libsndfile/Makefile | 11 +++++----- audio/libsndfile/distinfo | 8 ++++---- .../patches/patch-examples_sndfile-play_c | 20 +++++++++---------- audio/libsndfile/pkg/PFRAG.shared | 4 ++-- audio/libsndfile/pkg/PLIST | 18 ++++++++++++++++- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index 0ad5d642bd3..58d43e4afb8 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2004/11/21 17:51:45 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2005/05/23 23:49:27 naddy Exp $ COMMENT= "library to handle various audio file formats" -DISTNAME= libsndfile-1.0.7 +DISTNAME= libsndfile-1.0.11 CATEGORIES= audio HOMEPAGE= http://www.mega-nerd.com/libsndfile/ @@ -17,11 +17,10 @@ WANTLIB= c m MASTER_SITES= ${HOMEPAGE} -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} -# create_symbols_file.sh uses invalid syntax and we don't need this file -pre-build: - touch ${WRKBUILD}/src/Symbols +FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ + htmldocdir=${PREFIX}/share/doc/libsndfile .include diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo index 2d8cb361d94..6049ecb573f 100644 --- a/audio/libsndfile/distinfo +++ b/audio/libsndfile/distinfo @@ -1,4 +1,4 @@ -MD5 (libsndfile-1.0.7.tar.gz) = 945661a01235f7c149f561a12dad30b6 -RMD160 (libsndfile-1.0.7.tar.gz) = ca518129e6fa44f71fcef0c3a7d5994217082ee1 -SHA1 (libsndfile-1.0.7.tar.gz) = 4ff3c064fa30557d02ede4d18ed9c90c3559b4bd -SIZE (libsndfile-1.0.7.tar.gz) = 725690 +MD5 (libsndfile-1.0.11.tar.gz) = 9ec0b3610041423a57387f284849f2fc +RMD160 (libsndfile-1.0.11.tar.gz) = 3829d1fa9f5caf16f4b589d03877d229cb8f5603 +SHA1 (libsndfile-1.0.11.tar.gz) = 16372a7814530178a2642bd22f203641e0392ebb +SIZE (libsndfile-1.0.11.tar.gz) = 816107 diff --git a/audio/libsndfile/patches/patch-examples_sndfile-play_c b/audio/libsndfile/patches/patch-examples_sndfile-play_c index 36108ad7116..dea87499e04 100644 --- a/audio/libsndfile/patches/patch-examples_sndfile-play_c +++ b/audio/libsndfile/patches/patch-examples_sndfile-play_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-examples_sndfile-play_c,v 1.1 2002/11/20 01:15:50 naddy Exp $ ---- examples/sndfile-play.c.orig Tue Aug 6 03:50:55 2002 -+++ examples/sndfile-play.c Wed Nov 20 02:06:10 2002 -@@ -29,7 +29,7 @@ +$OpenBSD: patch-examples_sndfile-play_c,v 1.2 2005/05/23 23:49:28 naddy Exp $ +--- examples/sndfile-play.c.orig Sun Nov 14 20:57:17 2004 ++++ examples/sndfile-play.c Mon May 23 22:43:53 2005 +@@ -43,7 +43,7 @@ #include #include @@ -10,7 +10,7 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.1 2002/11/20 01:15:50 naddy Exp $ #include #include #include -@@ -468,7 +468,7 @@ win32_play (int argc, char *argv []) +@@ -798,7 +798,7 @@ win32_play (int argc, char *argv []) ** Solaris. */ @@ -19,7 +19,7 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.1 2002/11/20 01:15:50 naddy Exp $ static void solaris_play (int argc, char *argv []) -@@ -505,8 +505,10 @@ solaris_play (int argc, char *argv []) +@@ -835,8 +835,10 @@ solaris_play (int argc, char *argv []) audio_info.play.channels = sfinfo.channels ; audio_info.play.precision = 16 ; audio_info.play.encoding = AUDIO_ENCODING_LINEAR ; @@ -27,15 +27,15 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.1 2002/11/20 01:15:50 naddy Exp $ audio_info.play.gain = AUDIO_MAX_GAIN ; audio_info.play.balance = AUDIO_MID_BALANCE ; +#endif - + if ((error = ioctl (audio_fd, AUDIO_SETINFO, &audio_info))) { perror ("ioctl (AUDIO_SETINFO) failed") ; -@@ -566,7 +568,7 @@ main (int argc, char *argv []) - linux_play (argc, argv) ; +@@ -914,7 +916,7 @@ main (int argc, char *argv []) + linux_play (argc, argv) ; #elif (defined (__MACH__) && defined (__APPLE__)) macosx_play (argc, argv) ; -#elif (defined (sun) && defined (unix)) +#elif (defined (__OpenBSD__) || (defined (sun) && defined (unix))) solaris_play (argc, argv) ; - #elif (defined (_WIN32) || defined (WIN32)) + #elif (OS_IS_WIN32 == 1) win32_play (argc, argv) ; diff --git a/audio/libsndfile/pkg/PFRAG.shared b/audio/libsndfile/pkg/PFRAG.shared index ec8abaad49e..440fb6eb00e 100644 --- a/audio/libsndfile/pkg/PFRAG.shared +++ b/audio/libsndfile/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2004/08/06 14:37:27 espie Exp $ -@lib lib/libsndfile.so.1.7 +@comment $OpenBSD: PFRAG.shared,v 1.6 2005/05/23 23:49:28 naddy Exp $ +@lib lib/libsndfile.so.1.11 diff --git a/audio/libsndfile/pkg/PLIST b/audio/libsndfile/pkg/PLIST index f9003b10955..5212f7a0491 100644 --- a/audio/libsndfile/pkg/PLIST +++ b/audio/libsndfile/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2004/08/06 14:37:27 espie Exp $ +@comment $OpenBSD: PLIST,v 1.6 2005/05/23 23:49:28 naddy Exp $ bin/sndfile-convert bin/sndfile-info bin/sndfile-play @@ -10,6 +10,22 @@ lib/pkgconfig/sndfile.pc @man man/man1/sndfile-convert.1 @man man/man1/sndfile-info.1 @man man/man1/sndfile-play.1 +share/doc/libsndfile/ +share/doc/libsndfile/FAQ.html +share/doc/libsndfile/api.html +share/doc/libsndfile/bugs.html +share/doc/libsndfile/command.html +share/doc/libsndfile/dither.html +share/doc/libsndfile/embedded_files.html +share/doc/libsndfile/index.html +share/doc/libsndfile/libsndfile.css +share/doc/libsndfile/libsndfile.jpg +share/doc/libsndfile/lists.html +share/doc/libsndfile/new_file_type.HOWTO +share/doc/libsndfile/octave.html +share/doc/libsndfile/pkgconfig.html +share/doc/libsndfile/sndfile_info.html +share/doc/libsndfile/win32.html share/octave/ share/octave/site/ share/octave/site/m/