From b7c4b4c97cc58e16a27b8f216e81b6ae7abd48ea Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 13 Feb 2001 21:45:06 +0000 Subject: Update "fxtv" package to version 1.03. Changes since version 1.02: - When MPEG-encoding audio, force 16-bit signed intermediate AIFFs -- PCM driver doesn't support this format for some cards like AWE32 (Andre Albsmeier ) - Added METEOR_INPUT_DEV3 support (GUI & Fxtv.defaultInput = "dev3") - Flip channel (to last channel set) feature with TVFlipStation() X action routine (Steve Reid ) - Add SOUND_MIXER_VIDEO audio input (Mike Myer) - Mouse include patch (Anonymous) - Makefile update for LOCALBASE (Alexander Langer ) - NetBSD updates (Thomas Klausner ) ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/graphics/fxtv/README.html - Added 'line1', 'line2', 'line3' as valid mixerChannel values - Uncomment all remote code for NetBSD folks - Remove double-link of libvideo.a from Makefile - Support for france channelset (Daniel Dagneaux ) - Changed -aspectlock to -noaspectlock - Fix -default csvideo not working (greedy strstr matches wrong input) - Remove stray printf in YUV capture - Fixes for capturing when path doesn't contain a dot, and pcm driver sound format limitation work-around (Andre Albsmeier ) - OpenBSD changes from vedge and Matthew McNaughton --- graphics/fxtv/Makefile | 4 +-- graphics/fxtv/files/md5 | 4 +-- graphics/fxtv/files/patch-sum | 13 +++----- graphics/fxtv/patches/patch-aa | 76 +++++++++++++++--------------------------- graphics/fxtv/patches/patch-ab | 24 ++++++------- graphics/fxtv/patches/patch-ac | 28 ++++++++-------- graphics/fxtv/patches/patch-ad | 54 ------------------------------ graphics/fxtv/patches/patch-ae | 14 -------- graphics/fxtv/patches/patch-af | 13 -------- graphics/fxtv/patches/patch-ag | 13 -------- graphics/fxtv/patches/patch-ah | 13 -------- 11 files changed, 61 insertions(+), 195 deletions(-) delete mode 100644 graphics/fxtv/patches/patch-ad delete mode 100644 graphics/fxtv/patches/patch-ae delete mode 100644 graphics/fxtv/patches/patch-af delete mode 100644 graphics/fxtv/patches/patch-ag delete mode 100644 graphics/fxtv/patches/patch-ah (limited to 'graphics/fxtv') diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 8d4ec1a4954..97f14d1317a 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2000/09/09 14:44:41 veego Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/13 21:45:06 tron Exp $ -DISTNAME= fxtv-1.02 +DISTNAME= fxtv-1.03 CATEGORIES= graphics MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tgz diff --git a/graphics/fxtv/files/md5 b/graphics/fxtv/files/md5 index 5812ef4d001..4e46cf90cee 100644 --- a/graphics/fxtv/files/md5 +++ b/graphics/fxtv/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $ +$NetBSD: md5,v 1.2 2001/02/13 21:45:07 tron Exp $ -MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573 +MD5 (fxtv-1.03.tgz) = 2497c0eba13b475d2ca5abf362ffa52b diff --git a/graphics/fxtv/files/patch-sum b/graphics/fxtv/files/patch-sum index aa730442c6d..2678e53b065 100644 --- a/graphics/fxtv/files/patch-sum +++ b/graphics/fxtv/files/patch-sum @@ -1,10 +1,5 @@ -$NetBSD: patch-sum,v 1.5 2000/09/09 15:16:59 veego Exp $ +$NetBSD: patch-sum,v 1.6 2001/02/13 21:45:07 tron Exp $ -MD5 (patch-aa) = b6244cec2cc1f4dc60ab2bbc5428322d -MD5 (patch-ab) = 344e3f1b8655461063e2c3a4aafdd01b -MD5 (patch-ac) = 6f73993eaa9e760d9a196c27a448fa46 -MD5 (patch-ad) = 2c311f3dfb54afc9bda39cea94af6928 -MD5 (patch-ae) = 5d4b1486c91623810bae63bf44b3ac1f -MD5 (patch-af) = 0bfe002618384f2951b85860fc36d6d1 -MD5 (patch-ag) = f037a611e73b7b0f839b2f25603c4f2a -MD5 (patch-ah) = fcf45486c0777f742d39fa327b4d9330 +MD5 (patch-aa) = 7549ee363a0013d91d3c913581a026ef +MD5 (patch-ab) = 5d22d3e8eb7fb13c85195e7f81a670e0 +MD5 (patch-ac) = 5ec2ba94ef44c7a129fa1c1aa08ca836 diff --git a/graphics/fxtv/patches/patch-aa b/graphics/fxtv/patches/patch-aa index 423d83ccf00..f186155bda7 100644 --- a/graphics/fxtv/patches/patch-aa +++ b/graphics/fxtv/patches/patch-aa @@ -1,58 +1,36 @@ -$NetBSD: patch-aa,v 1.2 2000/08/23 21:27:59 veego Exp $ +$NetBSD: patch-aa,v 1.3 2001/02/13 21:45:07 tron Exp $ ---- Makefile Fri Nov 5 01:43:51 1999 -+++ Makefile Wed Aug 23 23:10:41 2000 -@@ -3,7 +3,6 @@ - # - - HAVE_XFREE86 = YES --X11BASE = /usr/X11R6 - DEBUG = NO - OS = $(shell uname -s) - OS_MAJOR = $(shell uname -r | cut -f1 -d\.) -@@ -11,8 +10,8 @@ - override CF_VERS = -DVERS_STR=\"1.02\" - override VIDEOLIB_DIR = ./videolib - override INC = -I$(X11BASE)/include -I/usr/local/include \ -- -I$(VIDEOLIB_DIR) -I. --override LIBDIRS = $(X11BASE)/lib /usr/local/lib -+ -I$(VIDEOLIB_DIR) -I. -I/usr/pkg/include -+override LIBDIRS = $(X11BASE)/lib /usr/local/lib /usr/pkg/lib +--- Makefile.orig Mon Feb 12 23:08:59 2001 ++++ Makefile Tue Feb 13 22:42:19 2001 +@@ -24,15 +24,6 @@ override SHELL = /bin/sh # -@@ -53,7 +52,7 @@ - override CFLAGS += -DHAVE_XFREE86 +-# NetBSD stuff +-# +-ifeq ($(OS),NetBSD) +- override INC += -I/usr/pkg/include +- override LIBDIRS += /usr/pkg/lib +- override LD_INC += -lossaudio -lz +-endif +- +-# + # OpenBSD stuff + # + ifeq ($(OS),OpenBSD) +@@ -71,6 +62,15 @@ endif --override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASE)\" -+override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11PREFIX)\" + override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\" ++ ++# ++# NetBSD stuff ++# ++ifeq ($(OS),NetBSD) ++ override INC += -I$(LOCALBASE)/include ++ override LIBDIRS += $(LOCALBASE)/lib ++ override LD_INC += -lossaudio -lz ++endif ifeq ($(OS), linux) override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE -@@ -74,7 +73,7 @@ - override LDFLAGS := -g $(LDFLAGS) - endif - --override FXTV_LIBDIR = $(X11BASE)/lib/X11/fxtv -+override FXTV_LIBDIR = $(X11PREFIX)/lib/X11/fxtv - - override CSRC = $(wildcard *.c) - override PIXMAPS = $(wildcard bitmaps/*.x?m) -@@ -102,11 +101,11 @@ - mkdir -p $(FXTV_LIBDIR)/bitmaps - install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps - install -c -m 444 -o root README $(FXTV_LIBDIR) -- mkdir -p $(X11BASE)/lib/X11/app-defaults -- install -c -m 444 -o root Fxtv $(X11BASE)/lib/X11/app-defaults -- mkdir -p $(X11BASE)/bin -- install -c -m 444 -o root fxtv.1 $(X11BASE)/man/man1/fxtv.1 -- install -c -m 555 -o root fxtv $(X11BASE)/bin -+ mkdir -p $(X11PREFIX)/lib/X11/app-defaults -+ install -c -m 444 -o root Fxtv $(X11PREFIX)/lib/X11/app-defaults -+ mkdir -p $(X11PREFIX)/bin -+ install -c -m 444 -o root fxtv.1 $(X11PREFIX)/man/man1/fxtv.1 -+ install -c -m 555 -o root fxtv $(X11PREFIX)/bin - install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR) - - clean: diff --git a/graphics/fxtv/patches/patch-ab b/graphics/fxtv/patches/patch-ab index 6f28fb5e773..289dd9e9a39 100644 --- a/graphics/fxtv/patches/patch-ab +++ b/graphics/fxtv/patches/patch-ab @@ -1,14 +1,12 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $ +$NetBSD: patch-ab,v 1.2 2001/02/13 21:45:07 tron Exp $ ---- haup_remote.c.orig Fri Nov 5 01:13:17 1999 -+++ haup_remote.c Sun May 7 22:28:36 2000 -@@ -37,8 +37,7 @@ - #include - #include - #ifdef __NetBSD__ --# include --# include -+# include - #else - # include - # include +--- pixelview_remote.c.orig Sun May 21 17:10:09 2000 ++++ pixelview_remote.c Tue Feb 13 22:39:48 2001 +@@ -32,6 +32,7 @@ + * + */ + ++#include + #include + #include + #include diff --git a/graphics/fxtv/patches/patch-ac b/graphics/fxtv/patches/patch-ac index e3aca296921..812153220b2 100644 --- a/graphics/fxtv/patches/patch-ac +++ b/graphics/fxtv/patches/patch-ac @@ -1,14 +1,16 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $ +$NetBSD: patch-ac,v 1.2 2001/02/13 21:45:07 tron Exp $ ---- pixelview_remote.c.orig Wed Nov 3 10:55:44 1999 -+++ pixelview_remote.c Sun May 7 22:28:36 2000 -@@ -38,8 +38,7 @@ - #include - #include - #ifdef __NetBSD__ --# include --# include -+# include - #else - # include - # include +--- tvaudio.c.orig Mon Feb 12 15:56:29 2001 ++++ tvaudio.c Tue Feb 13 22:39:48 2001 +@@ -107,7 +107,11 @@ + #ifdef SOUND_MIXER_VIDEO + else if ( STREQ( buf, "VIDEO" ) ) { + Mixer_dev_id = SOUND_MIXER_VIDEO; ++#ifdef __NetBSD__ ++ Mixer_dev_mask = 1 << SOUND_MIXER_VIDEO; ++#else + Mixer_dev_mask = SOUND_MASK_VIDEO; ++#endif + Mixer_dev_name = "VIDEO"; + } + #endif diff --git a/graphics/fxtv/patches/patch-ad b/graphics/fxtv/patches/patch-ad deleted file mode 100644 index 9a13b2a8dd6..00000000000 --- a/graphics/fxtv/patches/patch-ad +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2000/05/09 22:07:17 tron Exp $ - ---- remote.c.orig Tue May 9 22:02:55 2000 -+++ remote.c Tue May 9 22:03:18 2000 -@@ -55,8 +55,6 @@ - - /* ******************** Local defines ************** */ - --#ifndef __NetBSD__ -- - /* FIXME: Remove this old code someday */ - #ifdef 0 - # define OLD_DEV_SYSMOUSE_STUFF -@@ -579,8 +577,6 @@ - Remote_fd = -1; - } - --#endif /* !__NetBSD__ */ -- - - /**@BEGINFUNC************************************************************** - -@@ -609,7 +605,6 @@ - void TVX10REMOTEOpen( XtAppContext app_ctx, - TVREMOTE_CB_FUNCT *cb ) - { --#ifndef __NetBSD__ - int fd, - flags; - #ifdef OLD_DEV_SYSMOUSE_STUFF -@@ -704,7 +699,6 @@ - - /* Arrange to get called when we exit the app */ - atexit( TVX10REMOTEClose ); --#endif /* !__NetBSD__ */ - } - - -@@ -733,7 +727,6 @@ - - void TVX10REMOTEFlush( void ) - { --#ifndef __NetBSD__ - unsigned char btn; - - /* Do nothing if we didn't open the remote */ -@@ -748,7 +741,6 @@ - break; - RMPRINTF(( "TVX10REMOTE: Flushing buffer (key = %d)\n", btn )); - } --#endif /* !__NetBSD__ */ - } - - diff --git a/graphics/fxtv/patches/patch-ae b/graphics/fxtv/patches/patch-ae deleted file mode 100644 index d19713d9d65..00000000000 --- a/graphics/fxtv/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $ - ---- tvcapture.c.orig Sat Oct 16 22:48:29 1999 -+++ tvcapture.c Sun May 7 22:28:36 2000 -@@ -36,8 +36,7 @@ - #include - #include - #ifdef __NetBSD__ --# include --# include -+# include - #else - # include - #endif diff --git a/graphics/fxtv/patches/patch-af b/graphics/fxtv/patches/patch-af deleted file mode 100644 index 0ae7b2ec803..00000000000 --- a/graphics/fxtv/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $ - ---- tvcapture.h.orig Sat Sep 4 21:22:19 1999 -+++ tvcapture.h Sun May 7 22:28:36 2000 -@@ -33,7 +33,7 @@ - - #include - #ifdef __NetBSD__ --# include -+# include - #else - # include - #endif diff --git a/graphics/fxtv/patches/patch-ag b/graphics/fxtv/patches/patch-ag deleted file mode 100644 index d6d6c063be6..00000000000 --- a/graphics/fxtv/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/09/09 02:33:48 wiz Exp $ - ---- Fxtv.orig Fri Nov 5 00:43:39 1999 -+++ Fxtv -@@ -151,7 +151,7 @@ - !! after this point in your local app-default file. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - --Fxtv*title: FreeBSD TV -+Fxtv*title: BSD TV - Fxtv*iconName: FXTV - - ! Menubar appearance diff --git a/graphics/fxtv/patches/patch-ah b/graphics/fxtv/patches/patch-ah deleted file mode 100644 index 471711153eb..00000000000 --- a/graphics/fxtv/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/09/09 15:17:00 veego Exp $ - ---- app_rsrc.h Fri Nov 5 00:46:50 1999 -+++ app_rsrc.h Sat Sep 9 16:45:40 2000 -@@ -412,7 +412,7 @@ - - { RNvideoCnvtScript, RCvideoCnvtScript, XtRString, sizeof(String), - XtOffsetOf(AppResources, video_cnvt_script ), XtRImmediate, -- "/usr/X11R6/lib/X11/fxtv/fxtv_cnvt.sh" }, -+ X11BASE "/lib/X11/fxtv/fxtv_cnvt.sh" }, - - { RNbswap2Bpp, RCswap, XtRBoolean, sizeof(Boolean), - XtOffsetOf(AppResources, bswap2Bpp), XtRImmediate, -- cgit v1.2.3