diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-09-25 12:29:35 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-09-25 12:29:35 +0000 |
| commit | abb048a82d862884ae04251298d74102f95d8689 (patch) | |
| tree | 82de690f24082dadf475e5a65ca8a38dff0ccf8e /ham/linpsk/patches | |
| parent | 00ad0b77d40c23bb49cfb435309a0750398b9e05 (diff) | |
| download | pkgsrc-abb048a82d862884ae04251298d74102f95d8689.tar.gz | |
Fix build on SunOS, use portable egrep construct.
Diffstat (limited to 'ham/linpsk/patches')
| -rw-r--r-- | ham/linpsk/patches/patch-aa | 11 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-src_csound.h | 17 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c | 15 |
3 files changed, 42 insertions, 1 deletions
diff --git a/ham/linpsk/patches/patch-aa b/ham/linpsk/patches/patch-aa index e3bf3255982..adfb4c42234 100644 --- a/ham/linpsk/patches/patch-aa +++ b/ham/linpsk/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.4 2011/12/14 18:28:59 marino Exp $ +$NetBSD: patch-aa,v 1.5 2014/09/25 12:29:35 jperkin Exp $ --- configure.orig 2005-03-17 20:00:57.000000000 +0000 +++ configure +@@ -4015,7 +4015,7 @@ echo "${ECHO_T}$QTDIR" >&6 + # Figure out which version of Qt we are using + echo "$as_me:$LINENO: checking Qt version" >&5 + echo $ECHO_N "checking Qt version... $ECHO_C" >&6 +-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'` ++QT_VER=`egrep 'define.*QT_VERSION_STR[ ]' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'` + case "${QT_VER}" in + 2*) + QT_MAJOR="2" @@ -4270,7 +4270,7 @@ fi QT_LDADD="-L$QTDIR/lib $QT_LIB" if test x"$QT_IS_MT" = "xyes" ; then diff --git a/ham/linpsk/patches/patch-src_csound.h b/ham/linpsk/patches/patch-src_csound.h new file mode 100644 index 00000000000..900608775a1 --- /dev/null +++ b/ham/linpsk/patches/patch-src_csound.h @@ -0,0 +1,17 @@ +$NetBSD: patch-src_csound.h,v 1.1 2014/09/25 12:29:35 jperkin Exp $ + +SunOS needs sys/termios.h + +--- src/csound.h.orig 2005-02-04 15:28:23.000000000 +0000 ++++ src/csound.h +@@ -17,6 +17,10 @@ + #ifndef CSOUND_H + #define CSOUND_H + ++#ifdef __sun ++#include <sys/termios.h> ++#endif ++ + #include <sys/ioctl.h> + #include <unistd.h> + #include <fcntl.h> diff --git a/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c b/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c new file mode 100644 index 00000000000..6b13e9944ba --- /dev/null +++ b/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_portaudio_pa__unix__oss.c,v 1.1 2014/09/25 12:29:35 jperkin Exp $ + +SunOS needs sys/soundcard.h + +--- src/portaudio/pa_unix_oss.c.orig 2005-02-12 10:40:06.000000000 +0000 ++++ src/portaudio/pa_unix_oss.c +@@ -43,6 +43,8 @@ +
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__sun)
++#include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif
|