head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.42 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.40 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.38 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.36 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.34 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.32 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.30 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.28 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.26 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.24 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.22 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.20 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2005.06.04.10.41.42; author jmmv; state dead; branches; next 1.3; 1.3 date 2003.05.12.20.17.48; author jmc; state Exp; branches; next 1.2; 1.2 date 2003.05.11.10.05.13; author jmc; state Exp; branches; next 1.1; 1.1 date 2003.04.23.08.15.40; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.04.23.08.15.40; author rh; state Exp; branches; next ; desc @@ 1.4 log @Move swfdec and swfdec-gtk2 from graphics to multimedia. Suggested by wiz@@. @ text @$NetBSD: patch-ab,v 1.3 2003/05/12 20:17:48 jmc Exp $ --- player/swf_play.c.orig Wed Feb 5 20:19:27 2003 +++ player/swf_play.c Mon May 12 11:43:12 2003 @@@@ -15,6 +15,8 @@@@ #include #include #include +#include +#include #include #include @@@@ -72,6 +74,15 @@@@ static gboolean render_idle(gpointer data); /* fault handling stuff */ +#ifndef SI_USER +typedef struct { + char *si_addr; + int si_signo; + int si_errno; + int si_code; +} siginfo_t; +#endif + void fault_handler(int signum, siginfo_t *si, void *misc); void fault_restore(void); void fault_setup(void); @@@@ -539,6 +550,20 @@@@ _exit(0); } +#ifndef SI_USER +void si_handler(int sig, int code, struct sigcontext *scp) +{ + siginfo_t si; + + si.si_addr = NULL; + si.si_signo = sig; + si.si_errno = errno; + si.si_code = code; + + fault_handler(sig, &si, scp); +} +#endif + void fault_restore(void) { struct sigaction action; @@@@ -555,8 +580,13 @@@@ struct sigaction action; memset(&action,0,sizeof(action)); +#ifdef SI_USER action.sa_sigaction = fault_handler; - action.sa_flags = SA_SIGINFO; + action.sa_flags = 0; +#else + action.sa_handler = (void (*)(int))si_handler; + action.sa_flags = 0; +#endif sigaction(SIGSEGV, &action, NULL); sigaction(SIGQUIT, &action, NULL); @ 1.3 log @Redo siginfo patches to work correctly on -current also @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2003/05/11 10:05:13 jmc Exp $ @ 1.2 log @Restructure siginfo patches so this can work on pre-siginfo systems as well @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ d4 1 a4 1 +++ player/swf_play.c Sun May 11 04:39:15 2003 d18 1 a18 1 +#ifndef SA_SIGINFO d34 1 a34 1 +#ifndef SA_SIGINFO d55 1 a55 1 +#ifdef SA_SIGINFO d57 2 a58 1 action.sa_flags = SA_SIGINFO; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- player/swf_play.c.orig 2003-02-06 06:19:27.000000000 +1000 +++ player/swf_play.c d14 17 a30 1 @@@@ -539,6 +541,19 @@@@ void fault_handler(int signum, siginfo_t d39 1 d51 1 a51 1 @@@@ -555,8 +570,13 @@@@ void fault_setup(void) d59 1 a59 1 + action.sa_sigaction = (void (*)(int))si_handler; @ 1.1.1.1 log @Initial import of swfdec-0.2.1, a library for rendering Flash(R) animations and games. @ text @@