Attachment #87913 for bug #124619

View | Details | Raw Unified | Return to bug 124619
Collapse All | Expand All




#

PORTNAME=	gxine
PORTVERSION=	0.5.903
PORTREVISION=	1
CATEGORIES=	multimedia
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	xine

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

MANCOMPRESSED=	no

OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" on \
		GNOME "Enable Gnome integration" off \
		DBUS "Enable dbus support" on \
		LIRC "Enable lirc support" off \
		XCB "Enable XCB support" off

.include <bsd.port.pre.mk>


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

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)

Lines 1-3 Link Here

(-)/home/makc/porting/ports/multimedia/gxine/distinfo (-3 / +3 lines)
1	MD5 (gxine-0.5.902.tar.bz2) = 2650bc483975ca5372ff08d299f92dc7	1	MD5 (gxine-0.5.903.tar.bz2) = 3878ffb159fa5aca093617dab4924e6d
2	SHA256 (gxine-0.5.902.tar.bz2) = 7fd9b9fe0d3b6ee20e84468411da00c117e62c2d096af057588b8dce23f613d4	2	SHA256 (gxine-0.5.903.tar.bz2) = 989fdd12eeae994c0462d5fa9c634f18f45828fcda54a03271f3591ae5a0090b
3	SIZE (gxine-0.5.902.tar.bz2) = 1104963	3	SIZE (gxine-0.5.903.tar.bz2) = 1112012




--- ./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"




