From nobody@FreeBSD.org  Sat May 17 13:59:33 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D753D1065679
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 May 2008 13:59:33 +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 C48668FC1C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 May 2008 13:59:33 +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 m4HDwIDG058161
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 May 2008 13:58:18 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m4HDwI4G058160;
	Sat, 17 May 2008 13:58:18 GMT
	(envelope-from nobody)
Message-Id: <200805171358.m4HDwI4G058160@www.freebsd.org>
Date: Sat, 17 May 2008 13:58:18 GMT
From: Max Brazhnikov <makc@issp.ac.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: maintainer update: multimedia/subtitlecomposer
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         123763
>Category:       ports
>Synopsis:       maintainer update: multimedia/subtitlecomposer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 17 14:00:08 UTC 2008
>Closed-Date:    Mon May 19 06:03:19 UTC 2008
>Last-Modified:  Mon May 19 06:10:02 UTC 2008
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Apr 17 12:14:46 MSD 2008 makc@luna.dio.ru:/usr/obj/usr/src/sys/LUNA i386
>Description:
1) make MPlayer support optional
2) add GStreamer support
3) fix Xine support (required XCB support in libxine, see ports/123761)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/multimedia/subtitlecomposer/Makefile /home/makc/porting/ports/multimedia/subtitlecomposer/Makefile
--- /usr/ports/multimedia/subtitlecomposer/Makefile	2008-04-24 20:24:55.000000000 +0400
+++ /home/makc/porting/ports/multimedia/subtitlecomposer/Makefile	2008-05-17 17:42:33.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=subcomposer
@@ -14,23 +15,43 @@
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Subtitle editor for KDE
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gstreamer
+WANT_GSTREAMER=	yes
 INSTALLS_ICONS=	yes
 
-OPTIONS=	XINE "Enable Xine backend" off
+OPTIONS=	MPLAYER "Enable MPlayer backend (recommended)" on \
+		XINE "Enable Xine backend" off \
+		GSTREAMER "Enable GStreamer backend" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_MPLAYER)
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.endif
+
 .if defined(WITH_XINE)
-LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
+
+. if exists(${LOCALBASE}/bin/xine-config)
+XINE_PLUGINDIR!=	xine-config --plugindir
+. endif
+
+. if defined(XINE_PLUGINDIR) && !exists(${XINE_PLUGINDIR}/xineplug_vo_out_xcbxv.so)
+IGNORE=		needs XCB support in libxine
+. endif
+
+LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine \
+		xcb.1:${PORTSDIR}/x11/libxcb
 .else
-CONFIGURE_ARGS+=--without-xine
+CONFIGURE_ARGS+=--without-xine --without-xcb
+.endif
+
+.if defined(WITH_GSTREAMER)
+USE_GSTREAMER+=	yes
+.else
+CONFIGURE_ARGS=	--without-gstreamer
 .endif
 
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun May 18 07:27:00 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123763 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Mon May 19 06:03:18 UTC 2008 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123763 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123763: commit references a PR
Date: Mon, 19 May 2008 06:03:18 +0000 (UTC)

 rafan       2008-05-19 06:03:13 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/subtitlecomposer Makefile 
   Log:
   - Make mplayer support optional
   - Add gstreamer support
   - Fix xine support (requires xcb support in libxine)
   - Add missing USE_XORG
   - Bump PORTREVISION
   
   PR:             ports/123763
   Submitted by:   Max Brazhnikov <makc at issp.ac.ru> (maintainer)
   
   Revision  Changes    Path
   1.4       +28 -6     ports/multimedia/subtitlecomposer/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
