From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 15 16:50:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9635A1065690 for ; Sun, 15 Jun 2008 16:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7742F8FC0A for ; Sun, 15 Jun 2008 16:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5FGo2j5091618 for ; Sun, 15 Jun 2008 16:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5FGo2VF091617; Sun, 15 Jun 2008 16:50:02 GMT (envelope-from gnats) Resent-Date: Sun, 15 Jun 2008 16:50:02 GMT Resent-Message-Id: <200806151650.m5FGo2VF091617@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 262B01065674 for ; Sun, 15 Jun 2008 16:45:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 192088FC1A for ; Sun, 15 Jun 2008 16:45:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m5FGjCJZ072682 for ; Sun, 15 Jun 2008 16:45:12 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m5FGjCOX072681; Sun, 15 Jun 2008 16:45:12 GMT (envelope-from nobody) Message-Id: <200806151645.m5FGjCOX072681@www.freebsd.org> Date: Sun, 15 Jun 2008 16:45:12 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/124619: maintainer update: multimedia/gxine X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 16:50:02 -0000 >Number: 124619 >Category: ports >Synopsis: maintainer update: multimedia/gxine >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 15 16:50:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Sun Jun 8 18:13:48 MSD 2008 root@luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA i386 >Description: update to 0.5.903 add GNOME and XCB options >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/Makefile /home/makc/porting/ports/multimedia/gxine/Makefile --- /usr/ports/multimedia/gxine/Makefile 2008-06-06 17:48:07.000000000 +0400 +++ /home/makc/porting/ports/multimedia/gxine/Makefile 2008-06-15 20:39:09.000000000 +0400 @@ -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 @@ 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 @@ 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 @@ -41,6 +43,12 @@ 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 @@ 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 -ruN --exclude=CVS /usr/ports/multimedia/gxine/distinfo /home/makc/porting/ports/multimedia/gxine/distinfo --- /usr/ports/multimedia/gxine/distinfo 2008-04-22 12:48:27.000000000 +0400 +++ /home/makc/porting/ports/multimedia/gxine/distinfo 2008-06-15 18:51:19.000000000 +0400 @@ -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 -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src__console_output.c /home/makc/porting/ports/multimedia/gxine/files/patch-src__console_output.c --- /usr/ports/multimedia/gxine/files/patch-src__console_output.c 1970-01-01 03:00:00.000000000 +0300 +++ /home/makc/porting/ports/multimedia/gxine/files/patch-src__console_output.c 2008-06-15 18:51:19.000000000 +0400 @@ -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 ++#include ++#include ++ ++#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 + # include + # include "log_window.h" diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src__desktop_integration.c /home/makc/porting/ports/multimedia/gxine/files/patch-src__desktop_integration.c --- /usr/ports/multimedia/gxine/files/patch-src__desktop_integration.c 1970-01-01 03:00:00.000000000 +0300 +++ /home/makc/porting/ports/multimedia/gxine/files/patch-src__desktop_integration.c 2008-06-15 20:22:18.000000000 +0400 @@ -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 + } + + /* >Release-Note: >Audit-Trail: >Unformatted: