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: ports/66220: [PATCH] multimedia/libxine: [Add 2 new knobs (and fix plist for ppl with these)] Message-ID: <20040503193146.11A515C2B@ahze.ahze.net> Resent-Message-ID: <200405031940.i43JeJNn048081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 03 12:40:18 PDT 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040503193146.11A515C2B>