diff options
| author | jmc <jmc> | 2003-05-11 10:05:13 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-05-11 10:05:13 +0000 |
| commit | 059ae6a1e2530099bc7735d785bfa402eece5a65 (patch) | |
| tree | d2a99254f71d8c8c6c13d659c75be5052af446f3 /graphics/swfdec | |
| parent | 359d630a66f1e139f936bd0e0b1e720126f793db (diff) | |
| download | pkgsrc-059ae6a1e2530099bc7735d785bfa402eece5a65.tar.gz | |
Restructure siginfo patches so this can work on pre-siginfo systems as well
Diffstat (limited to 'graphics/swfdec')
| -rw-r--r-- | graphics/swfdec/distinfo | 4 | ||||
| -rw-r--r-- | graphics/swfdec/patches/patch-ab | 29 |
2 files changed, 25 insertions, 8 deletions
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo index a411c84b3db..ff2432945d2 100644 --- a/graphics/swfdec/distinfo +++ b/graphics/swfdec/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2003/05/01 12:36:15 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2003/05/11 10:05:13 jmc Exp $ SHA1 (swfdec-0.2.1.tar.gz) = e2c3b2257fefab0d4c45be24f351340735cc0674 Size (swfdec-0.2.1.tar.gz) = 325500 bytes SHA1 (patch-aa) = ae2cd8ffb34d09c709378cc3b45510cb5d738305 -SHA1 (patch-ab) = 0df07eb8e0de223d783705f5f596c5a28cd2d680 +SHA1 (patch-ab) = b13d137473b9b0dd640c76bc74acf00666029375 SHA1 (patch-ac) = 13d5317380add698baa4e14a0187622325cd3a6a diff --git a/graphics/swfdec/patches/patch-ab b/graphics/swfdec/patches/patch-ab index 1eceda11ba0..38e3e469cb2 100644 --- a/graphics/swfdec/patches/patch-ab +++ b/graphics/swfdec/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/11 10:05:13 jmc Exp $ ---- player/swf_play.c.orig 2003-02-06 06:19:27.000000000 +1000 -+++ player/swf_play.c +--- player/swf_play.c.orig Wed Feb 5 20:19:27 2003 ++++ player/swf_play.c Sun May 11 04:39:15 2003 @@ -15,6 +15,8 @@ #include <signal.h> #include <sys/wait.h> @@ -11,7 +11,23 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ #include <time.h> #include <string.h> -@@ -539,6 +541,19 @@ void fault_handler(int signum, siginfo_t +@@ -72,6 +74,15 @@ + static gboolean render_idle(gpointer data); + + /* fault handling stuff */ ++#ifndef SA_SIGINFO ++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); } @@ -20,6 +36,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ +{ + siginfo_t si; + ++ si.si_addr = NULL; + si.si_signo = sig; + si.si_errno = errno; + si.si_code = code; @@ -31,7 +48,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ void fault_restore(void) { struct sigaction action; -@@ -555,8 +570,13 @@ void fault_setup(void) +@@ -555,8 +580,13 @@ struct sigaction action; memset(&action,0,sizeof(action)); @@ -39,7 +56,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $ action.sa_sigaction = fault_handler; action.sa_flags = SA_SIGINFO; +#else -+ action.sa_sigaction = (void (*)(int))si_handler; ++ action.sa_handler = (void (*)(int))si_handler; + action.sa_flags = 0; +#endif |