- Update to 0.5.903

- Add GNOME and XCB options

PR:		124619
Submitted by:	Max Brazhnikov <makc@issp.ac.ru> (maintainer)

4 files changed, 198 insertions, 6 deletions

diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 9109b17793cb..9873df5fd32e 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gxine
-PORTVERSION=	0.5.902
-PORTREVISION=	1
+PORTVERSION=	0.5.903
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xine
@@ -25,6 +24,7 @@ USE_XORG=	x11 xaw ice
 MAKE_ARGS+=	LDFLAGS=-shared-libgcc
 CNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-hal
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_ICONS=	yes
 
 MANLANG=	"" de es
@@ -32,8 +32,10 @@ MAN1=		gxine.1 gxine_client.1
 MANCOMPRESSED=	no
 
 OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" on \
+		GNOME "Enable Gnome integration" off \
 		DBUS "Enable dbus support" on \
-		LIRC "Enable lirc support" off
+		LIRC "Enable lirc support" off \
+		XCB "Enable XCB support" off
 
 .include <bsd.port.pre.mk>
 
@@ -41,6 +43,12 @@ OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" on \
 CFLAGS+=	-O2
 .endif
 
+.if defined(WITH_GNOME)
+USE_GNOME+=	gnomevfs2 libgnomeui
+.else
+CONFIGURE_ARGS+=--disable-integration-wizard
+.endif
+
 .if !defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=--with-dbus
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
@@ -77,11 +85,19 @@ CONFIGURE_ARGS+=--disable-libjs
 PLIST_SUB+=	MOZILLA_PLUGIN=""
 .endif
 
+.if defined(WITH_XCB)
+LIB_DEPENDS+=	xcb.1:${PORTSDIR}/x11/libxcb
+.else
+CONFIGURE_ARGS+=--without-xcb
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \
 		${WRKSRC}/po/Makefile.in.in
 	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \
 		${WRKSRC}/misc/po/Makefile.in.in
