diff options
| author | tron <tron> | 2006-06-30 18:11:39 +0000 |
|---|---|---|
| committer | tron <tron> | 2006-06-30 18:11:39 +0000 |
| commit | 0cfeba72aef37166b8ef44648edba0d58951ae61 (patch) | |
| tree | edd4cd27c55613faeb545c02e3046dd5c31dd3e5 /multimedia/fxtv | |
| parent | 70651b56d1e48505de3c5c51d7cbe74646296b48 (diff) | |
| download | pkgsrc-0cfeba72aef37166b8ef44648edba0d58951ae61.tar.gz | |
Avoid lvalue cast to make this compile with GCC 4.x.
Diffstat (limited to 'multimedia/fxtv')
| -rw-r--r-- | multimedia/fxtv/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/fxtv/patches/patch-ap | 43 |
2 files changed, 45 insertions, 1 deletions
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo index 68e81027f68..d203df670af 100644 --- a/multimedia/fxtv/distinfo +++ b/multimedia/fxtv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/01/03 15:03:02 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/06/30 18:11:39 tron Exp $ SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9 RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280 @@ -18,6 +18,7 @@ SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1 SHA1 (patch-am) = f88d368bc6f1adb41b7e4160d8e9138d230e8cd8 SHA1 (patch-an) = 8e26f893efd97fbdb6f42a7a7f67347bfedb9abe SHA1 (patch-ao) = 4cc7962af8a466a91d60fb751a369388e917548e +SHA1 (patch-ap) = 944d5f9db72ac6db41ed8be66cbdd151064ffbae SHA1 (patch-aq) = 86efd9f0d17b2e4b4270250aa5df9e05147fc824 SHA1 (patch-ba) = dc5276e31c2331f036e33b3e0fa321777c72eb1d SHA1 (patch-bb) = 1a6cc73078ac7587e6df9de6c3ec9930e498484e diff --git a/multimedia/fxtv/patches/patch-ap b/multimedia/fxtv/patches/patch-ap new file mode 100644 index 00000000000..668a9dbca74 --- /dev/null +++ b/multimedia/fxtv/patches/patch-ap @@ -0,0 +1,43 @@ +$NetBSD: patch-ap,v 1.1 2006/06/30 18:11:39 tron Exp $ + +--- videolib/videolib.c.orig 1999-11-03 02:22:04.000000000 +0000 ++++ videolib/videolib.c 2006-06-30 19:10:23.000000000 +0100 +@@ -479,9 +479,9 @@ + *(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; ++ (void)memset(p, 0, dst_line_pad); ++ dst_line = (VL_UINT16 *)((VL_UINT8 *)dst_line + ++ dst->geom.bytes_per_line); + } + + src16 = dst_line = (VL_UINT16 *) dst->buf; +@@ -513,9 +513,9 @@ + 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; ++ (void)memset(p, 0, dst_line_pad); ++ dst_line = (VL_UINT16 *)((VL_UINT8 *)dst_line + ++ dst->geom.bytes_per_line); + } + + if ( !dst_swap_b ) { /* More ugliness */ +@@ -527,8 +527,10 @@ + *(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_UINT16 *)((VL_UINT8 *)dst_line + ++ dst->geom.bytes_per_line); ++ src16 = (VL_UINT16 *)((VL_UINT8 *)src16 + ++ dst->geom.bytes_per_line); + } + } + } |