cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FXTV v1.02

Browse Source
This commit is contained in:
angelos 2000-05-28 23:41:33 +00:00
parent e27a745808
commit ff4d5cae19
13 changed files with 172 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/fxtv/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2000/04/12 19:28:44 angelos Exp $
# $OpenBSD: Makefile,v 1.15 2000/05/28 23:41:33 angelos Exp $
# $FreeBSD: Makefile,v 1.17 1999/03/16 14:01:06 roger Exp $
DISTNAME= fxtv-0.48
DISTNAME= fxtv-1.02
CATEGORIES= graphics
NEED_VERSION= 1.230
FAKE=No

6
graphics/fxtv/files/md5
View File

@ -1,3 +1,3 @@
SHA1 (fxtv-0.48.tgz) = 6641af5239cf6ac9980b5ff2c98a51faf7d6caf4
RMD160 (fxtv-0.48.tgz) = 54e4a8db743ced2e038c68cd2c2cce09a97df7c7
MD5 (fxtv-0.48.tgz) = 1ac61e99cd7ec67ff5beb1099b5468cb
MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573
RMD160 (fxtv-1.02.tgz) = f3b3a7f341b78b11ee71b0ce59f001d71e4a478f
SHA1 (fxtv-1.02.tgz) = 5d6854680483dc57f579759281262e5a574fc335

42
graphics/fxtv/patches/patch-aa
View File