--- ./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
 }
 
 /*

Return to bug 124619

Lines 6-13 Link Here

(-)/home/makc/porting/ports/multimedia/gxine/Makefile (-3 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= gxine	8	PORTNAME= gxine
9	PORTVERSION= 0.5.902	9	PORTVERSION= 0.5.903
10	PORTREVISION= 1
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= xine	12	MASTER_SITE_SUBDIR= xine
Lines 25-30 Link Here
25	MAKE_ARGS+= LDFLAGS=-shared-libgcc	24	MAKE_ARGS+= LDFLAGS=-shared-libgcc
26	CNU_CONFIGURE= yes	25	CNU_CONFIGURE= yes
27	CONFIGURE_ARGS+= --without-hal	26	CONFIGURE_ARGS+= --without-hal
		27	CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
28	INSTALLS_ICONS= yes	28	INSTALLS_ICONS= yes
29		29
30	MANLANG= "" de es	30	MANLANG= "" de es
Lines 32-39 Link Here
32	MANCOMPRESSED= no	32	MANCOMPRESSED= no
33		33
34	OPTIONS= MOZILLA_PLUGIN "Install Mozilla plugin" on \	34	OPTIONS= MOZILLA_PLUGIN "Install Mozilla plugin" on \
		35	GNOME "Enable Gnome integration" off \
35	DBUS "Enable dbus support" on \	36	DBUS "Enable dbus support" on \
36	LIRC "Enable lirc support" off	37	LIRC "Enable lirc support" off \
		38	XCB "Enable XCB support" off
37		39
38	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
39		41
Lines 41-46 Link Here
41	CFLAGS+= -O2	43	CFLAGS+= -O2
42	.endif	44	.endif
43		45
		46	.if defined(WITH_GNOME)
		47	USE_GNOME+= gnomevfs2 libgnomeui
		48	.else
		49	CONFIGURE_ARGS+=--disable-integration-wizard
		50	.endif
		51
44	.if !defined(WITHOUT_DBUS)	52	.if !defined(WITHOUT_DBUS)
45	CONFIGURE_ARGS+=--with-dbus	53	CONFIGURE_ARGS+=--with-dbus
46	LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib	54	LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
Lines 77-87 Link Here
77	PLIST_SUB+= MOZILLA_PLUGIN=""	85	PLIST_SUB+= MOZILLA_PLUGIN=""
78	.endif	86	.endif
79		87
		88	.if defined(WITH_XCB)
		89	LIB_DEPENDS+= xcb.1:${PORTSDIR}/x11/libxcb
		90	.else
		91	CONFIGURE_ARGS+=--without-xcb
		92	.endif
		93
80	pre-configure:	94	pre-configure:
81	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \	95	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \
82	${WRKSRC}/po/Makefile.in.in	96	${WRKSRC}/po/Makefile.in.in
83	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \	97	@${REINPLACE_CMD} -e "/^mkdir_p/s:@mkdir_p@:${MKDIR}:" \
84	${WRKSRC}/misc/po/Makefile.in.in	98	${WRKSRC}/misc/po/Makefile.in.in
		99	@${REINPLACE_CMD} -e "s:@MAKE_PNG_TRUE@:#:g" \
		100	${WRKSRC}/pixmaps/Makefile.in
85		101
86	post-install:	102	post-install:
87	.if !defined(WITHOUT_MOZILLA_PLUGIN)	103	.if !defined(WITHOUT_MOZILLA_PLUGIN)

Line 0 Link Here

(-)/home/makc/porting/ports/multimedia/gxine/files/patch-src__console_output.c (+156 lines)
		1	--- ./src/console_output.c.orig 2008-06-12 04:48:13.000000000 +0400
		2	+++ ./src/console_output.c 2008-06-15 18:04:23.000000000 +0400
		3	@@ -44,6 +44,153 @@
		4	#else
		5	/* defines & functions for gxine */
		6
		7	+/* from src/contrib/cvs/lib/getline.h */
		8	+#if defined (__GNUC__) \|\| (defined (__STDC__) && __STDC__)
		9	+#define __PROTO(args) args
		10	+#else
		11	+#define __PROTO(args) ()
		12	+#endif /* GCC. */
		13	+
		14	+#define GETLINE_NO_LIMIT -1
		15	+
		16	+int
		17	+ getline __PROTO ((char *_lineptr, size_t _n, FILE *_stream));
		18	+int
		19	+ getline_safe __PROTO ((char *_lineptr, size_t _n, FILE *_stream,
		20	+ int limit));
		21	+int
		22	+ getstr __PROTO ((char *_lineptr, size_t _n, FILE *_stream,
		23	+ int _terminator, int _offset, int limit));
		24	+
		25	+/* getline.h */
		26	+/* from src/contrib/cvs/lib/getline.c */
		27	+
		28	+#include <sys/types.h>
		29	+#include <assert.h>
		30	+#include <errno.h>
		31	+
		32	+#define MIN_CHUNK 64
		33	+
		34	+int
		35	+getstr (lineptr, n, stream, terminator, offset, limit)
		36	+ char **lineptr;
		37	+ size_t *n;
		38	+ FILE *stream;
		39	+ int terminator;
		40	+ int offset;
		41	+ int limit;
		42	+{
		43	+ int nchars_avail; /* Allocated but unused chars in LINEPTR. /
		44	+ char read_pos; / Where we're reading into LINEPTR. /
		45	+ int ret;
		46	+
		47	+ if (!lineptr \|\| !n \|\| !stream)
		48	+ {
		49	+ errno = EINVAL;
		50	+ return -1;
		51	+ }
		52	+
		53	+ if (!*lineptr)
		54	+ {
		55	+ *n = MIN_CHUNK;
		56	+ lineptr = malloc (n);
		57	+ if (!*lineptr)
		58	+ {
		59	+ errno = ENOMEM;
		60	+ return -1;
		61	+ }
		62	+ *lineptr[0] = '\0';
		63	+ }
		64	+
65	+ nchars_avail = *n - offset;
66	+ read_pos = *lineptr + offset;
67	+
68	+ for (;;)
69	+ {
70	+ int save_errno;
71	+ register int c;
72	+
73	+ if (limit == 0)
74	+ break;
75	+ else
76	+ {
77	+ c = getc (stream);
78	+
79	+ /* If limit is negative, then we shouldn't pay attention to
80	+ it, so decrement only if positive. */
81	+ if (limit > 0)
82	+ limit--;
83	+ }
84	+
85	+ save_errno = errno;
86	+
87	+ /* We always want at least one char left in the buffer, since we
88	+ always (unless we get an error while reading the first char)
89	+ NUL-terminate the line buffer. */
90	+
91	+ assert((lineptr + n) == (read_pos + nchars_avail));
92	+ if (nchars_avail < 2)
93	+ {
94	+ if (*n > MIN_CHUNK)
95	+ n = 2;
96	+ else
97	+ *n += MIN_CHUNK;
98	+
99	+ nchars_avail = n + lineptr - read_pos;
100	+ lineptr = realloc (lineptr, *n);
101	+ if (!*lineptr)
102	+ {
103	+ errno = ENOMEM;
104	+ return -1;
105	+ }
106	+ read_pos = n - nchars_avail + lineptr;
107	+ assert((lineptr + n) == (read_pos + nchars_avail));
108	+ }
109	+
110	+ if (ferror (stream))
111	+ {
112	+ /* Might like to return partial line, but there is no
113	+ place for us to store errno. And we don't want to just
114	+ lose errno. */
115	+ errno = save_errno;
116	+ return -1;
117	+ }
118	+
119	+ if (c == EOF)
120	+ {
121	+ /* Return partial line, if any. */
122	+ if (read_pos == *lineptr)
123	+ return -1;
124	+ else
125	+ break;
126	+ }
127	+
128	+ *read_pos++ = c;
129	+ nchars_avail--;
130	+
131	+ if (c == terminator)
132	+ /* Return the line. */
133	+ break;
134	+ }
135	+
136	+ /* Done - NUL terminate and return the number of chars read. */
137	+ *read_pos = '\0';
138	+
139	+ ret = read_pos - (*lineptr + offset);
140	+ return ret;
141	+}
142	+
143	+int
144	+getline (lineptr, n, stream)
145	+ char **lineptr;
146	+ size_t *n;
147	+ FILE *stream;
148	+{
149	+ return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
150	+}
151	+
152	+/* getline.c */
153	+
154	# include <pthread.h>
155	# include <string.h>
156	# include "log_window.h"

Line 0 Link Here

(-)/home/makc/porting/ports/multimedia/gxine/files/patch-src__desktop_integration.c (+20 lines)
	1	--- ./src/desktop_integration.c.orig 2008-05-23 22:42:20.000000000 +0400
	2	+++ ./src/desktop_integration.c 2008-06-15 20:21:03.000000000 +0400
	3	@@ -123,6 +123,9 @@
	4
	5	gboolean gxine_vfs_init (void)
	6	{
	7	+#ifndef USE_INTEGRATION_WIZARD
	8	+ return gnome_vfs_available = 0;
	9	+#else
	10	void (*init_func) (void) = NULL;
	11
	12	if (gnome_vfs_available != -1)
	13	@@ -173,6 +176,7 @@
	14	#endif
	15
	16	return gnome_vfs_available = 1;
	17	+#endif
	18	}
	19
	20	/*