+	@${REINPLACE_CMD} -e "s:@MAKE_PNG_TRUE@:#:g" \
+		${WRKSRC}/pixmaps/Makefile.in
 
 post-install:
 .if !defined(WITHOUT_MOZILLA_PLUGIN)
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 8010b0c0cfd0..e98131fc1dcd 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (gxine-0.5.902.tar.bz2) = 2650bc483975ca5372ff08d299f92dc7
-SHA256 (gxine-0.5.902.tar.bz2) = 7fd9b9fe0d3b6ee20e84468411da00c117e62c2d096af057588b8dce23f613d4
-SIZE (gxine-0.5.902.tar.bz2) = 1104963
+MD5 (gxine-0.5.903.tar.bz2) = 3878ffb159fa5aca093617dab4924e6d
+SHA256 (gxine-0.5.903.tar.bz2) = 989fdd12eeae994c0462d5fa9c634f18f45828fcda54a03271f3591ae5a0090b
+SIZE (gxine-0.5.903.tar.bz2) = 1112012
diff --git a/multimedia/gxine/files/patch-src_console_output.c b/multimedia/gxine/files/patch-src_console_output.c
new file mode 100644
index 000000000000..913bc0ca11df
--- /dev/null
+++ b/multimedia/gxine/files/patch-src_console_output.c
@@ -0,0 +1,156 @@
+--- ./src/console_output.c.orig	2008-06-12 04:48:13.000000000 +0400
++++ ./src/console_output.c	2008-06-15 18:04:23.000000000 +0400
+@@ -44,6 +44,153 @@
+ #else
+ /* defines & functions for gxine */
+ 
++/* from src/contrib/cvs/lib/getline.h */
++#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
++#define __PROTO(args) args
++#else
++#define __PROTO(args) ()
++#endif  /* GCC.  */
++
++#define GETLINE_NO_LIMIT -1
++
++int
++  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++int
++  getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
++                         int limit));
++int
++  getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
++		   int _terminator, int _offset, int limit));
++
++/* getline.h */
++/* from src/contrib/cvs/lib/getline.c */
++
++#include <sys/types.h>
++#include <assert.h>
++#include <errno.h>
++
++#define MIN_CHUNK 64
++
++int
++getstr (lineptr, n, stream, terminator, offset, limit)
++     char **lineptr;
++     size_t *n;
++     FILE *stream;
++     int terminator;
++     int offset;
++     int limit;
++{
++  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
++  char *read_pos;		/* Where we're reading into *LINEPTR. */
++  int ret;
++
++  if (!lineptr || !n || !stream)
++    {
++      errno = EINVAL;
++      return -1;
++    }
++
++  if (!*lineptr)
++    {
++      *n = MIN_CHUNK;
++      *lineptr = malloc (*n);
++      if (!*lineptr)
++	{
++	  errno = ENOMEM;
++	  return -1;
++	}
++      *lineptr[0] = '\0';
++    }
++
++  nchars_avail = *n - offset;
++  read_pos = *lineptr + offset;
++
++  for (;;)
++    {
++      int save_errno;
++      register int c;
++
++      if (limit == 0)
++          break;
++      else
++      {
++          c = getc (stream);
++
++          /* If limit is negative, then we shouldn't pay attention to
++             it, so decrement only if positive. */
++          if (limit > 0)
++              limit--;
++      }
++
++      save_errno = errno;
++
++      /* We always want at least one char left in the buffer, since we
++	 always (unless we get an error while reading the first char)
++	 NUL-terminate the line buffer.  */
++
++      assert((*lineptr + *n) == (read_pos + nchars_avail));
++      if (nchars_avail < 2)
++	{
++	  if (*n > MIN_CHUNK)
++	    *n *= 2;
++	  else
++	    *n += MIN_CHUNK;
++
++	  nchars_avail = *n + *lineptr - read_pos;
++	  *lineptr = realloc (*lineptr, *n);
++	  if (!*lineptr)
++	    {
++	      errno = ENOMEM;
++	      return -1;
++	    }
++	  read_pos = *n - nchars_avail + *lineptr;
++	  assert((*lineptr + *n) == (read_pos + nchars_avail));
++	}
++
++      if (ferror (stream))
++	{
++	  /* Might like to return partial line, but there is no
++	     place for us to store errno.  And we don't want to just
++	     lose errno.  */
++	  errno = save_errno;
++	  return -1;
++	}
++
++      if (c == EOF)
++	{
++	  /* Return partial line, if any.  */
++	  if (read_pos == *lineptr)
++	    return -1;
++	  else
++	    break;
++	}
++
++      *read_pos++ = c;
++      nchars_avail--;
++
++      if (c == terminator)
++	/* Return the line.  */
++	break;
++    }
++
++  /* Done - NUL terminate and return the number of chars read.  */
++  *read_pos = '\0';
++
++  ret = read_pos - (*lineptr + offset);
++  return ret;
++}
++
++int
++getline (lineptr, n, stream)
++     char **lineptr;
++     size_t *n;
++     FILE *stream;
++{
++  return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
++}
++
++/* getline.c */
++
+ # include <pthread.h>
+ # include <string.h>
+ # include "log_window.h"
diff --git a/multimedia/gxine/files/patch-src_desktop_integration.c b/multimedia/gxine/files/patch-src_desktop_integration.c
new file mode 100644
index 000000000000..40b110dda350
--- /dev/null
+++ b/multimedia/gxine/files/patch-src_desktop_integration.c
@@ -0,0 +1,20 @@
+--- ./src/desktop_integration.c.orig	2008-05-23 22:42:20.000000000 +0400
++++ ./src/desktop_integration.c	2008-06-15 20:21:03.000000000 +0400
+@@ -123,6 +123,9 @@
+ 
+ gboolean gxine_vfs_init (void)
+ {
++#ifndef USE_INTEGRATION_WIZARD
++  return gnome_vfs_available = 0;
++#else
+   void (*init_func) (void) = NULL;
+ 
+   if (gnome_vfs_available != -1)
+@@ -173,6 +176,7 @@
+ #endif
+ 
+   return gnome_vfs_available = 1;
++#endif
+ }
+ 
+ /*