From root@ahze.net  Mon May  3 12:31:04 2004
Return-Path: <root@ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B4F0C16A4CE; Mon,  3 May 2004 12:31:04 -0700 (PDT)
Received: from ahze.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1D98C43D2D; Mon,  3 May 2004 12:31:04 -0700 (PDT)
	(envelope-from root@ahze.net)
Received: by ahze.ahze.net (Postfix, from userid 0)
	id 11A515C2B; Mon,  3 May 2004 15:31:46 -0400 (EDT)
Message-Id: <20040503193146.11A515C2B@ahze.ahze.net>
Date: Mon,  3 May 2004 15:31:46 -0400 (EDT)
From: michael johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nobutaka@FreeBSD.org
Subject: [PATCH] multimedia/libxine: [Add 2 new knobs (and fix plist for ppl with these)]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66220
>Category:       ports
>Synopsis:       [PATCH] multimedia/libxine: [Add 2 new knobs (and fix plist for ppl with these)]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    nobutaka
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 03 12:40:18 PDT 2004
>Closed-Date:    Wed May 12 10:01:38 PDT 2004
>Last-Modified:  Wed May 12 10:01:38 PDT 2004
>Originator:     michael johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #45: Mon May  3 05:09:04 EDT
>Description:
- Add knob to support libtheora and libcaca

I ran  pkg_delete libxine and found xineplug_decode_theora.so and xineplug_vo_out_caca.so, they are autodetected in libxine configure script and will be built and installed if you have libtheora or libcaca installed.
So this will fix the plist for people who have libtheora or libcaca installed.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- libxine-1.0.r3_5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/libxine/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile	11 Apr 2004 15:56:04 -0000	1.59
+++ Makefile	3 May 2004 19:24:22 -0000
@@ -75,6 +75,15 @@
 PLIST_SUB+=	HAVE_ARTS="@comment "
 .endif
 
+.if exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA)
+BUILD_DEPENDS+=	caca-config:${PORTSDIR}/graphics/libcaca
+RUN_DEPENDS+=	caca-config:${PORTSDIR}/graphics/libcaca
+PLIST_SUB+=	WITH_LIBCACA=""
+.else
+CONFIGURE_ARGS+=
+PLIST_SUB+=	WITH_LIBCACA="@comment "
+.endif
+
 .if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
 USE_GNOME+=	esound
 PLIST_SUB+=	HAVE_ESOUND=""
@@ -102,6 +111,14 @@
 PLIST_SUB+=	XVMC="@comment "
 .endif
 
+.if exists(${LOCALBASE}/lib/libtheora.so.0) || defined (WITH_LIBTHEORA)
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/graphics/libtheora
+PLIST_SUB+=	WITH_LIBTHEORA=""
+.else
+CONFIGURE_ARGS+=--disable-theoratest
+PLIST_SUB+=	WITH_LIBTHEORA="@comment "
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can enable some features by defining following variables."
@@ -111,11 +128,21 @@
 .else
 	@${ECHO_MSG} "===> WITH_ARTS   (arts support, enabled)"
 .endif
+.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_LIBCACA)
+	@${ECHO_MSG} "===> WITH_LIBCACA (libcaca support)"
+.else
+	@${ECHO_MSG} "===> WITH_LIBCACA (libcaca support, enabled)"
+.endif
 .if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND)
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
 .else
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
 .endif
+.if !exists(${LOCALBASE}/lib/libtheora.so.0) && !defined(WITH_LIBTHEORA)
+	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support)"
+.else
+	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support enabled)"
+.endif
 	@${ECHO_MSG} "===>"
 
 post-patch:
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/libxine/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist	11 Apr 2004 15:56:04 -0000	1.25
+++ pkg-plist	3 May 2004 19:24:38 -0000
@@ -71,6 +71,8 @@
 lib/xine/plugins/1.0.0/xineplug_decode_spu.so
 lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
 lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
+%%WITH_LIBTHEORA%%lib/xine/plugins/1.0.0/xineplug_decode_theora.so
+%%WITH_LIBCACA%%lib/xine/plugins/1.0.0/xineplug_vo_out_caca.so
 lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so
 lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so
 lib/xine/plugins/1.0.0/xineplug_decode_yuv.so
--- libxine-1.0.r3_5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nobutaka 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon May 3 12:45:35 PDT 2004 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66220 
State-Changed-From-To: open->closed 
State-Changed-By: nobutaka 
State-Changed-When: Wed May 12 10:01:17 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66220 
>Unformatted:
