pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/fxtv Move fxtv to the new multimedia catego...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d021a3a78ff
branches:  trunk
changeset: 467069:0d021a3a78ff
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Jan 26 11:36:35 2004 +0000

description:
Move fxtv to the new multimedia category (coming from graphics).
This is version 1.03nb4.

diffstat:

 multimedia/fxtv/DESCR            |    4 +
 multimedia/fxtv/Makefile         |   53 +++++++
 multimedia/fxtv/PLIST            |   15 ++
 multimedia/fxtv/distinfo         |   23 +++
 multimedia/fxtv/patches/patch-aa |   61 +++++++++
 multimedia/fxtv/patches/patch-ab |   12 +
 multimedia/fxtv/patches/patch-ac |   16 ++
 multimedia/fxtv/patches/patch-ad |  261 +++++++++++++++++++++++++++++++++++++++
 multimedia/fxtv/patches/patch-ae |  119 +++++++++++++++++
 multimedia/fxtv/patches/patch-af |   13 +
 multimedia/fxtv/patches/patch-ag |   59 ++++++++
 multimedia/fxtv/patches/patch-ah |   12 +
 multimedia/fxtv/patches/patch-ai |   31 ++++
 multimedia/fxtv/patches/patch-aj |   38 +++++
 multimedia/fxtv/patches/patch-ak |   21 +++
 multimedia/fxtv/patches/patch-al |   20 ++
 multimedia/fxtv/patches/patch-ba |   51 +++++++
 multimedia/fxtv/patches/patch-bb |   12 +
 multimedia/fxtv/patches/patch-bc |   66 +++++++++
 multimedia/fxtv/patches/patch-bd |   21 +++
 multimedia/fxtv/patches/patch-be |   13 +
 multimedia/fxtv/patches/patch-bf |   70 ++++++++++
 multimedia/fxtv/patches/patch-bg |   14 ++
 23 files changed, 1005 insertions(+), 0 deletions(-)

diffs (truncated from 1097 to 300 lines):

diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/DESCR     Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,4 @@
+To use this application, you need a video capture/tuner card
+that's based on the Brooktree 848 capture chip, such as one of the
+Hauppauge Wincast/TV or Win/TV cards, the STV TV PCI card, or the
+Intel Smart Video Recorder III.
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/Makefile  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+
+DISTNAME=      fxtv-1.03
+PKGREVISION=   4
+CATEGORIES=    multimedia
+MASTER_SITES=  ${HOMEPAGE}
+EXTRACT_SUFX=  .tgz
+
+MAINTAINER=    tron%NetBSD.org@localhost
+HOMEPAGE=      http://people.freebsd.org/~rhh/fxtv/
+COMMENT=       TV display application for Brooktree 848 compatible TV cards
+
+#ONLY_FOR_PLATFORM=    NetBSD-1.[5-9]*-arm NetBSD-1.[5-9]*-arm32       \
+#                      NetBSD-1.[5-9]*-atari NetBSD-1.[5-9]*-i386
+
+USE_BUILDLINK2=        YES
+USE_X11BASE=   YES
+USE_GNU_TOOLS+=        make
+XAW_TYPE?=     3d
+
+.include "../../mk/bsd.prefs.mk"
+
+MAKE_ENV+=     X11PREFIX=${X11PREFIX}
+
+# The purpose of this check is to make sure that there is a "Xaw3d"
+# compatible widget set installed because normal "Xaw" won't work.
+#
+.if (${XAW_TYPE} == standard)
+XAW_TYPE=      3d
+.endif
+
+post-extract:
+       @${RM} -f ${WRKSRC}/videolib/videolib.o
+
+pre-configure:
+       cd ${WRKSRC}; for file in app_rsrc.h Fxtv; do                   \
+               ${SED}  -e "s,/dev/dsp,${DEVOSSAUDIO},g"                \
+                       $${file} > $${file}.fixed;                      \
+               ${MV} -f $${file}.fixed $${file};                       \
+       done
+       if [ -e /usr/include/machine/mouse.h ] ; then \
+               echo '#define HAVE_MOUSE_H 1' > ${WRKSRC}/netbsdconf.h; \
+       else \
+               echo '#define HAVE_MOUSE_H 0' > ${WRKSRC}/netbsdconf.h; \
+       fi
+
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/PLIST     Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+bin/fxtv
+lib/X11/app-defaults/Fxtv
+lib/X11/fxtv/bitmaps/mini-camera.xpm
+lib/X11/fxtv/bitmaps/mini-down.xbm
+lib/X11/fxtv/bitmaps/mini-resize.xpm
+lib/X11/fxtv/bitmaps/mini-sound.xbm
+lib/X11/fxtv/bitmaps/mini-up.xbm
+lib/X11/fxtv/bitmaps/radio_off.xbm
+lib/X11/fxtv/bitmaps/radio_on.xbm
+lib/X11/fxtv/README
+lib/X11/fxtv/fxtv_cnvt.sh
+man/man1/fxtv.1
+@dirrm lib/X11/fxtv/bitmaps
+@dirrm lib/X11/fxtv
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/distinfo  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,23 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+
+SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
+Size (fxtv-1.03.tgz) = 198669 bytes
+SHA1 (patch-aa) = cd994d512fe99e962cc9c505285da63d1421f81e
+SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
+SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
+SHA1 (patch-ad) = 39eb6a889ef76c27f2dd296385d9247c703db9eb
+SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
+SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
+SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
+SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
+SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96
+SHA1 (patch-aj) = 9a9427ba6c9d092e57f652bd6c278c96f9ba6d1c
+SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a
+SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1
+SHA1 (patch-ba) = 20efae40631bdb5be57e12445bf2135a47952763
+SHA1 (patch-bb) = 1a6cc73078ac7587e6df9de6c3ec9930e498484e
+SHA1 (patch-bc) = d5ddc97b1ba5a1660d622f20d89a3a680596f024
+SHA1 (patch-bd) = c24ef4e00d800368a843d0972d66080ddc2b07eb
+SHA1 (patch-be) = ff86cb36c3379727de59632ac29efdbbc6baa1ec
+SHA1 (patch-bf) = e3ce002d342ae508262f21e9eaa4af20d1d56f77
+SHA1 (patch-bg) = fa2895e34aea2be7fccfb912276a5fbfb6c9d1be
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/patches/patch-aa  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,61 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+
+--- Makefile.orig      Mon Feb 12 23:08:59 2001
++++ Makefile
+@@ -4,13 +4,10 @@
+ 
+ HAVE_XFREE86 = YES
+ 
+-ifneq ($(X11PREFIX),)                      # NetBSD
+-X11BASE      ?= $(X11PREFIX)
+-else
+ X11BASE      ?= /usr/X11R6
+-endif
++X11BASEINST  ?= $(PREFIX)
+ 
+-X11BASEINST  ?= $(X11BASE)
++PREFIX       ?= /usr/local
+ LOCALBASE    ?= /usr/local
+ DEBUG        = NO
+ OS           = $(shell uname -s)
+@@ -24,15 +21,6 @@ override LIBDIRS           = $(X11BASE)/
+ override SHELL             = /bin/sh
+ 
+ #
+-# 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)
+@@ -72,6 +60,15 @@ endif
+ 
+ override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
+ 
++#
++# NetBSD stuff
++#
++ifeq ($(OS),NetBSD)
++  override INC            += -I$(LOCALBASE)/include
++  override LIBDIRS        += $(LOCALBASE)/lib
++  override LD_INC         += $(LIBOSSAUDIO) -lz
++endif
++
+ ifeq ($(OS), linux)
+ override CFLAGS            = $(CFLAGS) -DOLD_TUNER_IFACE
+ endif
+@@ -81,7 +78,7 @@ endif
+ #
+ override LDFLAGS           = $(LD_INC) 
+ override VIDEOLIB_LIB      = $(VIDEOLIB_DIR)/libvideo.a
+-override LIBS              = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \
++override LIBS              = -lpng -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \
+                              -lSM -lICE -lXext -lX11 -lm
+ ifeq ($(HAVE_XFREE86),YES)
+   override LIBS           += -lXxf86dga -lXxf86vm
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/patches/patch-ab  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+
+--- 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 <sys/ioctl.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/patches/patch-ac  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+
+--- tvaudio.c.orig     Mon Feb 12 15:56:29 2001
++++ tvaudio.c
+@@ -107,7 +107,11 @@
+ #ifdef SOUND_MIXER_VIDEO
+     else if ( STREQ( buf, "VIDEO" ) ) {
+        Mixer_dev_id   = SOUND_MIXER_VIDEO;
++#ifndef SOUND_MASK_VIDEO
++       Mixer_dev_mask = 1 << SOUND_MIXER_VIDEO;
++#else
+        Mixer_dev_mask = SOUND_MASK_VIDEO;
++#endif
+        Mixer_dev_name = "VIDEO";
+     }
+ #endif
diff -r 5ae9a312e45e -r 0d021a3a78ff multimedia/fxtv/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fxtv/patches/patch-ad  Mon Jan 26 11:36:35 2004 +0000
@@ -0,0 +1,261 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+
+--- app_rsrc.h.orig    2001-02-12 22:17:53.000000000 +0100
++++ app_rsrc.h
+@@ -80,6 +80,8 @@ typedef struct _AppResources {
+     int      Bpp_24bit;
+     int      Bpp_32bit;
+ 
++    Boolean  aot_mode;
++
+     Boolean  afc_mode;
+     Boolean  disable_direct_v;
+     String   remote_type;             /*  Type of Remote Control attached  */
+@@ -191,6 +193,8 @@ extern AppResources     App_res;
+ 
+ #define RNafc               "afc"
+ #define RCafc               "Afc"
++#define RNalwaysOnTop       "alwaysOnTop"
++#define RCalwaysOnTop       "AlwaysOnTop"
+ 
+ #define RNdisableDirectV    "disableDirectV"
+ #define RCdisableDirectV    "DisableDirectV"
+@@ -284,6 +288,7 @@ static XrmOptionDescRec Cmd_line_options
+    { "-Bpp24bit"           , RNBpp24bit       , XrmoptionSepArg, NULL        },
+    { "-Bpp32bit"           , RNBpp32bit       , XrmoptionSepArg, NULL        },
+                                                                              
++   { "-noalwaysOnTop"      , RNalwaysOnTop    , XrmoptionNoArg , pFALSE      },
+    { "-noafc"              , RNafc            , XrmoptionNoArg , pFALSE      },
+    { "-disableDirectV"     , RNdisableDirectV , XrmoptionNoArg , pTRUE       },
+    { "-remoteType"         , RNremoteType     , XrmoptionSepArg, NULL        },
+@@ -389,7 +394,7 @@ static XtResource Resources[] = {
+         (XtPointer) True },
+     { RNdspDevice, RCaudioDevice, XtRString, sizeof(String),
+         XtOffsetOf(AppResources, dsp_device ), XtRImmediate,
+-        "/dev/dsp"  },
++        "/dev/audio"  },
+     { RNmixerDevice, RCaudioDevice, XtRString, sizeof(String),
+         XtOffsetOf(AppResources, mixer_device ), XtRImmediate,
+         "/dev/mixer"  },
+@@ -434,6 +439,10 @@ static XtResource Resources[] = {
+         XtOffsetOf(AppResources, Bpp_32bit), XtRString,
+         "-1" /*  0 = Guess */ },   
+ 
++    { RNalwaysOnTop, RCalwaysOnTop, XtRBoolean, sizeof(Boolean),
++        XtOffsetOf(AppResources, aot_mode), XtRImmediate,
++        (XtPointer) True },
++
+     { RNafc, RCafc, XtRBoolean, sizeof(Boolean),
+         XtOffsetOf(AppResources, afc_mode), XtRImmediate,
+         (XtPointer) True },
+@@ -525,96 +534,96 @@ static XtResource Resources[] = {
+ };
+ 
+ 
+-#define OPTION_HELP_STR "\
+-                      BSD X TV (fxtv), Version " VERS_STR ".  
+-                         Written by Randall Hopper
+-
+-Please mail Fxtv and Bt848 driver-related comments and help requests to the
+-multimedia%freebsd.org@localhost list.  Feel free to subscribe and contribute 
+-(listserv: majordomo%freebsd.org@localhost).
+-
+-Available options:
+-
+--driverDefaults             - Use appearance parms from driver on startup
+--colorbars                  - Turn on colorbar display (for testing)
+--hue [-90...90]             - Initial Hue           ; def=0
+--brightness [-50..50]       - Initial Brightness (%); def=0
+--contrast [0..200]          - Initial Contrast   (%); def=100
+--satU [0..200]              - U Saturation       (%); def=100
+--satV [0..284]              - V Saturation       (%); def=100
+--aspectlock                 - Enable 4:3 aspect lock on video window
+-
+--deviceNumber <#>           - bktr/tuner device numbers; def=0      
+--inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,
+-                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)
+-
+--tunerMode [cable|antenna]  - Tuner Mode
+--defaultInput <input>       - Startup tuner signal input 
+-                                 [tuner|video|svideo|csvideo|dev3]
+--defaultAudioInput <input>  - Startup TV card audio input 
+-                                 [tuner|external|internal|auto]
+--defaultChannel <#>         - Startup Channel Number
+--cableStationList   <...>   - List of cable station presets (see rsrc file)



Home | Main Index | Thread Index | Old Index