From 09cbe7292bc41829dbe77d14037a4c28b734ec20 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Sun, 8 May 2005 06:33:35 +0000
Subject: Make this build under FreeBSD. PKGREVISION not bumped since these
 changes only matter for FreeBSD build which failed in the first place.

Note that xine-lib is needed, but the xine-lib fixes for
FreeBSD have not been committed yet.

(If you are curious, I am using gxine on FreeBSD all installed
via pkgsrc to watch a MS Windows Media 7 ASF video and listen to
MS Windows Media Audio 2 without any win32-codecs installed.)
---
 multimedia/gxine/distinfo         |  5 +++--
 multimedia/gxine/patches/patch-ac |  8 ++++----
 multimedia/gxine/patches/patch-ad | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 multimedia/gxine/patches/patch-ad

(limited to 'multimedia/gxine')

diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index c5003cda0d8..72e2c75a59f 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/04/13 16:39:32 rillig Exp $
+$NetBSD: distinfo,v 1.5 2005/05/08 06:33:35 reed 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 (patch-ab) = 581122a87dd3ea1a61b434ba721866efd3455ab6
-SHA1 (patch-ac) = 9b61e2b986659c238308dcc670f3de27918919bc
+SHA1 (patch-ac) = b4db5fbfb45f283937b38db2d2e22110b7e113be
+SHA1 (patch-ad) = bde89fe3b8457b7795b33cdc4a05251d0a83da48
 SHA1 (patch-af) = 0bf58de7d5d3a50731d30623bc76732e8d2f771f
 SHA1 (patch-ag) = 4c04a21a1fdb56c48384b3883ffb2692d5ac2abd
 SHA1 (patch-ah) = 46e1e60573d33deac2d0c8f5f5c901edb2ef5f27
diff --git a/multimedia/gxine/patches/patch-ac b/multimedia/gxine/patches/patch-ac
index d36ec315972..0b57e70564b 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.3 2005/05/08 06:33:35 reed 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..99af8bde4b3
--- /dev/null
+++ b/multimedia/gxine/patches/patch-ad
@@ -0,0 +1,14 @@
+--- 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)
-- 
cgit v1.2.3