diff options
Diffstat (limited to 'x11/gnustep-gui/patches')
| -rw-r--r-- | x11/gnustep-gui/patches/patch-aa | 73 | ||||
| -rw-r--r-- | x11/gnustep-gui/patches/patch-ac | 8 |
2 files changed, 4 insertions, 77 deletions
diff --git a/x11/gnustep-gui/patches/patch-aa b/x11/gnustep-gui/patches/patch-aa deleted file mode 100644 index fd3dbf93260..00000000000 --- a/x11/gnustep-gui/patches/patch-aa +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/04/12 15:54:21 adam Exp $ - ---- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig 2005-03-21 16:25:28.000000000 +0000 -+++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c -@@ -580,8 +580,10 @@ static int PaHost_CanaryProc( PaHostSoun - static PaError PaHost_WatchDogProc( PaHostSoundControl *pahsc ) - { - PaError result = 0; -+#ifndef _PTH_PTHREAD_H_ - struct sched_param schp = { 0 }; - int maxPri; -+#endif - - #ifdef GNUSTEP - GSRegisterCurrentThread(); /* SB20010904 */ -@@ -589,6 +591,7 @@ static PaError PaHost_WatchDogProc( PaHo - - /* Run at a priority level above audio thread so we can still run if it hangs. */ - /* Rise more than 1 because of rumored off-by-one scheduler bugs. */ -+#ifndef _PTH_PTHREAD_H_ - schp.sched_priority = pahsc->pahsc_AudioPriority + 4; - maxPri = sched_get_priority_max(SCHEDULER_POLICY); - if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri; -@@ -598,6 +601,7 @@ static PaError PaHost_WatchDogProc( PaHo - ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n")); - goto killAudio; - } -+#endif - - /* Compare watchdog time with audio and canary thread times. */ - /* Sleep for a while or until thread cancelled. */ -@@ -633,6 +637,7 @@ static PaError PaHost_WatchDogProc( PaHo - return 0; - - lowerAudio: -+#ifndef _PTH_PTHREAD_H_ - { - struct sched_param schat = { 0 }; - if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0) -@@ -646,6 +651,7 @@ lowerAudio: - goto cleanup; - } - } -+#endif - - killAudio: - ERR_RPT(("PaHost_WatchDogProc: killing hung audio thread!\n")); -@@ -740,7 +746,9 @@ static PaError PaHost_BoostPriority( int - { - PaHostSoundControl *pahsc; - PaError result = paNoError; -+#ifndef _PTH_PTHREAD_H_ - struct sched_param schp = { 0 }; -+#endif - - pahsc = (PaHostSoundControl *) past->past_DeviceData; - if( pahsc == NULL ) return paInternalError; -@@ -748,6 +756,7 @@ static PaError PaHost_BoostPriority( int - pahsc->pahsc_AudioThreadPID = getpid(); - DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID )); - -+#ifndef _PTH_PTHREAD_H_ - /* Choose a priority in the middle of the range. */ - pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) - - sched_get_priority_min(SCHEDULER_POLICY)) / 2; -@@ -763,6 +772,7 @@ static PaError PaHost_BoostPriority( int - /* We are running at high priority so we should have a watchdog in case audio goes wild. */ - result = PaHost_StartWatchDog( pahsc ); - } -+#endif - - return result; - } diff --git a/x11/gnustep-gui/patches/patch-ac b/x11/gnustep-gui/patches/patch-ac index d0d7e37b658..510e12fe796 100644 --- a/x11/gnustep-gui/patches/patch-ac +++ b/x11/gnustep-gui/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/09/27 15:24:36 rh Exp $ +$NetBSD: patch-ac,v 1.2 2005/07/29 12:59:25 adam Exp $ ---- Tools/gsnd/GNUmakefile.preamble.orig Wed Jul 31 07:19:05 2002 +--- Tools/gsnd/GNUmakefile.preamble.orig 2005-07-01 20:54:03.000000000 +0000 +++ Tools/gsnd/GNUmakefile.preamble -@@ -24,7 +24,7 @@ - ADDITIONAL_INCLUDE_DIRS += -Iportaudio/pa_common +@@ -26,7 +26,7 @@ + #ADDITIONAL_INCLUDE_DIRS += # Additional LDFLAGS to pass to the linker -#ADDITIONAL_LDFLAGS += |