diff options
author | dogcow <dogcow@pkgsrc.org> | 2006-06-15 21:58:55 +0000 |
---|---|---|
committer | dogcow <dogcow@pkgsrc.org> | 2006-06-15 21:58:55 +0000 |
commit | 62e062517c922a8cec8a3069a0d2d931bb932ce3 (patch) | |
tree | 1b5172f7752763d4f5069842ababaa1314dc5ebf | |
parent | c6aef9a94d3bd664b4201255a6d7f08edd87f40a (diff) | |
download | pkgsrc-62e062517c922a8cec8a3069a0d2d931bb932ce3.tar.gz |
hack around lvalue casting nonsense; mplayer now compiles with gcc4.
-rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-ad | 143 |
2 files changed, 145 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index b483c7d0747..5c18097cb3e 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2006/06/14 10:30:06 drochner Exp $ +$NetBSD: distinfo,v 1.30 2006/06/15 21:58:55 dogcow Exp $ SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921 RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 @@ -6,5 +6,6 @@ Size (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes SHA1 (patch-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 +SHA1 (patch-ad) = 4744bdb2ea6ffa1a18abaef5a9cf5756f3b8a645 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307 SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad new file mode 100644 index 00000000000..614bce7884b --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ad @@ -0,0 +1,143 @@ +$NetBSD: patch-ad,v 1.6 2006/06/15 21:58:55 dogcow Exp $ +--- libmpdemux/tvi_bsdbt848.c.orig 2006-06-15 14:41:49.000000000 -0700 ++++ libmpdemux/tvi_bsdbt848.c 2006-06-15 14:42:51.000000000 -0700 +@@ -178,6 +178,7 @@ tvi_handle_t *tvi_init_bsdbt848(char *de + + static int control(priv_t *priv, int cmd, void *arg) + { ++ int *bogus = (int *) arg; + switch(cmd) + { + +@@ -195,13 +196,13 @@ static int control(priv_t *priv, int cmd + return(TVI_CONTROL_FALSE); + } + +- (int)*(void **)arg = priv->tunerfreq; ++ *bogus = priv->tunerfreq; + return(TVI_CONTROL_TRUE); + } + + case TVI_CONTROL_TUN_SET_FREQ: + { +- priv->tunerfreq = (int)*(void **)arg; ++ priv->tunerfreq = *bogus; + + if(ioctl(priv->tunerfd, TVTUNER_SETFREQ, &priv->tunerfreq) < 0) + { +@@ -225,13 +226,13 @@ static int control(priv_t *priv, int cmd + return(TVI_CONTROL_FALSE); + } + +- (int)*(void **)arg = priv->input; ++ *bogus = priv->input; + return(TVI_CONTROL_TRUE); + } + + case TVI_CONTROL_SPC_SET_INPUT: + { +- priv->input = getinput((int)*(void **)arg); ++ priv->input = getinput(*bogus); + + if(ioctl(priv->btfd, METEORSINPUT, &priv->input) < 0) + { +@@ -250,17 +251,17 @@ static int control(priv_t *priv, int cmd + + case TVI_CONTROL_AUD_GET_FORMAT: + { +- (int)*(void **)arg = AF_FORMAT_S16_LE; ++ *bogus = AF_FORMAT_S16_LE; + return(TVI_CONTROL_TRUE); + } + case TVI_CONTROL_AUD_GET_CHANNELS: + { +- (int)*(void **)arg = 2; ++ *bogus = 2; + return(TVI_CONTROL_TRUE); + } + case TVI_CONTROL_AUD_SET_SAMPLERATE: + { +- int dspspeed = (int)*(void **)arg; ++ int dspspeed = *bogus; + + if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1) + { +@@ -279,12 +280,12 @@ static int control(priv_t *priv, int cmd + } + case TVI_CONTROL_AUD_GET_SAMPLERATE: + { +- (int)*(void **)arg = priv->dspspeed; ++ *bogus = priv->dspspeed; + return(TVI_CONTROL_TRUE); + } + case TVI_CONTROL_AUD_GET_SAMPLESIZE: + { +- (int)*(void **)arg = priv->dspsamplesize/8; ++ *bogus = priv->dspsamplesize/8; + return(TVI_CONTROL_TRUE); + } + +@@ -296,7 +297,7 @@ static int control(priv_t *priv, int cmd + + case TVI_CONTROL_TUN_SET_NORM: + { +- int req_mode = (int)*(void **)arg; ++ int req_mode = *bogus; + u_short tmp_fps; + + priv->iformat = METEOR_FMT_AUTOMODE; +@@ -381,19 +382,19 @@ static int control(priv_t *priv, int cmd + } + + case TVI_CONTROL_VID_GET_FORMAT: +- (int)*(void **)arg = IMGFMT_UYVY; ++ *bogus = IMGFMT_UYVY; + return(TVI_CONTROL_TRUE); + + case TVI_CONTROL_VID_SET_FORMAT: + { +- int req_fmt = (int)*(void **)arg; ++ int req_fmt = *bogus; + + if(req_fmt != IMGFMT_UYVY) return(TVI_CONTROL_FALSE); + + return(TVI_CONTROL_TRUE); + } + case TVI_CONTROL_VID_SET_WIDTH: +- priv->geom.columns = (int)*(void **)arg; ++ priv->geom.columns = *bogus; + + if(priv->geom.columns > priv->maxwidth) + { +@@ -409,11 +410,11 @@ static int control(priv_t *priv, int cmd + return(TVI_CONTROL_TRUE); + + case TVI_CONTROL_VID_GET_WIDTH: +- (int)*(void **)arg = priv->geom.columns; ++ *bogus = priv->geom.columns; + return(TVI_CONTROL_TRUE); + + case TVI_CONTROL_VID_SET_HEIGHT: +- priv->geom.rows = (int)*(void **)arg; ++ priv->geom.rows = *bogus; + + if(priv->geom.rows > priv->maxheight) + { +@@ -434,7 +435,7 @@ static int control(priv_t *priv, int cmd + return(TVI_CONTROL_TRUE); + + case TVI_CONTROL_VID_GET_HEIGHT: +- (int)*(void **)arg = priv->geom.rows; ++ *bogus = priv->geom.rows; + return(TVI_CONTROL_TRUE); + + case TVI_CONTROL_VID_GET_FPS: +@@ -443,7 +444,7 @@ static int control(priv_t *priv, int cmd + + /* + case TVI_CONTROL_VID_SET_FPS: +- priv->fps = (int)*(void **)arg; ++ priv->fps = *bogus; + + if(priv->fps > priv->maxfps) priv->fps = priv->maxfps; + |