diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index 7c5538e36198..1704a23a458c 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -1,55 +1,55 @@ # New ports collection makefile for: xawtv # Date created: 03 March 2001 # Whom: George Reid # # $FreeBSD$ # PORTNAME= xawtv -PORTVERSION= 3.78 +PORTVERSION= 3.79 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lehmann@ans-netz.de LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes USE_REINPLACE= yes FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \ propwatch.1 radio.1 record.1 rootv.1 scantv.1 showriff.1 \ streamer.1 subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 \ xawtv.1 MAN5= xawtvrc.5 MAN8= v4l-conf.8 .include .if ${XFREE86_VERSION} == 4 BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients .endif PLIST_SUB+= X11PREFIX=${X11BASE} post-patch: ${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure .for i in ${FILES_LIBJPEG} ${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor .include diff --git a/graphics/xawtv/distinfo b/graphics/xawtv/distinfo index 5eb20ca2a768..9fc6d01b2c0b 100644 --- a/graphics/xawtv/distinfo +++ b/graphics/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e +MD5 (xawtv_3.79.tar.gz) = 351caf310fd7b9328c2c422304f56d6d diff --git a/graphics/xawtv/files/patch-Makefile.in b/graphics/xawtv/files/patch-Makefile.in index eb9b2e03aeaa..53ca4faf5118 100644 --- a/graphics/xawtv/files/patch-Makefile.in +++ b/graphics/xawtv/files/patch-Makefile.in @@ -1,20 +1,33 @@ ---- Makefile.in.orig Mon Sep 9 16:05:39 2002 -+++ Makefile.in Wed Oct 30 20:54:40 2002 -@@ -62,15 +62,7 @@ - FOUND_ZVBI := @FOUND_ZVBI@ +--- Makefile.in.orig Thu Nov 14 17:07:24 2002 ++++ Makefile.in Tue Nov 19 23:59:02 2002 +@@ -65,20 +65,9 @@ + USE_MMX := @USE_MMX@ # build final cflags -CFLAGS := @CFLAGS@ -CFLAGS += $(WARN_FLAGS) -CFLAGS += $(LFS_FLAGS) -CFLAGS += $(X11_FLAGS) -CFLAGS += $(LIB_FLAGS) -CFLAGS += -DCONFIGFILE='"$(config)"' -CFLAGS += -DLIBDIR='"$(libdir)"' +-CFLAGS += -DDATADIR='"$(datadir)"' -CFLAGS += -DVERSION='"$(VERSION)"' --CXXFLAGS = $(CFLAGS) -+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC -+CXXFLAGS += $(CFLAGS) ++CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC + CXXFLAGS = $(CFLAGS) - # shared objects need -fPIC +-# shared objects need -fPIC -%.so : CFLAGS += -fPIC +- + # libraries + LDLIBS := @LDLIBS@ + +@@ -131,7 +120,7 @@ + ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@ + + # non-verbose output +-VERBOSE = no ++VERBOSE = yes + ifeq ($(VERBOSE),yes) + echo_compile_c = echo $(compile_c) + echo_compile_cc = echo $(compile_cc) diff --git a/graphics/xawtv/files/patch-console::showqt.c b/graphics/xawtv/files/patch-console::showqt.c new file mode 100644 index 000000000000..970608babebe --- /dev/null +++ b/graphics/xawtv/files/patch-console::showqt.c @@ -0,0 +1,18 @@ +--- console/showqt.c.orig Tue Nov 19 23:49:53 2002 ++++ console/showqt.c Tue Nov 19 23:57:26 2002 +@@ -11,6 +11,15 @@ + #include + #include + ++#if !defined(PRId64) ++#define PRId64 "lld" ++#endif ++ ++#if !defined(PRIx64) ++#define PRIx64 "llX" ++#endif ++ ++ + #if BYTE_ORDER == LITTLE_ENDIAN + # define SWAP2(x) (((x>>8) & 0x00ff) |\ + ((x<<8) & 0xff00)) diff --git a/graphics/xawtv/pkg-plist b/graphics/xawtv/pkg-plist index 3f24b5f19f2a..57af63038b35 100644 --- a/graphics/xawtv/pkg-plist +++ b/graphics/xawtv/pkg-plist @@ -1,52 +1,81 @@ bin/dump-mixers bin/motv bin/ntsc-cc bin/pia bin/propwatch bin/record bin/rootv bin/showqt bin/showriff bin/streamer bin/subtitles bin/ttv bin/v4lctl bin/webcam bin/xawtv bin/xawtv-remote +lib/xawtv/bilinear.so lib/xawtv/conv-mjpeg.so +lib/xawtv/cubic.so lib/xawtv/drv0-bsd.so lib/xawtv/flt-disor.so lib/xawtv/flt-gamma.so lib/xawtv/flt-invert.so lib/xawtv/flt-smooth.so +lib/xawtv/linear-blend.so +lib/xawtv/linedoubler.so lib/xawtv/read-avi.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so @dirrm lib/xawtv man/es/man1/fbtv.1 man/es/man1/rootv.1 man/es/man1/scantv.1 man/es/man1/streamer.1 man/es/man1/subtitles.1 man/es/man1/ttv.1 man/es/man1/v4lctl.1 man/es/man1/xawtv-remote.1 man/es/man1/xawtv.1 man/es/man5/xawtvrc.5 man/es/man8/v4l-conf.8 man/fr/man1/xawtv.1 @dirrm man/fr/man1 @dirrm man/fr @dirrm man/es/man8 @dirrm man/es/man5 @dirrm man/es/man1 @dirrm man/es +share/xawtv/Index.map +share/xawtv/argentina.list +share/xawtv/ccir-h.list +share/xawtv/ccir-i-iii.list +share/xawtv/ccir-sl-sh.list +share/xawtv/europe-east.list +share/xawtv/europe-west.list +share/xawtv/ntsc-bcast-jp.list +share/xawtv/ntsc-bcast.list +share/xawtv/ntsc-cable-ca.list +share/xawtv/ntsc-cable-jp.list +share/xawtv/ntsc-cable.list +share/xawtv/ntsc-hrc.list +share/xawtv/oirt-i-iii.list +share/xawtv/oirt-sl-sh.list +share/xawtv/pal-australia-optus.list +share/xawtv/pal-australia.list +share/xawtv/pal-bcast-cn.list +share/xawtv/pal-bcast-za.list +share/xawtv/pal-ireland.list +share/xawtv/pal-italy.list +share/xawtv/pal-newzealand.list +share/xawtv/secam-france.list +share/xawtv/uhf.list +@dirrm share/xawtv @cwd %%X11BASE%% lib/X11/app-defaults/MoTV lib/X11/de/app-defaults/MoTV lib/X11/it/app-defaults/MoTV @dirrm lib/X11/it/app-defaults @dirrm lib/X11/it @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 7c5538e36198..1704a23a458c 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -1,55 +1,55 @@ # New ports collection makefile for: xawtv # Date created: 03 March 2001 # Whom: George Reid # # $FreeBSD$ # PORTNAME= xawtv -PORTVERSION= 3.78 +PORTVERSION= 3.79 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lehmann@ans-netz.de LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes USE_REINPLACE= yes FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \ propwatch.1 radio.1 record.1 rootv.1 scantv.1 showriff.1 \ streamer.1 subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 \ xawtv.1 MAN5= xawtvrc.5 MAN8= v4l-conf.8 .include .if ${XFREE86_VERSION} == 4 BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients .endif PLIST_SUB+= X11PREFIX=${X11BASE} post-patch: ${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure .for i in ${FILES_LIBJPEG} ${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor .include diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index 5eb20ca2a768..9fc6d01b2c0b 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e +MD5 (xawtv_3.79.tar.gz) = 351caf310fd7b9328c2c422304f56d6d diff --git a/multimedia/xawtv/files/patch-Makefile.in b/multimedia/xawtv/files/patch-Makefile.in index eb9b2e03aeaa..53ca4faf5118 100644 --- a/multimedia/xawtv/files/patch-Makefile.in +++ b/multimedia/xawtv/files/patch-Makefile.in @@ -1,20 +1,33 @@ ---- Makefile.in.orig Mon Sep 9 16:05:39 2002 -+++ Makefile.in Wed Oct 30 20:54:40 2002 -@@ -62,15 +62,7 @@ - FOUND_ZVBI := @FOUND_ZVBI@ +--- Makefile.in.orig Thu Nov 14 17:07:24 2002 ++++ Makefile.in Tue Nov 19 23:59:02 2002 +@@ -65,20 +65,9 @@ + USE_MMX := @USE_MMX@ # build final cflags -CFLAGS := @CFLAGS@ -CFLAGS += $(WARN_FLAGS) -CFLAGS += $(LFS_FLAGS) -CFLAGS += $(X11_FLAGS) -CFLAGS += $(LIB_FLAGS) -CFLAGS += -DCONFIGFILE='"$(config)"' -CFLAGS += -DLIBDIR='"$(libdir)"' +-CFLAGS += -DDATADIR='"$(datadir)"' -CFLAGS += -DVERSION='"$(VERSION)"' --CXXFLAGS = $(CFLAGS) -+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC -+CXXFLAGS += $(CFLAGS) ++CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC + CXXFLAGS = $(CFLAGS) - # shared objects need -fPIC +-# shared objects need -fPIC -%.so : CFLAGS += -fPIC +- + # libraries + LDLIBS := @LDLIBS@ + +@@ -131,7 +120,7 @@ + ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@ + + # non-verbose output +-VERBOSE = no ++VERBOSE = yes + ifeq ($(VERBOSE),yes) + echo_compile_c = echo $(compile_c) + echo_compile_cc = echo $(compile_cc) diff --git a/multimedia/xawtv/files/patch-console::showqt.c b/multimedia/xawtv/files/patch-console::showqt.c new file mode 100644 index 000000000000..970608babebe --- /dev/null +++ b/multimedia/xawtv/files/patch-console::showqt.c @@ -0,0 +1,18 @@ +--- console/showqt.c.orig Tue Nov 19 23:49:53 2002 ++++ console/showqt.c Tue Nov 19 23:57:26 2002 +@@ -11,6 +11,15 @@ + #include + #include + ++#if !defined(PRId64) ++#define PRId64 "lld" ++#endif ++ ++#if !defined(PRIx64) ++#define PRIx64 "llX" ++#endif ++ ++ + #if BYTE_ORDER == LITTLE_ENDIAN + # define SWAP2(x) (((x>>8) & 0x00ff) |\ + ((x<<8) & 0xff00)) diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index 3f24b5f19f2a..57af63038b35 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -1,52 +1,81 @@ bin/dump-mixers bin/motv bin/ntsc-cc bin/pia bin/propwatch bin/record bin/rootv bin/showqt bin/showriff bin/streamer bin/subtitles bin/ttv bin/v4lctl bin/webcam bin/xawtv bin/xawtv-remote +lib/xawtv/bilinear.so lib/xawtv/conv-mjpeg.so +lib/xawtv/cubic.so lib/xawtv/drv0-bsd.so lib/xawtv/flt-disor.so lib/xawtv/flt-gamma.so lib/xawtv/flt-invert.so lib/xawtv/flt-smooth.so +lib/xawtv/linear-blend.so +lib/xawtv/linedoubler.so lib/xawtv/read-avi.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so @dirrm lib/xawtv man/es/man1/fbtv.1 man/es/man1/rootv.1 man/es/man1/scantv.1 man/es/man1/streamer.1 man/es/man1/subtitles.1 man/es/man1/ttv.1 man/es/man1/v4lctl.1 man/es/man1/xawtv-remote.1 man/es/man1/xawtv.1 man/es/man5/xawtvrc.5 man/es/man8/v4l-conf.8 man/fr/man1/xawtv.1 @dirrm man/fr/man1 @dirrm man/fr @dirrm man/es/man8 @dirrm man/es/man5 @dirrm man/es/man1 @dirrm man/es +share/xawtv/Index.map +share/xawtv/argentina.list +share/xawtv/ccir-h.list +share/xawtv/ccir-i-iii.list +share/xawtv/ccir-sl-sh.list +share/xawtv/europe-east.list +share/xawtv/europe-west.list +share/xawtv/ntsc-bcast-jp.list +share/xawtv/ntsc-bcast.list +share/xawtv/ntsc-cable-ca.list +share/xawtv/ntsc-cable-jp.list +share/xawtv/ntsc-cable.list +share/xawtv/ntsc-hrc.list +share/xawtv/oirt-i-iii.list +share/xawtv/oirt-sl-sh.list +share/xawtv/pal-australia-optus.list +share/xawtv/pal-australia.list +share/xawtv/pal-bcast-cn.list +share/xawtv/pal-bcast-za.list +share/xawtv/pal-ireland.list +share/xawtv/pal-italy.list +share/xawtv/pal-newzealand.list +share/xawtv/secam-france.list +share/xawtv/uhf.list +@dirrm share/xawtv @cwd %%X11BASE%% lib/X11/app-defaults/MoTV lib/X11/de/app-defaults/MoTV lib/X11/it/app-defaults/MoTV @dirrm lib/X11/it/app-defaults @dirrm lib/X11/it @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de