diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-21 22:59:15 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-21 22:59:15 +0000 |
commit | 4668165b1ad52a7f12f5f5e13bfbfb63dffa2460 (patch) | |
tree | 63b728111207cc718ae8366e84ab5805622fbf0a /editors/openoffice | |
parent | Make WITH_DEBUG tunable. WITH_DEBUG=1 just adds debugs symbols. (diff) |
Activate sound support.
Notes
Notes:
svn path=/head/; revision=63341
Diffstat (limited to 'editors/openoffice')
6 files changed, 96 insertions, 0 deletions
diff --git a/editors/openoffice/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice/files/patch-vcl+unx+source+app+osssound.cxx new file mode 100644 index 000000000000..af681e020472 --- /dev/null +++ b/editors/openoffice/files/patch-vcl+unx+source+app+osssound.cxx @@ -0,0 +1,14 @@ +--- ../vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 ++++ ../vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 +@@ -72,7 +72,11 @@ + #include <unistd.h> + #include <string.h> + #include <sys/ioctl.h> ++#ifdef LINUX + #include <linux/soundcard.h> ++#else ++#include <sys/soundcard.h> ++#endif + #include <errno.h> + + #ifdef _USE_NAMESPACE diff --git a/editors/openoffice/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice/files/patch-vcl+unx+source+app+vsound.hxx new file mode 100644 index 000000000000..028e7c9d64c1 --- /dev/null +++ b/editors/openoffice/files/patch-vcl+unx+source+app+vsound.hxx @@ -0,0 +1,20 @@ +--- ../vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 ++++ ../vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 +@@ -61,7 +61,7 @@ + #ifndef _VCL_VSOUND_HXX + #define _VCL_VSOUND_HXX + +-#ifdef LINUX ++#if defined(LINUX) || defined(FREEBSD) + #define USE_OSS + #endif + +@@ -69,7 +69,7 @@ + #define USE_DEVAUDIO + #endif + +-#if defined LINUX || defined SOLARIS ++#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) + #define USE_NAS + #endif + diff --git a/editors/openoffice/files/patch-vcl+util+makefile.mk b/editors/openoffice/files/patch-vcl+util+makefile.mk new file mode 100644 index 000000000000..1ea13157ce57 --- /dev/null +++ b/editors/openoffice/files/patch-vcl+util+makefile.mk @@ -0,0 +1,14 @@ +--- ../vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 ++++ ../vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 +@@ -293,9 +293,9 @@ + .ENDIF # "$(OS)"=="MACOSX" + .ENDIF # "$(OS)"=="SOLARIS" + +-.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" ++.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" + SHL1STDLIBS += -laudio +-.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" ++.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" + + .ENDIF # "$(GUI)"=="UNX" + diff --git a/editors/openoffice/files/patch-vcl::unx::source::app::osssound.cxx b/editors/openoffice/files/patch-vcl::unx::source::app::osssound.cxx new file mode 100644 index 000000000000..af681e020472 --- /dev/null +++ b/editors/openoffice/files/patch-vcl::unx::source::app::osssound.cxx @@ -0,0 +1,14 @@ +--- ../vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 ++++ ../vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 +@@ -72,7 +72,11 @@ + #include <unistd.h> + #include <string.h> + #include <sys/ioctl.h> ++#ifdef LINUX + #include <linux/soundcard.h> ++#else ++#include <sys/soundcard.h> ++#endif + #include <errno.h> + + #ifdef _USE_NAMESPACE diff --git a/editors/openoffice/files/patch-vcl::unx::source::app::vsound.hxx b/editors/openoffice/files/patch-vcl::unx::source::app::vsound.hxx new file mode 100644 index 000000000000..028e7c9d64c1 --- /dev/null +++ b/editors/openoffice/files/patch-vcl::unx::source::app::vsound.hxx @@ -0,0 +1,20 @@ +--- ../vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 ++++ ../vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 +@@ -61,7 +61,7 @@ + #ifndef _VCL_VSOUND_HXX + #define _VCL_VSOUND_HXX + +-#ifdef LINUX ++#if defined(LINUX) || defined(FREEBSD) + #define USE_OSS + #endif + +@@ -69,7 +69,7 @@ + #define USE_DEVAUDIO + #endif + +-#if defined LINUX || defined SOLARIS ++#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) + #define USE_NAS + #endif + diff --git a/editors/openoffice/files/patch-vcl::util::makefile.mk b/editors/openoffice/files/patch-vcl::util::makefile.mk new file mode 100644 index 000000000000..1ea13157ce57 --- /dev/null +++ b/editors/openoffice/files/patch-vcl::util::makefile.mk @@ -0,0 +1,14 @@ +--- ../vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 ++++ ../vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 +@@ -293,9 +293,9 @@ + .ENDIF # "$(OS)"=="MACOSX" + .ENDIF # "$(OS)"=="SOLARIS" + +-.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" ++.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" + SHL1STDLIBS += -laudio +-.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" ++.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" + + .ENDIF # "$(GUI)"=="UNX" + |