Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
+5
View File
@@ -0,0 +1,5 @@
Audacity is a program that manipulates digital audio waveforms. It supports all
common editing operations such as Cut, Copy, and Paste, plus it will mix tracks
and apply plug-in effects to any part of a sound. It also has a built-in
amplitude envelope editor, a customizable spectrogram mode and a frequency
analysis window for audio analysis applications.
+50
View File
@@ -0,0 +1,50 @@
# $NetBSD: Makefile,v 1.85 2013/06/06 12:54:01 wiz Exp $
DISTNAME= audacity-src-1.2.6
PKGREVISION= 23
PKGNAME= ${DISTNAME:S/-src-/-/}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://audacity.sourceforge.net/
COMMENT= Audio editor
MAKE_JOBS_SAFE= no
USE_LIBTOOL= yes
USE_TOOLS+= autoconf gmake msgfmt pkg-config zip:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xaudio
CONFIGURE_ARGS+= --with-id3=system
CONFIGURE_ARGS+= --with-libmad=system
CONFIGURE_ARGS+= --with-libsndfile=system
CONFIGURE_ARGS+= --with-portaudio=system
CONFIGURE_ARGS+= --with-vorbis=system
CONFIGURE_ENV+= WX_CONFIG=${LOCALBASE}/bin/wx24-config
CONFIG_GUESS_OVERRIDE= \
config.guess */config.guess */*/config.guess */*/*/config.guess
CONFIG_SUB_OVERRIDE= \
config.sub */config.sub */*/config.sub */*/*/config.sub
PTHREAD_AUTO_VARS= yes
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/wxGTK24/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
# XXX Internal compiler error with -O2
.if ${MACHINE_ARCH} == "alpha"
CFLAGS+= -O
.endif
+67
View File
@@ -0,0 +1,67 @@
@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:32:02 joerg Exp $
bin/audacity
man/man1/audacity.1
share/audacity/audacity-1.2-help.htb
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
share/audacity/nyquist/evalenv.lsp
share/audacity/nyquist/follow.lsp
share/audacity/nyquist/init.lsp
share/audacity/nyquist/misc.lsp
share/audacity/nyquist/nyinit.lsp
share/audacity/nyquist/nyqmisc.lsp
share/audacity/nyquist/nyquist.lsp
share/audacity/nyquist/printrec.lsp
share/audacity/nyquist/profile.lsp
share/audacity/nyquist/seq.lsp
share/audacity/nyquist/seqfnint.lsp
share/audacity/nyquist/seqmidi.lsp
share/audacity/nyquist/sndfnint.lsp
share/audacity/nyquist/system.lsp
share/audacity/nyquist/test.lsp
share/audacity/nyquist/xlinit.lsp
share/audacity/plug-ins/SilenceMarker.ny
share/audacity/plug-ins/clicktrack.ny
share/audacity/plug-ins/crossfadein.ny
share/audacity/plug-ins/crossfadeout.ny
share/audacity/plug-ins/delay.ny
share/audacity/plug-ins/highpass.ny
share/audacity/plug-ins/lowpass.ny
share/audacity/plug-ins/pluck.ny
share/audacity/plug-ins/tremolo.ny
share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt
share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/bn/LC_MESSAGES/audacity.mo
share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/cs/LC_MESSAGES/audacity.mo
share/locale/cy/LC_MESSAGES/audacity.mo
share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/LC_MESSAGES/audacity.mo
share/locale/es/LC_MESSAGES/audacity.mo
share/locale/eu/LC_MESSAGES/audacity.mo
share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/gl/LC_MESSAGES/audacity.mo
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/LC_MESSAGES/audacity.mo
share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt/LC_MESSAGES/audacity.mo
share/locale/ro/LC_MESSAGES/audacity.mo
share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sk/LC_MESSAGES/audacity.mo
share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/tr/LC_MESSAGES/audacity.mo
share/locale/uk/LC_MESSAGES/audacity.mo
share/locale/zh/LC_MESSAGES/audacity.mo
share/locale/zh_TW/LC_MESSAGES/audacity.mo
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: distinfo,v 1.21 2012/02/15 20:01:54 hans Exp $
SHA1 (audacity-src-1.2.6.tar.gz) = 1bfdd119fdc09d1aa334aee21d4831ef6e939fce
RMD160 (audacity-src-1.2.6.tar.gz) = f59ca075ae430a518b77ce2ed08441abe2b67a0c
Size (audacity-src-1.2.6.tar.gz) = 4882379 bytes
SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
SHA1 (patch-ac) = 2baaf1650c9bdc627000e8676f0ac6ec16b6ec26
SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046
SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4
SHA1 (patch-af) = 05c1c345ef9b92410fbe4d8b4b46ab4b7ba7a226
SHA1 (patch-ag) = 68bcbd932cd4440bc9090c6afc369cfcae54a16b
SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
SHA1 (patch-ai) = 625cd6337d8a246d1a9c388279efa0ade34a2093
SHA1 (patch-aj) = 34b4cdd266345f04954983cc14e4b762f09f4df8
SHA1 (patch-ak) = 5f012eb47c832a8f11bcfbdcaf0ab2e876abd04e
SHA1 (patch-al) = 224437cc76e1f25d600e859d278ad73bbf261efa
SHA1 (patch-am) = 3210d8632ee9f5361008277e2c887f24d87205a1
SHA1 (patch-ba) = c27676c7110bf6ef2fcd448d68402b7bfd21b631
SHA1 (patch-bb) = 050c6edc0a174e2496ef0b572002eca185bd38de
SHA1 (patch-bc) = 8a08526c37e025a89a747fa2c7a48668fe797572
SHA1 (patch-bd) = dc24c670cdf078f08c29318c5c5dc8efed398f59
SHA1 (patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c) = 4c78a5b39ea0fc1d022c8bfabd68a77989b33a54
SHA1 (patch-src_AudioIO.cpp) = 79af6045ae0a9ff754ae0ea30d987f47363df18f
SHA1 (patch-src_effects_NoiseRemoval.cpp) = 1487650a4784feb5d57ee0ceeda3346fb4abf8de
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.4 2004/04/20 18:02:16 ben Exp $
--- lib-src/libnyquist/cmt/cext.h.orig Sat Mar 6 16:02:24 2004
+++ lib-src/libnyquist/cmt/cext.h
@@ -52,6 +52,8 @@ EXIT(n) -- calls exit(n) after shutting
#if HAS_SYS_TYPES_H
#include <sys/types.h>
+#define ulong u_long
+#undef NEED_ULONG
#endif
#if HAS_MALLOC_H
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.3 2004/04/20 18:02:16 ben Exp $
--- lib-src/libnyquist/sys/term.c.orig Sat Mar 6 16:02:50 2004
+++ lib-src/libnyquist/sys/term.c
@@ -40,7 +40,7 @@ int term_testchar()
#else
#include <termios.h>
-#ifndef __APPLE__
+#ifdef __LINUX__
#include <asm/ioctls.h>
#endif
#include <signal.h>
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.4 2012/02/15 20:01:54 hans Exp $
--- lib-src/libnyquist/snd/sndconfig.h.orig Sat Feb 28 11:19:39 2004
+++ lib-src/libnyquist/snd/sndconfig.h
@@ -60,7 +60,7 @@ void snd_free(void *a);
#elif defined(IRIX)
#include "sndirix.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun)
#include "sndfreebsd.h"
#elif defined(_WIN32)
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.4 2005/10/03 20:42:59 joerg Exp $
--- lib-src/libnyquist/snd/sndio.c.orig Sat Feb 28 11:19:39 2004
+++ lib-src/libnyquist/snd/sndio.c
@@ -20,7 +20,7 @@
#ifdef WIN32
#include <sys/stat.h>
#include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/stat.h>
#else
#endif
+97
View File
@@ -0,0 +1,97 @@
$NetBSD: patch-ae,v 1.6 2007/02/23 03:27:41 rillig Exp $
--- configure.in.orig 2005-11-27 03:33:31.000000000 +0100
+++ configure.in 2007-02-23 02:06:19.000000000 +0100
@@ -556,8 +556,8 @@ if [[ "$use_portaudio" = "v19" ]] ; then
AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
-else
-
+fi
+if [[ "$use_portaudio" = "v18" ]] ; then
CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
case "${host_os}" in
@@ -639,6 +639,81 @@ else
esac
fi
+if [[ "$use_portaudio" = "system" ]] ; then
+
+ LIBS="$LIBS -lportaudio"
+
+ case "${host_os}" in
+ darwin* | rhapsody*)
+ dnl Mac OS X configuration
+
+ CONFIGHEADER="configunix.h"
+
+ dnl CoreAudio
+
+ CXXFLAGS="-I../mac $CXXFLAGS"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
+ fi
+
+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
+ LIBS="-framework CoreAudio $LIBS -lz"
+
+ EXTRATARGETS="../Audacity.app"
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ dnl VST
+
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
+
+ ;;
+
+ cygwin*)
+ dnl Windows/CygWin configuration
+
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
+ LIBS="$LIBS -Wl,--subsystem,windows"
+ CONFIGHEADER="configwin.h"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
+ fi
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ AC_DEFINE(__CYGWIN__,1,[We're using cygwin])
+ AC_DEFINE(_FILE_OFFSET_BITS,32,[Placeholder for large file support])
+
+ AFTERBUILD=""
+ ;;
+
+ *)
+ dnl Unix OSS configuration
+
+ CONFIGHEADER="configunix.h"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
+ fi
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ AFTERBUILD=""
+
+ esac
+fi
use_precomp="no"
+105
View File
@@ -0,0 +1,105 @@
$NetBSD: patch-af,v 1.6 2007/02/23 03:37:55 rillig Exp $
The CPPFLAGS and LIBS from wx-config had been set too early in the
configure file, so that they were taken into the AC_CONFIG_SUBDIRS
directories. Some of these directories only use a C compiler for
linking, which of course caused problems with the wx* libraries, which
are C++.
--- configure.orig 2006-11-15 05:12:13.000000000 +0100
+++ configure 2007-02-23 04:17:41.000000000 +0100
@@ -6586,7 +6586,8 @@ fi
subdirs="$subdirs lib-src/portaudio-v19"
-else
+fi
+if [ "$use_portaudio" = "v18" ] ; then
CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
@@ -6672,6 +6673,84 @@ _ACEOF
esac
fi
+if [ "$use_portaudio" = "system" ] ; then
+
+ LIBS="$LIBS -lportaudio"
+
+ case "${host_os}" in
+ darwin* | rhapsody*)
+
+ CONFIGHEADER="configunix.h"
+
+
+ CXXFLAGS="-I../mac $CXXFLAGS"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
+ fi
+
+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
+ LIBS="-framework CoreAudio $LIBS -lz"
+
+ EXTRATARGETS="../Audacity.app"
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
+
+ ;;
+
+ cygwin*)
+
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
+ LIBS="$LIBS -Wl,--subsystem,windows"
+ CONFIGHEADER="configwin.h"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
+ fi
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define __CYGWIN__ 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _FILE_OFFSET_BITS 32
+_ACEOF
+
+
+ AFTERBUILD=""
+ ;;
+
+ *)
+
+ CONFIGHEADER="configunix.h"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
+ fi
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+ AFTERBUILD=""
+
+ esac
+fi
use_precomp="no"
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.5 2006/01/17 21:50:23 adam Exp $
--- lib-src/libnyquist/Makefile.in.orig 2006-01-17 22:33:39.000000000 +0100
+++ lib-src/libnyquist/Makefile.in
@@ -6,7 +6,7 @@
INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
CC = @CC@
-override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
+override CFLAGS += -DCMTSTUFF -DEXT $(INCL)
LN = $(CC)
LFLAGS = -lm
+17
View File
@@ -0,0 +1,17 @@
$NetBSD: patch-ah,v 1.4 2004/11/22 16:36:31 adam Exp $
--- Makefile.in.orig 2004-11-18 06:17:29.000000000 +0000
+++ Makefile.in
@@ -37,9 +37,9 @@ install: audacity
# install manpage
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
- -test -f help/audacity.1.gz && \
- $(INSTALL) -m 644 help/audacity.1.gz \
- $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
+ -test -f help/audacity.1 && \
+ $(INSTALL) -m 644 help/audacity.1 \
+ $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1
# install nyquist
$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
+20
View File
@@ -0,0 +1,20 @@
$NetBSD: patch-ai,v 1.5 2007/02/23 03:27:41 rillig Exp $
--- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp 2007-02-23 03:25:18.000000000 +0100
@@ -80,6 +80,7 @@ uint detectCPUextensions(void)
if (_dwDisabledISA == 0xffffffff) return 0;
asm volatile(
+ "\n\tpushl %%ebx"
"\n\txor %%esi, %%esi" // clear %%esi = result register
// check if 'cpuid' instructions is available by toggling eflags bit 21
@@ -128,6 +129,7 @@ uint detectCPUextensions(void)
"\n\tend:"
"\n\tmov %%esi, %0"
+ "\n\tpopl %%ebx"
: "=r" (res)
: /* no inputs */
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-aj,v 1.3 2005/10/03 20:42:59 joerg Exp $
--- lib-src/libnyquist/snd/sndcvt.c.orig 2005-07-22 17:15:57.000000000 +0000
+++ lib-src/libnyquist/snd/sndcvt.c
@@ -16,7 +16,7 @@
#ifdef WIN32
#include <sys/stat.h>
#include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/stat.h>
#endif /* WIN32 */
#define L_SET SEEK_SET
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ak,v 1.5 2007/02/23 03:37:55 rillig Exp $
--- lib-src/soundtouch/include/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/include/STTypes.h 2007-02-23 04:23:58.000000000 +0100
@@ -132,7 +132,7 @@ namespace soundtouch
#define ALLOW_3DNOW 1
#endif
- #if (WIN32 || __i386__ || __x86_64__)
+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
#define ALLOW_SSE 1
#endif
#endif
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-al,v 1.5 2007/02/23 03:37:55 rillig Exp $
--- lib-src/soundtouch/soundtouch/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/soundtouch/STTypes.h 2007-02-23 04:23:13.000000000 +0100
@@ -132,7 +132,7 @@ namespace soundtouch
#define ALLOW_3DNOW 1
#endif
- #if (WIN32 || __i386__ || __x86_64__)
+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
#define ALLOW_SSE 1
#endif
#endif
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-am,v 1.5 2008/03/20 15:58:47 drochner Exp $
--- src/AudacityApp.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ src/AudacityApp.cpp
@@ -391,7 +391,7 @@ bool AudacityApp::OnInit()
// * The user's .audacity-files directory in their home directory
// * The "share" and "share/doc" directories in their install path
#ifdef __WXGTK__
- defaultTempDir.Printf("/tmp/audacity1.2-%s", wxGetUserId().c_str());
+ defaultTempDir.Printf("%s/.audacity1.2-%s", home.c_str(), wxGetUserId().c_str());
wxString pathVar = wxGetenv("AUDACITY_PATH");
if (pathVar != "")
AddMultiPathsToPathList(pathVar, audacityPathList);
+24
View File
@@ -0,0 +1,24 @@
$NetBSD: patch-ba,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- lib-src/allegro/strparse.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/allegro/strparse.cpp
@@ -16,8 +16,9 @@ char String_parse::peek()
}
-void String_parse::get_nonspace_quoted(char *field)
+void String_parse::get_nonspace_quoted(char *field, int flen)
{
+ char *ofield = field;
skip_space();
bool quoted = false;
if (string[pos] == '"') {
@@ -25,7 +26,7 @@ void String_parse::get_nonspace_quoted(c
*field++ = '"';
pos = pos + 1;
}
- while (string[pos] && (quoted || !isspace(string[pos]))) {
+ while (string[pos] && (quoted || !isspace(string[pos])) && (field - ofield) < (flen - 2)) {
if (string[pos] == '"') {
if (quoted) {
*field++ = '"';
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-bb,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- lib-src/allegro/strparse.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/allegro/strparse.h
@@ -10,7 +10,7 @@ public:
}
void skip_space();
char peek();
- void get_nonspace_quoted(char *field);
+ void get_nonspace_quoted(char *field, int flen);
};
void string_escape(char *result, char *str, char *quote);
+30
View File
@@ -0,0 +1,30 @@
$NetBSD: patch-bc,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- ./lib-src/allegro/allegrord.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ ./lib-src/allegro/allegrord.cpp
@@ -109,10 +109,10 @@ bool Allegro_reader::parse()
bool new_note_flag = false; // "A"-"G" syntax
int new_note = 0;
Parameters_ptr attributes = NULL;
- line_parser.get_nonspace_quoted(field);
+ line_parser.get_nonspace_quoted(field, field_max);
char pk = line_parser.peek();
if (pk && !isspace(pk)) {
- line_parser.get_nonspace_quoted(field + strlen(field));
+ line_parser.get_nonspace_quoted(field + strlen(field), field_max - strlen(field));
}
while (field[0]) {
// print "field", "|";field;"|", "|";line_parser.string;"|", line_parser.pos
@@ -203,10 +203,10 @@ bool Allegro_reader::parse()
if (error_flag) {
field[0] = 0; // exit the loop
} else {
- line_parser.get_nonspace_quoted(field);
+ line_parser.get_nonspace_quoted(field, field_max);
pk = line_parser.peek();
if (pk && !isspace(pk)) {
- line_parser.get_nonspace_quoted(field + strlen(field));
+ line_parser.get_nonspace_quoted(field + strlen(field), field_max - strlen(field));
}
}
}
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-bd,v 1.2 2011/11/26 17:07:59 joerg Exp $
--- lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp.orig 2006-11-15 04:12:11.000000000 +0000
+++ lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp
@@ -50,6 +50,7 @@
#include <string>
#include <assert.h>
#include <limits.h>
+#include <string.h>
#include "WavFile.h"
@@ -0,0 +1,13 @@
$NetBSD: patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c,v 1.1 2012/02/15 20:01:54 hans Exp $
--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c 2012-01-15 19:14:30.130748838 +0100
@@ -37,6 +37,8 @@
#ifdef __linux__
#include <linux/soundcard.h>
+#elif defined(__sun)
+#include <sys/soundcard.h>
#else
#include <machine/soundcard.h> /* JH20010905 */
#endif
@@ -0,0 +1,13 @@
--- src/AudioIO.cpp.orig 2006-11-15 05:12:10.000000000 +0100
+++ src/AudioIO.cpp 2012-01-15 19:16:58.001721823 +0100
@@ -25,6 +25,10 @@
#include <math.h>
#include <stdlib.h>
+#ifdef __sun
+#include <alloca.h>
+#endif
+
#ifdef __WXMSW__
#include <malloc.h>
#endif
@@ -0,0 +1,13 @@
--- src/effects/NoiseRemoval.cpp.orig 2006-11-15 05:12:10.000000000 +0100
+++ src/effects/NoiseRemoval.cpp 2012-01-15 19:19:20.622909031 +0100
@@ -16,6 +16,10 @@
#include <math.h>
+#ifdef __sun
+#include <ieeefp.h>
+#endif
+
#if defined(__WXMSW__) && !defined(__CYGWIN__)
#include <float.h>
#define finite(x) _finite(x)