From fb5c142dc0598cef4fa6f63f122a017241ac3919 Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 13 Apr 2005 16:39:32 +0000 Subject: Added some patches for ISO C90 compliance, for NetBSD-1.6.2, and for gcc-2.95. Approved by jlam. --- multimedia/gxine/Makefile | 4 ++- multimedia/gxine/distinfo | 7 ++++- multimedia/gxine/patches/patch-ag | 15 ++++++++++ multimedia/gxine/patches/patch-ah | 14 +++++++++ multimedia/gxine/patches/patch-ai | 63 +++++++++++++++++++++++++++++++++++++++ multimedia/gxine/patches/patch-aj | 15 ++++++++++ multimedia/gxine/patches/patch-ak | 22 ++++++++++++++ 7 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 multimedia/gxine/patches/patch-ag create mode 100644 multimedia/gxine/patches/patch-ah create mode 100644 multimedia/gxine/patches/patch-ai create mode 100644 multimedia/gxine/patches/patch-aj create mode 100644 multimedia/gxine/patches/patch-ak (limited to 'multimedia') diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 95e59dc0c30..bd93e7e416c 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:41 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/04/13 16:39:32 rillig Exp $ # DISTNAME= gxine-0.4.1 @@ -13,6 +13,8 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_X11= YES +PTHREAD_OPTS+= require + .include "../../devel/glib2/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo index f4f21f834f1..c5003cda0d8 100644 --- a/multimedia/gxine/distinfo +++ b/multimedia/gxine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/04/13 16:39:32 rillig Exp $ SHA1 (gxine-0.4.1.tar.gz) = af8f758c0ce8b1c0917c9e02567d5479807aaec8 RMD160 (gxine-0.4.1.tar.gz) = 71e86f371ee4d4a65b10efd62972be67bb160add @@ -6,3 +6,8 @@ Size (gxine-0.4.1.tar.gz) = 1286144 bytes SHA1 (patch-ab) = 581122a87dd3ea1a61b434ba721866efd3455ab6 SHA1 (patch-ac) = 9b61e2b986659c238308dcc670f3de27918919bc SHA1 (patch-af) = 0bf58de7d5d3a50731d30623bc76732e8d2f771f +SHA1 (patch-ag) = 4c04a21a1fdb56c48384b3883ffb2692d5ac2abd +SHA1 (patch-ah) = 46e1e60573d33deac2d0c8f5f5c901edb2ef5f27 +SHA1 (patch-ai) = f9c5ea86cad2de731304b6ffb96530aaf4161e86 +SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d +SHA1 (patch-ak) = a7b01fc2e33414669c5390934d47e96062baabd0 diff --git a/multimedia/gxine/patches/patch-ag b/multimedia/gxine/patches/patch-ag new file mode 100644 index 00000000000..5d1286bfac9 --- /dev/null +++ b/multimedia/gxine/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1 2005/04/13 16:39:32 rillig Exp $ + +Needed for gcc-2.95. + +--- src/defs.h.orig Fri Nov 5 22:43:39 2004 ++++ src/defs.h Tue Apr 12 12:48:59 2005 +@@ -26,7 +26,7 @@ + + /* debug logging */ + #ifdef LOG +-#define logprintf(FMT,...) printf (FMT, ## __VA_ARGS__) ++#define logprintf(FMT,...) printf (FMT , ## __VA_ARGS__) + #else + #define logprintf(FMT,...) + #endif diff --git a/multimedia/gxine/patches/patch-ah b/multimedia/gxine/patches/patch-ah new file mode 100644 index 00000000000..7bbccc52102 --- /dev/null +++ b/multimedia/gxine/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2005/04/13 16:39:32 rillig Exp $ + +Needed for NetBSD-1.6.2. + +--- src/globals.h.orig Sat Dec 11 01:40:18 2004 ++++ src/globals.h Tue Apr 12 12:49:30 2005 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "script_engine.h" + #include "infobar.h" diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai new file mode 100644 index 00000000000..c5a272eb936 --- /dev/null +++ b/multimedia/gxine/patches/patch-ai @@ -0,0 +1,63 @@ +$NetBSD: patch-ai,v 1.1 2005/04/13 16:39:32 rillig Exp $ + +Needed for ISO C90 compliance. + +--- src/key_events.c.orig Fri Dec 17 01:32:59 2004 ++++ src/key_events.c Tue Apr 12 12:58:06 2005 +@@ -605,8 +605,8 @@ void kb_edit_show (void) { + + static void do_edit_binding (void) + { +- editkey = *lookup_binding (&catch_key_iter); + char title[64]; ++ editkey = *lookup_binding (&catch_key_iter); + + gtk_entry_set_text (GTK_ENTRY (kb_binding_desc), editkey.desc); + gtk_entry_set_text (GTK_ENTRY (kb_binding_command), editkey.cmd); +@@ -1056,9 +1056,7 @@ static JSBool js_keybindings_show (JSCon + + /* Xine event mapping data */ + +-static const kb_xine_event_map_t xine_input = { +- "INPUT", +- { ++static const kb_xine_event_id_t xine_input_ids[] = { + { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT }, + { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS }, + { "DOWN", XINE_EVENT_INPUT_DOWN }, +@@ -1099,7 +1097,10 @@ static const kb_xine_event_map_t xine_in + { "9", XINE_EVENT_INPUT_NUMBER_9 }, + { "-", -1 }, /* null event */ + { "" } +- } ++}; ++ ++static const kb_xine_event_map_t xine_input = { ++ "INPUT", &xine_input_ids + }; + + +@@ -1129,10 +1130,7 @@ int kb_xine_event_lookup (const kb_xine_ + return 0; + } + +- +-static const kb_xine_event_map_t xine_vdr = { +- "VDR", +- { ++static const kb_xine_event_id_t xine_vdr_ids[] = { + { "BACK", XINE_EVENT_VDR_BACK }, + { "BLUE", XINE_EVENT_VDR_BLUE }, + { "CHANNELMINUS", XINE_EVENT_VDR_CHANNELMINUS }, +@@ -1166,7 +1164,10 @@ static const kb_xine_event_map_t xine_vd + { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS }, + { "YELLOW", XINE_EVENT_VDR_YELLOW }, + { "" } +- } ++}; ++ ++static const kb_xine_event_map_t xine_vdr = { ++ "VDR", &xine_vdr_ids + }; + + static JSBool js_vdr (JSContext *cx, JSObject *obj, uintN argc, diff --git a/multimedia/gxine/patches/patch-aj b/multimedia/gxine/patches/patch-aj new file mode 100644 index 00000000000..6ba828774c8 --- /dev/null +++ b/multimedia/gxine/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1 2005/04/13 16:39:32 rillig Exp $ + +Needed for ISO C90 compliance. + +--- src/key_events.h.orig Thu Dec 16 00:59:59 2004 ++++ src/key_events.h Tue Apr 12 12:53:59 2005 +@@ -35,7 +35,7 @@ typedef struct kb_xine_event_id_s kb_xin + + struct kb_xine_event_map_s { + char prefix[8]; +- const kb_xine_event_id_t id[]; ++ const kb_xine_event_id_t *id; + }; + typedef struct kb_xine_event_map_s kb_xine_event_map_t; + diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak new file mode 100644 index 00000000000..1e8c25f4f6a --- /dev/null +++ b/multimedia/gxine/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1 2005/04/13 16:39:32 rillig Exp $ + +Needed for ISO C90 compliance. + +--- src/utils.c.orig Fri Dec 17 01:33:00 2004 ++++ src/utils.c Tue Apr 12 12:51:05 2005 +@@ -750,6 +750,7 @@ void ui_preferences_register (xine_t *th + N_("Top, visible"), N_("Bottom, visible"), + NULL + }; ++ int i; + + /* Register the experience level setting */ + xine_config_register_enum +@@ -759,7 +760,6 @@ void ui_preferences_register (xine_t *th + 0, NULL, CONFIG_DATA_NONE); + + /* Register a few audio/video config items */ +- int i; + for (i = 0; i < sizeof (ranges) / sizeof (ranges[0]); ++i) + { + if (ranges[i].setting && !strncmp (ranges[i].setting, "gui.", 4)) -- cgit v1.2.3