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

shun lvalue casts

Browse Source
This commit is contained in:
espie 2010-05-22 14:12:50 +00:00
parent de2d737ef4
commit a9e99408fc
8 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/fxtv/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2003/12/28 00:24:38 naddy Exp $
--- Makefile.orig 2001-02-12 23:08:59.000000000 +0100
+++ Makefile 2003-12-28 01:19:51.000000000 +0100
$OpenBSD: patch-Makefile,v 1.4 2010/05/22 14:12:50 espie Exp $
--- Makefile.orig Mon Feb 12 23:08:59 2001
+++ Makefile Sat May 22 16:04:13 2010
@@ -50,8 +50,11 @@ endif
ifeq ($(OS),NetBSD)
override RPATH_FLAG = -R
@ -45,7 +45,7 @@ $OpenBSD: patch-Makefile,v 1.3 2003/12/28 00:24:38 naddy Exp $
-lSM -lICE -lXext -lX11 -lm
ifeq ($(HAVE_XFREE86),YES)
override LIBS += -lXxf86dga -lXxf86vm
@@ -98,6 +102,11 @@ override PIXMAPS = $(wildcard
@@ -98,6 +102,11 @@ override PIXMAPS = $(wildcard bitmaps/*.x?m)
override CSRCOBJ = $(CSRC:%.c=%.o)
override EXEC = fxtv

8
graphics/fxtv/patches/patch-annot_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-annot_c,v 1.1 2002/07/19 10:17:10 wcobb Exp $
--- annot.c.orig Fri Jul 19 07:09:35 2002
+++ annot.c Fri Jul 19 07:09:58 2002
@@ -678,6 +678,7 @@ static TV_BOOL TVANNOTInputDevPropUpdate
$OpenBSD: patch-annot_c,v 1.2 2010/05/22 14:12:50 espie Exp $
--- annot.c.orig Sun Sep 5 20:42:16 1999
+++ annot.c Sat May 22 16:04:13 2010
@@ -678,6 +678,7 @@ static TV_BOOL TVANNOTInputDevPropUpdate(
case TV_DEVICE_VIDEO : str = "VIDEO IN" ; break;
case TV_DEVICE_SVIDEO : str = "SVIDEO IN" ; break;
case TV_DEVICE_CSVIDEO : str = "CSVIDEO IN"; break;

20
graphics/fxtv/patches/patch-audsav_dlg_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
--- audsav_dlg.c.orig Sat Sep 4 15:09:01 1999
+++ audsav_dlg.c Thu Nov 28 01:31:27 2002
@@ -373,8 +373,10 @@ static void RecordCmdCB( Widget w, XtPoi
$OpenBSD: patch-audsav_dlg_c,v 1.2 2010/05/22 14:12:50 espie Exp $
--- audsav_dlg.c.orig Sat Sep 4 20:09:01 1999
+++ audsav_dlg.c Sat May 22 16:04:13 2010
@@ -373,8 +373,10 @@ static void RecordCmdCB( Widget w, XtPointer cl, XtPoi
return;
}
@ -12,7 +12,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
/* Grab values off dialog */
if ( !PrepareForAudio( TRUE, 1, &dsp_fd, &bps ) )
@@ -426,8 +428,10 @@ static void RecordCmdCB( Widget w, XtPoi
@@ -426,8 +428,10 @@ static void RecordCmdCB( Widget w, XtPointer cl, XtPoi
Recording = True;
@ -23,7 +23,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
UpdateButtons();
/* Flush X events (update GUI buttons, etc.) */
@@ -520,7 +524,9 @@ static void RecordCmdCB( Widget w, XtPoi
@@ -520,7 +524,9 @@ static void RecordCmdCB( Widget w, XtPointer cl, XtPoi
if ( state != NULL )
free( state );
@ -33,7 +33,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
/* FIXME: Check code - make sure no problem (other than CPU) starting */
/* another record/play while conversion for previous still going on. */
@@ -576,7 +582,9 @@ static void PlaybackCmdDoneCB( TV_BOOL a
@@ -576,7 +582,9 @@ static void PlaybackCmdDoneCB( TV_BOOL aborted, int st
if ( !aborted && ( status != 0 ) )
DoCmdFailDialog( state->cmd, status );
@ -43,7 +43,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
/* Do post-cmd cleanup */
free( state->cmd );
@@ -616,8 +624,10 @@ static void PlaybackCmdCB( Widget w, XtP
@@ -616,8 +624,10 @@ static void PlaybackCmdCB( Widget w, XtPointer cl, XtP
return;
}
@ -54,7 +54,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
/* Grab values off dialog */
if ( !PrepareForAudio( FALSE, 1, &dsp_fd, &bps ) )
@@ -637,7 +647,9 @@ static void PlaybackCmdCB( Widget w, XtP
@@ -637,7 +647,9 @@ static void PlaybackCmdCB( Widget w, XtPointer cl, XtP
Playing = True;
/* Make sure mute is on, & disable all but stop btn */
@ -64,7 +64,7 @@ $OpenBSD: patch-audsav_dlg_c,v 1.1 2002/11/28 05:36:59 wcobb Exp $
UpdateButtons();
/* Flush X events (update GUI buttons, etc.) */
@@ -779,7 +791,9 @@ static void PlaybackCmdCB( Widget w, XtP
@@ -779,7 +791,9 @@ static void PlaybackCmdCB( Widget w, XtPointer cl, XtP
free( state );
if ( !cmd_running ) {

8
graphics/fxtv/patches/patch-tvaudio_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tvaudio_c,v 1.2 2002/02/02 00:52:18 naddy Exp $
--- tvaudio.c.orig Mon Feb 12 10:56:29 2001
+++ tvaudio.c Wed Aug 15 13:46:30 2001
$OpenBSD: patch-tvaudio_c,v 1.3 2010/05/22 14:12:50 espie Exp $
--- tvaudio.c.orig Mon Feb 12 15:56:29 2001
+++ tvaudio.c Sat May 22 16:04:14 2010
@@ -104,7 +104,7 @@ static void TVAUDIOSetMixerMask()
Mixer_dev_mask = SOUND_MASK_MIC;
Mixer_dev_name = "MIC";
@ -10,7 +10,7 @@ $OpenBSD: patch-tvaudio_c,v 1.2 2002/02/02 00:52:18 naddy Exp $
else if ( STREQ( buf, "VIDEO" ) ) {
Mixer_dev_id = SOUND_MIXER_VIDEO;
Mixer_dev_mask = SOUND_MASK_VIDEO;
@@ -204,12 +204,22 @@ void TVAUDIOSetMuteState( TV_BOOL
@@ -204,12 +204,22 @@ void TVAUDIOSetMuteState( TV_BOOL mute_on )
{
TV_AUDIO *a = &G_glob.audio;
TV_CAPTURE *c = &G_glob.capture;

16
graphics/fxtv/patches/patch-tvcapture_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
--- tvcapture.c.orig Mon Feb 12 11:59:22 2001
+++ tvcapture.c Fri Feb 28 19:54:30 2003
$OpenBSD: patch-tvcapture_c,v 1.5 2010/05/22 14:12:50 espie Exp $
--- tvcapture.c.orig Mon Feb 12 19:59:22 2001
+++ tvcapture.c Sat May 22 16:04:14 2010
@@ -35,7 +35,8 @@
#include <fcntl.h>
#include <errno.h>
@ -11,7 +11,7 @@ $OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
# include <dev/ic/bt8xx.h>
#else
# include <machine/ioctl_bt848.h>
@@ -492,9 +493,7 @@ void TVCAPTURESetInputDevice( TV_CAPTURE
@@ -492,9 +493,7 @@ void TVCAPTURESetInputDevice( TV_CAPTURE *c, TV_INPUT_
case TV_DEVICE_VIDEO : arg = METEOR_INPUT_DEV0; break;
case TV_DEVICE_SVIDEO : arg = METEOR_INPUT_DEV_SVIDEO; break;
case TV_DEVICE_CSVIDEO : arg = METEOR_INPUT_DEV2; break;
@ -21,7 +21,7 @@ $OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
default :
fprintf( stderr, "TVCAPTURESetInputDevice(): Bad value %d\n",
dev );
@@ -520,8 +519,6 @@ void TVCAPTURESetInputDevice( TV_CAPTURE
@@ -520,8 +519,6 @@ void TVCAPTURESetInputDevice( TV_CAPTURE *c, TV_INPUT_
case TV_AUDIO_INPUT_INTERN : arg = AUDIO_INTERN; break;
}
if ( ioctl( c->tfd, BT848_SAUDIO, &arg ) < 0 ) {
@ -30,7 +30,7 @@ $OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
return;
}
}
@@ -562,8 +559,6 @@ void TVCAPTURESetAudioInputDevice( TV_CA
@@ -562,8 +559,6 @@ void TVCAPTURESetAudioInputDevice( TV_CAPTURE *c, TV_A
/* to keep that setting whenever it wants to change the setting. */
if ( dev != TV_AUDIO_INPUT_AUTO ) {
if ( ioctl( c->tfd, BT848_SAUDIO, &arg ) < 0 ) {
@ -39,7 +39,7 @@ $OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
return;
}
c->audio_input_dev = dev;
@@ -727,7 +722,6 @@ void TVCAPTURESetAudioMute( TV_CAPTURE *
@@ -727,7 +722,6 @@ void TVCAPTURESetAudioMute( TV_CAPTURE *c, TV_BOOL mut
/* Don't change audio source; just mute it */
if ( ioctl( c->tfd, BT848_SAUDIO, &arg ) < 0 ) {
@ -47,7 +47,7 @@ $OpenBSD: patch-tvcapture_c,v 1.4 2003/03/01 03:28:12 pvalchev Exp $
return;
}
}
@@ -811,9 +805,7 @@ TV_BOOL TVCAPTUREQueryDriverState( TV_CA
@@ -811,9 +805,7 @@ TV_BOOL TVCAPTUREQueryDriverState( TV_CAPTURE *c, TV_D
case METEOR_INPUT_DEV1 : s->input_dev = TV_DEVICE_TUNER ; break;
case METEOR_INPUT_DEV_SVIDEO : s->input_dev = TV_DEVICE_SVIDEO ; break;
case METEOR_INPUT_DEV2 : s->input_dev = TV_DEVICE_CSVIDEO; break;

8
graphics/fxtv/patches/patch-tvmenu_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tvmenu_c,v 1.1 2005/04/11 21:56:48 naddy Exp $
--- tvmenu.c.orig Wed Apr 6 21:03:29 2005
+++ tvmenu.c Wed Apr 6 21:04:16 2005
@@ -713,6 +713,7 @@ static void VidSavAsCB( Widget w, XtPoin
$OpenBSD: patch-tvmenu_c,v 1.2 2010/05/22 14:12:50 espie Exp $
--- tvmenu.c.orig Mon Feb 12 22:19:33 2001
+++ tvmenu.c Sat May 22 16:04:14 2010
@@ -713,6 +713,7 @@ static void VidSavAsCB( Widget w, XtPointer cl, XtPoin
/* QuitCB - Exit the app (invoking atexit behavior) */
static void QuitCB( Widget w, XtPointer cl, XtPointer cb )
{

8
graphics/fxtv/patches/patch-tvutil_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tvutil_c,v 1.4 2003/03/01 03:28:41 pvalchev Exp $
--- tvutil.c.orig Sun Oct 22 20:43:46 2000
+++ tvutil.c Fri Feb 28 19:55:00 2003
$OpenBSD: patch-tvutil_c,v 1.5 2010/05/22 14:12:50 espie Exp $
--- tvutil.c.orig Mon Oct 23 04:43:46 2000
+++ tvutil.c Sat May 22 16:04:14 2010
@@ -114,7 +114,7 @@ void CleanupChildFileDesc()
#elif defined(__NetBSD__)
int mib[2] = { CTL_KERN, OPEN_MAX };
@ -10,7 +10,7 @@ $OpenBSD: patch-tvutil_c,v 1.4 2003/03/01 03:28:41 pvalchev Exp $
#endif
int i;
size_t len;
@@ -399,7 +399,7 @@ void TVUTILPipeSetup( char *s
@@ -399,7 +399,7 @@ void TVUTILPipeSetup( char *shell_cmd,
CleanupChildFileDesc();
if ( shell_cmd != NULL )

44
graphics/fxtv/patches/patch-videolib_videolib_c Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-videolib_videolib_c,v 1.1 2010/05/22 14:12:50 espie Exp $
--- videolib/videolib.c.orig Sat May 22 16:06:23 2010
+++ videolib/videolib.c Sat May 22 16:09:09 2010
@@ -479,9 +479,11 @@ static void VIDEOLIBConvertRGBToRGB( VL_IMAGE *src, VL
*(p++) = (*src16 >> 8) | (*src16 << 8);
src16++;
}
- for ( i = dst_line_pad; i > 0; i-- )
- *(((VL_UINT8 *)p)++) = 0x00;
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
+ for ( i = dst_line_pad; i > 0; i-- ) {
+ *((VL_UINT8 *)p) = 0x00;
+ p = (VL_UINT8 *)p + 1;
+ }
+ dst_line = (VL_UINT8 *)dst_line + dst->geom.bytes_per_line;
}
src16 = dst_line = (VL_UINT16 *) dst->buf;
@@ -513,9 +515,11 @@ static void VIDEOLIBConvertRGBToRGB( VL_IMAGE *src, VL
if ( src_padded )
src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
else
- for ( i = dst_line_pad; i > 0; i-- )
- *(((VL_UINT8 *)dst)++) = 0x00;
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
+ for ( i = dst_line_pad; i > 0; i-- ) {
+ *((VL_UINT8 *)dst) = 0x00;
+ dst = (VL_UINT8 *)dst + 1;
+ }
+ dst_line = (VL_UINT8 *)dst_line + dst->geom.bytes_per_line;
}
if ( !dst_swap_b ) { /* More ugliness */
@@ -527,8 +531,8 @@ static void VIDEOLIBConvertRGBToRGB( VL_IMAGE *src, VL
*(p++) = (*src16 >> 8) | (*src16 << 8);
src16++;
}
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
- (VL_UINT8 *)src16 += dst->geom.bytes_per_line;
+ dst_line = (VL_UINT8 *)dst_line + dst->geom.bytes_per_line;
+ src16 = (VL_UINT8 *)src16 + dst->geom.bytes_per_line;
}
}
}