diff options
author | arved <arved@FreeBSD.org> | 2003-02-24 01:32:48 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2003-02-24 01:32:48 +0800 |
commit | cbaa61f0c29a17a68ea314b0780fdb00966d85ba (patch) | |
tree | 4adcb77fff5277049a2e52e9c7aa568700ddbf07 /multimedia/xawtv | |
parent | d294ff4ac8baa0ec2862b2f2b013862c8784f58d (diff) | |
download | freebsd-ports-graphics-cbaa61f0c29a17a68ea314b0780fdb00966d85ba.tar.gz freebsd-ports-graphics-cbaa61f0c29a17a68ea314b0780fdb00966d85ba.tar.zst freebsd-ports-graphics-cbaa61f0c29a17a68ea314b0780fdb00966d85ba.zip |
Update to 3.85
PR: 48252
Submitted by: Oliver Lehmann <lehmann@ans-netz.de>
Diffstat (limited to 'multimedia/xawtv')
-rw-r--r-- | multimedia/xawtv/Makefile | 39 | ||||
-rw-r--r-- | multimedia/xawtv/distinfo | 2 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-configure | 44 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk | 11 | ||||
-rw-r--r-- | multimedia/xawtv/pkg-plist | 6 |
5 files changed, 93 insertions, 9 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 123edae8983..1097ac5e7f8 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.83 +PORTVERSION= 3.85 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -27,7 +27,7 @@ USE_GMAKE= yes 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 @@ -41,11 +41,44 @@ MAN8= v4l-conf.8 .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} +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} "" + post-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 --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index 4bf23900ea2..291e65c423d 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b +MD5 (xawtv_3.85.tar.gz) = 7ef19068bbc27b3a8e0b92a3d7ab437f diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure index 6d9ef26b8a6..753531d831d 100644 --- a/multimedia/xawtv/files/patch-configure +++ b/multimedia/xawtv/files/patch-configure @@ -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 --git a/multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk b/multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk new file mode 100644 index 00000000000..999c06b9142 --- /dev/null +++ b/multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk @@ -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 --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index 5fc2697a72b..1bbb64547e3 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -15,7 +15,7 @@ bin/webcam 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/flt-smooth.so 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 |