From 01816bbfbb7d7e26ad83c5c74b2374c86206a063 Mon Sep 17 00:00:00 2001 From: adamw Date: Mon, 28 Jul 2014 14:12:36 +0000 Subject: Rename audio/ patch-xy patches to reflect the files they modify. --- audio/nas/files/patch-aa | 19 -------- audio/nas/files/patch-ab | 57 ---------------------- audio/nas/files/patch-af | 9 ---- audio/nas/files/patch-config_NetAudio.def | 9 ++++ .../nas/files/patch-server_dda_voxware_auvoxware.c | 57 ++++++++++++++++++++++ .../nas/files/patch_clients_audio_audial_audial.c | 19 ++++++++ 6 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 audio/nas/files/patch-aa delete mode 100644 audio/nas/files/patch-ab delete mode 100644 audio/nas/files/patch-af create mode 100644 audio/nas/files/patch-config_NetAudio.def create mode 100644 audio/nas/files/patch-server_dda_voxware_auvoxware.c create mode 100644 audio/nas/files/patch_clients_audio_audial_audial.c (limited to 'audio/nas') diff --git a/audio/nas/files/patch-aa b/audio/nas/files/patch-aa deleted file mode 100644 index c6e297e99430..000000000000 --- a/audio/nas/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ ---- clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 -+++ clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 -@@ -133,6 +133,7 @@ - signal(SIGALRM, SIG_DFL); - } - -+#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) - static void - usleep(usecs) - unsigned int usecs; -@@ -149,7 +150,7 @@ - setitimer(ITIMER_REAL, &ntval, &otval); - pause(); - } -- -+#endif - #endif /* SYSV else not */ - #endif /* VMS else not */ - #endif /* NEEDUSLEEP */ diff --git a/audio/nas/files/patch-ab b/audio/nas/files/patch-ab deleted file mode 100644 index d36871915fe7..000000000000 --- a/audio/nas/files/patch-ab +++ /dev/null @@ -1,57 +0,0 @@ ---- server/dda/voxware/auvoxware.c.orig 2008-05-14 22:35:08.000000000 +0400 -+++ server/dda/voxware/auvoxware.c 2008-05-14 22:40:32.000000000 +0400 -@@ -133,7 +133,7 @@ - - #include - #include --#ifndef SVR4 -+#if !defined(SVR4) && !defined(__FreeBSD__) - #include - #endif - #include -@@ -183,7 +183,9 @@ - # else - # include - # endif -+/* PC Speaker functions seems to be unused here - # include -+*/ - #else - # ifdef __NetBSD__ - # include -@@ -875,7 +877,11 @@ - if (sndStatOut.fd == -1) { - while ((sndStatOut.fd = open(sndStatOut.device, - sndStatOut. -+#if defined(__FreeBSD__) -+ howToOpen | extramode, -+#else - howToOpen | O_SYNC | extramode, -+#endif - 0666)) == -1 && wait) { - osLogMsg("openDevice: waiting on output device\n"); - sleep(1); -@@ -1618,6 +1624,11 @@ - /* - * Setup soundcard at maximum audio quality. - */ -+ -+#if defined(__FreeBSD__) -+#define NO_16_BIT_SAMPLING -+#endif -+ - static void - setupSoundcard(SndStat * sndStatPtr) - { -@@ -1880,7 +1891,11 @@ - sndStatOut.device, sndStatOut.howToOpen); - - if ((fd = open(sndStatOut.device, -+#if defined(__FreeBSD__) -+ sndStatOut.howToOpen | extramode, -+#else - sndStatOut.howToOpen | O_SYNC | extramode, -+#endif - 0)) == -1) { - UNIDENTMSG; - osLogMsg("Init: Output open(%s) failed: %s\n", diff --git a/audio/nas/files/patch-af b/audio/nas/files/patch-af deleted file mode 100644 index e06f32944189..000000000000 --- a/audio/nas/files/patch-af +++ /dev/null @@ -1,9 +0,0 @@ ---- config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 -+++ config/NetAudio.def Fri Mar 24 04:55:49 2000 -@@ -8,5 +8,5 @@ - - XCOMM Directory where NAS will look for it's config file(s) - #ifndef NasConfigSearchPath --#define NasConfigSearchPath /etc/nas/ -+#define NasConfigSearchPath $(PROJECTROOT)/etc/ - #endif diff --git a/audio/nas/files/patch-config_NetAudio.def b/audio/nas/files/patch-config_NetAudio.def new file mode 100644 index 000000000000..e06f32944189 --- /dev/null +++ b/audio/nas/files/patch-config_NetAudio.def @@ -0,0 +1,9 @@ +--- config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 ++++ config/NetAudio.def Fri Mar 24 04:55:49 2000 +@@ -8,5 +8,5 @@ + + XCOMM Directory where NAS will look for it's config file(s) + #ifndef NasConfigSearchPath +-#define NasConfigSearchPath /etc/nas/ ++#define NasConfigSearchPath $(PROJECTROOT)/etc/ + #endif diff --git a/audio/nas/files/patch-server_dda_voxware_auvoxware.c b/audio/nas/files/patch-server_dda_voxware_auvoxware.c new file mode 100644 index 000000000000..d36871915fe7 --- /dev/null +++ b/audio/nas/files/patch-server_dda_voxware_auvoxware.c @@ -0,0 +1,57 @@ +--- server/dda/voxware/auvoxware.c.orig 2008-05-14 22:35:08.000000000 +0400 ++++ server/dda/voxware/auvoxware.c 2008-05-14 22:40:32.000000000 +0400 +@@ -133,7 +133,7 @@ + + #include + #include +-#ifndef SVR4 ++#if !defined(SVR4) && !defined(__FreeBSD__) + #include + #endif + #include +@@ -183,7 +183,9 @@ + # else + # include + # endif ++/* PC Speaker functions seems to be unused here + # include ++*/ + #else + # ifdef __NetBSD__ + # include +@@ -875,7 +877,11 @@ + if (sndStatOut.fd == -1) { + while ((sndStatOut.fd = open(sndStatOut.device, + sndStatOut. ++#if defined(__FreeBSD__) ++ howToOpen | extramode, ++#else + howToOpen | O_SYNC | extramode, ++#endif + 0666)) == -1 && wait) { + osLogMsg("openDevice: waiting on output device\n"); + sleep(1); +@@ -1618,6 +1624,11 @@ + /* + * Setup soundcard at maximum audio quality. + */ ++ ++#if defined(__FreeBSD__) ++#define NO_16_BIT_SAMPLING ++#endif ++ + static void + setupSoundcard(SndStat * sndStatPtr) + { +@@ -1880,7 +1891,11 @@ + sndStatOut.device, sndStatOut.howToOpen); + + if ((fd = open(sndStatOut.device, ++#if defined(__FreeBSD__) ++ sndStatOut.howToOpen | extramode, ++#else + sndStatOut.howToOpen | O_SYNC | extramode, ++#endif + 0)) == -1) { + UNIDENTMSG; + osLogMsg("Init: Output open(%s) failed: %s\n", diff --git a/audio/nas/files/patch_clients_audio_audial_audial.c b/audio/nas/files/patch_clients_audio_audial_audial.c new file mode 100644 index 000000000000..c6e297e99430 --- /dev/null +++ b/audio/nas/files/patch_clients_audio_audial_audial.c @@ -0,0 +1,19 @@ +--- clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 ++++ clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 +@@ -133,6 +133,7 @@ + signal(SIGALRM, SIG_DFL); + } + ++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) + static void + usleep(usecs) + unsigned int usecs; +@@ -149,7 +150,7 @@ + setitimer(ITIMER_REAL, &ntval, &otval); + pause(); + } +- ++#endif + #endif /* SYSV else not */ + #endif /* VMS else not */ + #endif /* NEEDUSLEEP */ -- cgit