[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Fix bktr build on DragonFly.

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e7a9942c53f
branches:  trunk
changeset: 565422:8e7a9942c53f
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Tue Sep 22 16:46:50 2009 +0000

description:
Fix bktr build on DragonFly.

Patch from Steve O'Hara-Smith from pkgsrc-users.

diffstat:

 multimedia/ffmpeg/distinfo           |   4 ++--
 multimedia/ffmpeg/patches/patch-bktr |  15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r b99fc6a30fca -r 8e7a9942c53f multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Tue Sep 22 15:57:50 2009 +0000
+++ b/multimedia/ffmpeg/distinfo        Tue Sep 22 16:46:50 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2009/09/20 08:13:21 ahoka Exp $
+$NetBSD: distinfo,v 1.30 2009/09/22 16:46:50 ahoka Exp $
 
 SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
 Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
 SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
-SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
+SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b
 SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
 SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a
diff -r b99fc6a30fca -r 8e7a9942c53f multimedia/ffmpeg/patches/patch-bktr
--- a/multimedia/ffmpeg/patches/patch-bktr      Tue Sep 22 15:57:50 2009 +0000
+++ b/multimedia/ffmpeg/patches/patch-bktr      Tue Sep 22 16:46:50 2009 +0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-bktr,v 1.2 2009/06/12 16:25:34 ahoka Exp $
-
---- libavdevice/bktr.c.orig    2009-01-19 16:46:40.000000000 +0100
-+++ libavdevice/bktr.c
+--- libavdevice/bktr.c.orig    2009-01-19 15:46:40 +0000
++++ libavdevice/bktr.c 2009-09-21 11:29:29 +0000
 @@ -24,7 +24,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
@@ -14,3 +12,12 @@
  #include "libavformat/avformat.h"
  #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
  # include <dev/bktr/ioctl_meteor.h>
+@@ -32,7 +36,7 @@
+ #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
+ # include <machine/ioctl_meteor.h>
+ # include <machine/ioctl_bt848.h>
+-#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H
++#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H
+ # include <dev/video/meteor/ioctl_meteor.h>
+ # include <dev/video/bktr/ioctl_bt848.h>
+ #elif HAVE_DEV_IC_BT8XX_H