@ -1,26 +1,20 @@
--- Makefile.orig Sat Jan 16 14:13:47 1999
+++ Makefile Wed Apr 12 15:19:51 2000
@@ -9,7 +9,7 @@
override CF_VERS = -DVERS_STR=\"0.48\"
override INC = -I$(X11BASE)/include -I/usr/local/include \
-I/usr/local/include/tiff34 -I.
-override LD_INC = -L$(X11BASE)/lib -L/usr/local/lib -rpath-link /usr/local/lib
+override LD_INC = -L$(X11BASE)/lib -L/usr/local/lib
override CFLAGS = -O2 -m486 $(INC) $(CF_VERS)
ifeq ($(DEBUG),YES)
override CFLAGS = -DDEBUG -g $(INC) $(CF_VERS)
@@ -19,8 +19,8 @@
--- Makefile.orig Sun May 28 19:20:57 2000
+++ Makefile Sun May 28 19:21:49 2000
@@ -40,6 +40,13 @@
endif
override LDFLAGS = $(LD_INC)
-override LIBS = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lSM -lICE \
- -lXext -lX11 -lm
+override LIBS = -ltiff -ljpeg -lz -lXaw3d -lXmu -lXt -lXpm \
+ -lSM -lICE -lXext -lX11 -lm -lossaudio
ifeq ($(HAVE_XFREE86),YES)
override LIBS += -lXxf86dga -lXxf86vm
endif
@@ -29,7 +29,7 @@
#
+# OpenBSD stuff
+#
+ifeq ($(OS),OpenBSD)
+ override LD_INC += -lossaudio -lz
+endif
+
+#
# CFLAGS
#
ifneq ($(DEBUG),NO)
@@ -74,7 +81,7 @@
override LDFLAGS := -g $(LDFLAGS)
endif
@ -29,16 +23,20 @@
override CSRC = $(wildcard *.c)
override PIXMAPS = $(wildcard bitmaps/*.x?m)
@@ -58,8 +58,8 @@
@@ -102,11 +109,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 $(PREFIX)/lib/X11/app-defaults
+ install -c -m 444 -o root Fxtv $(PREFIX)/lib/X11/app-defaults
+ mkdir -p $(PREFIX)/bin
+ install -c -m 444 -o root fxtv.1 $(PREFIX)/man/man1/fxtv.1
+ install -c -m 555 -o root fxtv $(PREFIX)/bin
install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
clean:

49
graphics/fxtv/patches/patch-ab
View File

@ -1,38 +1,11 @@
*** Fxtv.orig Fri Feb 5 18:11:43 1999
--- Fxtv Tue Mar 23 17:40:56 1999
***************
*** 137,143 ****
!! after this point in your local app-default file.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Fxtv.title: FreeBSD TV
Fxtv.iconName: FXTV
! Menubar appearance
--- 137,143 ----
!! after this point in your local app-default file.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Fxtv.title: FXTV
Fxtv.iconName: FXTV
! Menubar appearance
*** app_rsrc.h.orig Fri Feb 5 17:27:26 1999
--- app_rsrc.h Tue Mar 23 17:41:51 1999
***************
*** 593,599 ****
static String fallback_resources[] = {
/*"Fxtv.geometry: +10+10",*/
! "Fxtv.title: FreeBSD TV " VERS_STR,
"Fxtv.iconName: FXTV",
/* Menubar appearance */
--- 593,599 ----
static String fallback_resources[] = {
/*"Fxtv.geometry: +10+10",*/
! "Fxtv.title: FXTV " VERS_STR,
"Fxtv.iconName: FXTV",
/* Menubar appearance */
--- Fxtv.orig Sun May 28 19:22:37 2000
+++ Fxtv Sun May 28 19:22:51 2000
@@ -151,7 +151,7 @@
!! after this point in your local app-default file.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-Fxtv*title: FreeBSD TV
+Fxtv*title: FXTV
Fxtv*iconName: FXTV
! Menubar appearance

195
graphics/fxtv/patches/patch-ac
View File

@ -1,184 +1,11 @@
*** actions.c.orig Fri Feb 5 17:22:21 1999
--- actions.c Tue Mar 23 17:45:51 1999
***************
*** 773,782 ****
--- 773,784 ----
TVSCREENSetZoomState( !d->zoom_on, fullscreen );
TVTOOLSSetToggleState( TV_TOOLITEM_FULLSCREEN, d->zoom_on );
+ #if !defined(__OpenBSD__)
/* This is an ugly hack. Changing the video mode can take a while, */
/* If this was initiated by a remote event, this delay messes up */
/* remote key debouncing. Just flush the buffer of any repeats. */
TVREMOTEFlush();
+ #endif
}
*** remote.c.orig Tue Jun 30 14:02:04 1998
--- remote.c Tue Mar 23 17:46:28 1999
***************
*** 1,3 ****
--- 1,4 ----
+ #if !defined(__OpenBSD__)
/*
* remote.c
*
***************
*** 734,736 ****
--- 735,738 ----
RMPRINTF(( "TVREMOTE: Flushing buffer (key = %d)\n", btn ));
}
}
+ #endif
*** tv.c.orig Fri Feb 5 17:29:00 1999
--- tv.c Tue Mar 23 17:51:54 1999
***************
*** 216,221 ****
--- 216,222 ----
static void TVRemoteCallback( const char key[] )
{
+ #if !defined(__OpenBSD__)
TV_BOOL handled;
/* First, pass these through the user's Remote translation table */
***************
*** 226,231 ****
--- 227,233 ----
/* generic "key" handler and take the default behavior. */
TVACTIONKeyEventHdlr( key, &handled );
}
+ #endif
}
***************
*** 639,645 ****
}
! void main( int argc, char *argv[] )
{
static XtActionsRec S_tv_actions[] = {
{ "WMDeleteWindow", (XtActionProc) TVWMDeleteWindow }
--- 641,647 ----
}
! int main( int argc, char *argv[] )
{
static XtActionsRec S_tv_actions[] = {
{ "WMDeleteWindow", (XtActionProc) TVWMDeleteWindow }
***************
*** 699,710 ****
--- 701,714 ----
XtAddEventHandler( top_level, (EventMask) 0, True, _XEditResCheckMessages,
NULL );
+ #if !defined(__OpenBSD__)
/* Attach remote, if configured */
if ( App_res.remote_type[0] && !STREQ( App_res.remote_type, "None" ) &&
!STREQ( App_res.remote_type, "none" ) ) {
TVREMOTEOpen( app_context, App_res.remote_type, TVRemoteCallback );
TVREMOTETRANSParse( XtDisplay( top_level ) );
}
+ #endif
XtVaSetValues( top_level, XtNallowShellResize, True,
NULL );
*** tvcapture.c.orig Fri Feb 5 17:29:39 1999
--- tvcapture.c Tue Mar 23 17:48:40 1999
***************
*** 50,56 ****
# define BT848SFMT METEORSFMT
#endif
! #if defined(__FreeBSD__)
# define DEV_BT848 "/dev/bktr%d"
# define DEV_TUNER "/dev/tuner%d"
#elif defined(linux)
--- 50,56 ----
# define BT848SFMT METEORSFMT
#endif
! #if defined(__FreeBSD__) || defined(__OpenBSD__)
# define DEV_BT848 "/dev/bktr%d"
# define DEV_TUNER "/dev/tuner%d"
#elif defined(linux)
*** tvutil.c.orig Sun May 31 01:57:55 1998
--- tvutil.c Tue Mar 23 17:52:27 1999
***************
*** 34,45 ****
#include <ctype.h>
#include <fcntl.h>
#include <signal.h>
! #if defined(__FreeBSD__)
! # include <sys/types.h>
! # include <sys/sysctl.h>
! #elif defined(linux)
! # include <linux/sysctl.h>
! #endif
#include <unistd.h>
#include "tvdefines.h"
#include "tvutil.h"
--- 34,40 ----
#include <ctype.h>
#include <fcntl.h>
#include <signal.h>
! #include <sys/types.h>
#include <unistd.h>
#include "tvdefines.h"
#include "tvutil.h"
***************
*** 99,124 ****
void CleanupChildFileDesc()
{
! static int Max_files_per_proc = -1;
! #if defined(__FreeBSD__)
! int mib[2] = { CTL_KERN, KERN_MAXFILESPERPROC };
! #elif defined(linux)
! int mib[2] = { CTL_KERN, FOPEN_MAX };
! #endif
! int i;
! size_t len;
!
! /* Close all file descriptors but stdin/out/err */
! if ( Max_files_per_proc < 0 ) {
! len = sizeof( Max_files_per_proc );
! if ( sysctl( mib, 2, &Max_files_per_proc, &len, NULL, 0 ) < 0 ) {
! perror( "sysctl() failed" );
! _exit( CHILD_PREPFAIL_STATUS ); /* Skip atexit() functs */
! }
! }
! for ( i = 3; i < Max_files_per_proc; i++ )
! close( i );
}
--- 94,103 ----
void CleanupChildFileDesc()
{
! int i;
! for ( i = 3; i < getdtablesize(); i++ )
! close( i );
}
*** voxware.h.orig Sat Jan 10 09:16:51 1998
--- voxware.h Tue Mar 23 17:44:18 1999
***************
*** 32,37 ****
--- 32,39 ----
#if defined(__FreeBSD__)
# include <machine/soundcard.h>
+ #elif defined(__OpenBSD__)
+ # include <soundcard.h>
#elif defined(linux)
# include <sys/soundcard.h>
#else
--- voxware.h.orig Sun May 28 19:29:24 2000
+++ voxware.h Sun May 28 19:29:34 2000
@@ -34,7 +34,7 @@
# include <machine/soundcard.h>
#elif defined(linux) || defined(__bsdi__)
# include <sys/soundcard.h>
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
# include <soundcard.h>
#else
# error Sorry, I dont know this OS.

20
graphics/fxtv/patches/patch-ad Normal file
View File

@ -0,0 +1,20 @@
--- app_rsrc.h.orig Thu Nov 4 18:46:50 1999
+++ app_rsrc.h Sun May 28 19:33:37 2000
@@ -526,7 +526,7 @@
#define OPTION_HELP_STR "\
- FreeBSD X TV (fxtv), Version " VERS_STR ".
+ FXTV, Version " VERS_STR ".
Written by Randall Hopper
Please mail Fxtv and Bt848 driver-related comments and help requests to the
@@ -618,7 +618,7 @@
static String fallback_resources[] = {
/*"Fxtv.geometry: +10+10",*/
- "Fxtv.title: FreeBSD TV " VERS_STR,
+ "Fxtv.title: FXTV " VERS_STR,
"Fxtv.iconName: FXTV",
/* Menubar appearance */

15
graphics/fxtv/patches/patch-ae Normal file
View File

@ -0,0 +1,15 @@
--- actions.c.orig Sun May 28 19:23:57 2000
+++ actions.c Sun May 28 19:24:17 2000
@@ -740,10 +740,12 @@
TVSCREENSetZoomState( !d->zoom_on, fullscreen );
TVTOOLSSetToggleState( TV_TOOLITEM_FULLSCREEN, d->zoom_on );
+#if !defined(__OpenBSD__)
/* This is an ugly hack. Changing the video mode can take a while, */
/* If this was initiated by a remote event, this delay messes up */
/* remote key debouncing. Just flush the buffer of any repeats. */
TVREMOTEFlush();
+#endif
}

12
graphics/fxtv/patches/patch-af Normal file
View File

@ -0,0 +1,12 @@
--- remote.c.orig Sun May 28 19:24:34 2000
+++ remote.c Sun May 28 19:26:18 2000
@@ -1,3 +1,4 @@
+#if !defined(__OpenBSD__)
/*
* remote.c
*
@@ -846,3 +847,4 @@
case REMOTE_TYPE_PIXELVIEW : TVPIXELVIEWREMOTEFlush(); break;
}
}
+#endif

35
graphics/fxtv/patches/patch-ag Normal file
View File

@ -0,0 +1,35 @@
--- tv.c.orig Sun May 28 19:26:36 2000
+++ tv.c Sun May 28 19:27:37 2000
@@ -220,6 +220,7 @@
static void TVRemoteCallback( const char key[] )
{
+#if !defined(__OpenBSD__)
TV_BOOL handled;
/* First, pass these through the user's Remote translation table */
@@ -230,6 +231,7 @@
/* generic "key" handler and take the default behavior. */
TVACTIONKeyEventHdlr( key, &handled );
}
+#endif
}
@@ -840,13 +842,15 @@
XtAddEventHandler( top_level, (EventMask) 0, True, _XEditResCheckMessages,
NULL );
+#if !defined(__OpenBSD__)
/* Attach remote, if configured */
if ( App_res.remote_type[0] && !STREQ( App_res.remote_type, "None" ) &&
!STREQ( App_res.remote_type, "none" ) ) {
TVREMOTETRANSParse( XtDisplay( top_level ) );
TVREMOTEOpen( app_context, App_res.remote_type, TVRemoteCallback );
}
-
+#endif
+
XtVaSetValues( top_level, XtNallowShellResize, True,
NULL );

20
graphics/fxtv/patches/patch-ah Normal file
View File

@ -0,0 +1,20 @@
--- tvutil.c.orig Sun Sep 5 12:52:47 1999
+++ tvutil.c Sun May 28 19:31:00 2000
@@ -39,7 +39,7 @@
# include <sys/sysctl.h>
#elif defined(linux)
# include <linux/sysctl.h>
-#elif defined(__bsdi__)
+#elif defined(__bsdi__) || defined(__OpenBSD__)
# include <sys/types.h>
# include <sys/param.h>
# include <sys/sysctl.h>
@@ -115,7 +115,7 @@
int mib[2] = { CTL_KERN, KERN_MAXFILESPERPROC };
#elif defined(linux)
int mib[2] = { CTL_KERN, FOPEN_MAX };
-#elif defined(__bsdi__)
+#elif defined(__bsdi__) || defined(__OpenBSD__)
int mib[2] = { CTL_KERN, KERN_MAXFILES };
#elif defined(__NetBSD__)
int mib[2] = { CTL_KERN, OPEN_MAX };

11
graphics/fxtv/patches/patch-ai Normal file
View File

@ -0,0 +1,11 @@
--- vidsav_dlg.c.orig Sun May 28 19:31:48 2000
+++ vidsav_dlg.c Sun May 28 19:31:59 2000
@@ -124,7 +124,7 @@
# %s\n\
# Fxtv Video/System Stream Conversion Script\n\
# \n\
-# Automatically generated by FreeBSD X TV v" VERS_STR "\n\
+# Automatically generated by FXTV v" VERS_STR "\n\
# \n\
\n\
"

11
graphics/fxtv/patches/patch-aj Normal file
View File

@ -0,0 +1,11 @@
--- tvmenu.c.orig Sun May 28 19:32:18 2000
+++ tvmenu.c Sun May 28 19:32:31 2000
@@ -676,7 +676,7 @@
static void AboutCB( Widget w, XtPointer cl, XtPointer cb )
{
XUTILDialogPause( TVTOPLEVEL, "About",
- "FreeBSD X TV\n"
+ "FXTV\n"
"Version " VERS_STR "\n\n"
"Written by Randall Hopper, 1997-9.",
TV_DIALOG_TYPE_OK );

1
graphics/fxtv/pkg/PLIST
View File

@ -1,4 +1,5 @@
bin/fxtv
man/man1/fxtv.1
lib/X11/app-defaults/Fxtv
lib/X11/fxtv/README
lib/X11/fxtv/bitmaps/mini-camera.xpm