summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/gxine/Makefile8
-rw-r--r--multimedia/gxine/distinfo15
-rw-r--r--multimedia/gxine/patches/patch-ac8
-rw-r--r--multimedia/gxine/patches/patch-ad16
-rw-r--r--multimedia/gxine/patches/patch-ag15
-rw-r--r--multimedia/gxine/patches/patch-ah14
-rw-r--r--multimedia/gxine/patches/patch-ai62
-rw-r--r--multimedia/gxine/patches/patch-aj15
8 files changed, 142 insertions, 11 deletions
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 21190388581..c674de43a05 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/01/06 17:22:52 drochner Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2005/05/28 04:48:56 snj Exp $
#
-DISTNAME= gxine-0.4.1
+DISTNAME= gxine-0.4.5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -12,7 +12,11 @@ COMMENT= Gtk-based media player
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
USE_LIBTOOL= YES
+USE_PKGLOCALEDIR= YES
USE_X11= YES
+USE_GNU_TOOLS+= make
+
+PTHREAD_OPTS+= require
.include "../../devel/glib2/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index f4f21f834f1..f31ce2aaace 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
+$NetBSD: distinfo,v 1.3.2.1 2005/05/28 04:48:56 snj Exp $
-SHA1 (gxine-0.4.1.tar.gz) = af8f758c0ce8b1c0917c9e02567d5479807aaec8
-RMD160 (gxine-0.4.1.tar.gz) = 71e86f371ee4d4a65b10efd62972be67bb160add
-Size (gxine-0.4.1.tar.gz) = 1286144 bytes
+SHA1 (gxine-0.4.5.tar.gz) = e18fea29164b10a93f9a4bc0de45db0db0d82fdd
+RMD160 (gxine-0.4.5.tar.gz) = b6ffce9caf73b244cfa674faed5def17edda9755
+Size (gxine-0.4.5.tar.gz) = 1322811 bytes
SHA1 (patch-ab) = 581122a87dd3ea1a61b434ba721866efd3455ab6
-SHA1 (patch-ac) = 9b61e2b986659c238308dcc670f3de27918919bc
+SHA1 (patch-ac) = b4db5fbfb45f283937b38db2d2e22110b7e113be
+SHA1 (patch-ad) = 1a0cf404f16806bc75cb12659a6f0f86e5e52705
SHA1 (patch-af) = 0bf58de7d5d3a50731d30623bc76732e8d2f771f
+SHA1 (patch-ag) = 4c04a21a1fdb56c48384b3883ffb2692d5ac2abd
+SHA1 (patch-ah) = 46e1e60573d33deac2d0c8f5f5c901edb2ef5f27
+SHA1 (patch-ai) = 00deba3aa54610ccf66ae267792b93c307db106d
+SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
diff --git a/multimedia/gxine/patches/patch-ac b/multimedia/gxine/patches/patch-ac
index d36ec315972..46cf1fb253d 100644
--- a/multimedia/gxine/patches/patch-ac
+++ b/multimedia/gxine/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2005/01/06 17:22:52 drochner Exp $
+$NetBSD: patch-ac,v 1.2.2.1 2005/05/28 04:48:56 snj Exp $
---- src/desktop_integration.c.orig 2004-11-10 02:43:13.000000000 +0100
-+++ src/desktop_integration.c
+--- src/desktop_integration.c.orig Tue Nov 9 17:43:13 2004
++++ src/desktop_integration.c Sat May 7 18:57:38 2005
@@ -31,7 +31,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
#include <alloca.h>
+#endif
#include <string.h>
diff --git a/multimedia/gxine/patches/patch-ad b/multimedia/gxine/patches/patch-ad
new file mode 100644
index 00000000000..2e05907062e
--- /dev/null
+++ b/multimedia/gxine/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.2.2.1 2005/05/28 04:48:56 snj Exp $
+
+--- src/spidermonkey/jsprf.c.orig Sat May 7 19:07:27 2005
++++ src/spidermonkey/jsprf.c Sat May 7 19:08:37 2005
+@@ -57,7 +57,11 @@
+ #define VARARGS_ASSIGN(foo, bar) (foo) = (bar)
+ #endif
+ */
++#ifndef __FreeBSD__
+ #define VARARGS_ASSIGN(foo, bar) __va_copy(foo, bar)
++#else
++#define VARARGS_ASSIGN(foo, bar) (foo) = (bar)
++#endif
+
+ /*
+ ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)
diff --git a/multimedia/gxine/patches/patch-ag b/multimedia/gxine/patches/patch-ag
new file mode 100644
index 00000000000..9e1b5c3d76e
--- /dev/null
+++ b/multimedia/gxine/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.2.2 2005/05/28 04:48:56 snj 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..92fa256ddff
--- /dev/null
+++ b/multimedia/gxine/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1.2.2 2005/05/28 04:48:56 snj 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 <gdk/gdk.h>
+ #include <glib.h>
+ #include <xine.h>
++#include <pthread.h>
+
+ #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..91fbda93dda
--- /dev/null
+++ b/multimedia/gxine/patches/patch-ai
@@ -0,0 +1,62 @@
+$NetBSD: patch-ai,v 1.2.2.2 2005/05/28 04:48:56 snj Exp $
+
+Needed for ISO C90 compliance.
+
+--- src/key_events.c.orig 2005-04-26 00:11:56.000000000 +0200
++++ src/key_events.c 2005-05-27 13:05:59.000000000 +0200
+@@ -610,8 +610,8 @@
+
+ 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);
+@@ -1080,9 +1080,7 @@
+
+ /* 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 },
+@@ -1123,7 +1121,10 @@
+ { "9", XINE_EVENT_INPUT_NUMBER_9 },
+ { "-", -1 }, /* null event */
+ { "" }
+- }
++};
++
++static const kb_xine_event_map_t xine_input = {
++ "INPUT", &xine_input_ids
+ };
+
+
+@@ -1170,9 +1171,7 @@
+
+
+
+-static const kb_xine_event_map_t xine_vdr = {
+- "VDR",
+- {
++static const kb_xine_event_id_t xine_vdr_ids[] = {
+ { "AUDIO", XINE_EVENT_VDR_MUTE + 1 /* ..._VDR_AUDIO */ },
+ { "BACK", XINE_EVENT_VDR_BACK },
+ { "BLUE", XINE_EVENT_VDR_BLUE },
+@@ -1207,7 +1206,10 @@
+ { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
+ { "YELLOW", XINE_EVENT_VDR_YELLOW },
+ { "" }
+- }
++};
++
++static const kb_xine_event_map_t xine_vdr = {
++ "VDR", &xine_vdr_ids
+ };
+
+ JSBool js_event_generic (JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
diff --git a/multimedia/gxine/patches/patch-aj b/multimedia/gxine/patches/patch-aj
new file mode 100644
index 00000000000..c31b768fac4
--- /dev/null
+++ b/multimedia/gxine/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1.2.2 2005/05/28 04:48:56 snj 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;
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-07 21:31:37 +0000