Date: Thu, 13 Feb 2003 17:29:54 +0100 (CET) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/48252: update-port: graphics/xawtv Message-ID: <200302131629.h1DGTsAp049538@kartoffel.salatschuessel.net>
next in thread | raw e-mail | index | archive | help
>Number: 48252 >Category: ports >Synopsis: update-port: graphics/xawtv >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: Thu Feb 13 08:40:06 PST 2003 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Wed Feb 5 13:06:15 CET 2003 olivleh1@kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/KARTOFFEL i386 >Description: 3.83 -> 3.85 add some new knobs new file: files/patch-libng::contrib-plugins::Subdir.mk >How-To-Repeat: >Fix: --- xawtv.patch begins here --- diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile --- xawtv.old/Makefile Thu Feb 13 14:48:25 2003 +++ /usr/ports/graphics/xawtv/Makefile Thu Feb 13 17:26:37 2003 @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.83 +PORTVERSION= 3.85 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -26,7 +26,7 @@ USE_XPM= yes USE_X_PREFIX= yes USE_REINPLACE= yes - +CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" MAKE_ENV= verbose=yes FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk @@ -40,11 +40,44 @@ .include <bsd.port.pre.mk> +.if defined(WITH_LIBDV) +LIB_DEPENDS+= dv.3:${PORTSDIR}/multimedia/libdv +CONFIGURE_ARGS+=--enable-dv +PLIST_SUB+= DV= +.else +CONFIGURE_ARGS+=--enable-dv=no +PLIST_SUB+= DV="@comment " +.endif + +.if defined(WITH_MMX) +CONFIGURE_ARGS+=--enable-mmx +CFLAGS+= -DMMX=1 +.endif + +.if defined(WITH_LIBQTIME) +CONFIGURE_ARGS+=--enable-quicktime +LIB_DEPENDS+= quicktime.0:${PORTSDIR}/graphics/libquicktime +PLIST_SUB+= QT= +.else +CONFIGURE_ARGS+=--enable-quicktime=no +PLIST_SUB+= QT="@comment " +.endif + PLIST_SUB+= X11PREFIX=${X11BASE} -post-patch: +pre-everything:: + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @${ECHO} " WITH_LIBDV=yes Enable reading/writing raw dv files" + @${ECHO} " WITH_LIBQTIME=yes Enable quicktime support" + @${ECHO} " WITH_MMX=yes Enable mmx support" + @${ECHO} "" + +lpost-patch: @${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ - -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure + -e "s|/usr/local|${LOCALBASE}|g" \ + -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure .for i in ${FILES_LIBJPEG} @${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo --- xawtv.old/distinfo Thu Feb 13 14:48:25 2003 +++ /usr/ports/graphics/xawtv/distinfo Thu Feb 13 14:54:26 2003 @@ -1 +1 @@ -MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b +MD5 (xawtv_3.85.tar.gz) = 7ef19068bbc27b3a8e0b92a3d7ab437f diff -ruN xawtv.old/files/patch-configure /usr/ports/graphics/xawtv/files/patch-configure --- xawtv.old/files/patch-configure Thu Feb 13 14:48:25 2003 +++ /usr/ports/graphics/xawtv/files/patch-configure Thu Feb 13 16:58:35 2003 @@ -1,6 +1,42 @@ ---- configure.orig Wed Oct 30 12:26:42 2002 -+++ configure Wed Oct 30 20:59:10 2002 -@@ -5749,9 +5749,6 @@ +--- configure.orig Fri Feb 7 12:02:43 2003 ++++ configure Thu Feb 13 16:57:29 2003 +@@ -5399,7 +5399,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldv -lm $LIBS" ++LIBS="-ldv -lm $LIBPTHREAD $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -5452,7 +5452,7 @@ + cat >>confdefs.h <<\_ACEOF + #define HAVE_DV 1 + _ACEOF +- FOUND_DV="yes"; LIBDV="-ldv -lm" ++ FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS" + fi + + else +@@ -5466,7 +5466,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lquicktime -ldl -lglib $LIBPTHREAD $LIBS" ++LIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -5527,7 +5527,7 @@ + fi + QTLIBS="" + if test "$FOUND_LQT" = "yes"; then +- QTLIBS="-lquicktime -ldl -lglib -lm" ++ QTLIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS" + fi + + +@@ -6062,9 +6062,6 @@ echo "$as_me:$LINENO: checking for X11 config directory" >&5 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 x11conf=/usr/X11R6/lib/X11 @@ -10,7 +46,7 @@ echo "$as_me:$LINENO: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 -@@ -5759,9 +5756,6 @@ +@@ -6072,9 +6069,6 @@ echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6 resdir=/usr/X11R6/lib/X11 diff -ruN xawtv.old/files/patch-libng::contrib-plugins::Subdir.mk /usr/ports/graphics/xawtv/files/patch-libng::contrib-plugins::Subdir.mk --- xawtv.old/files/patch-libng::contrib-plugins::Subdir.mk Thu Jan 1 01:00:00 1970 +++ /usr/ports/graphics/xawtv/files/patch-libng::contrib-plugins::Subdir.mk Thu Feb 13 15:16:26 2003 @@ -0,0 +1,11 @@ +--- libng/contrib-plugins/Subdir.mk.orig Thu Feb 13 15:15:28 2003 ++++ libng/contrib-plugins/Subdir.mk Thu Feb 13 15:15:34 2003 +@@ -18,7 +18,7 @@ + + # linear-blend has mmx support ... + ifeq ($(USE_MMX),yes) +-libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1 ++#libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1 + endif + + # global targets diff -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist --- xawtv.old/pkg-plist Thu Feb 13 14:48:25 2003 +++ /usr/ports/graphics/xawtv/pkg-plist Thu Feb 13 17:03:06 2003 @@ -15,7 +15,7 @@ bin/xawtv bin/xawtv-remote lib/xawtv/bilinear.so -lib/xawtv/conv-audio.so +@comment lib/xawtv/conv-audio.so lib/xawtv/conv-mjpeg.so lib/xawtv/cubic.so lib/xawtv/drv0-bsd.so @@ -26,8 +26,12 @@ lib/xawtv/linear-blend.so lib/xawtv/linedoubler.so lib/xawtv/read-avi.so +%%DV%%lib/xawtv/read-dv.so +%%QT%%lib/xawtv/read-qt.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so +%%DV%%lib/xawtv/write-dv.so +%%QT%%lib/xawtv/write-qt.so @dirrm lib/xawtv man/es/man1/fbtv.1 man/es/man1/rootv.1 --- xawtv.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302131629.h1DGTsAp049538>