diff options
| author | ahoka <ahoka@pkgsrc.org> | 2009-09-22 16:46:50 +0000 |
|---|---|---|
| committer | ahoka <ahoka@pkgsrc.org> | 2009-09-22 16:46:50 +0000 |
| commit | d16a1a080fcaf3fd593e467bd9fb6eca4c9b1adb (patch) | |
| tree | b87deae33b8996e5a7491b661a4f112957962992 /multimedia/ffmpeg | |
| parent | c7babe890ae2521914b734e7a37e3882c0484061 (diff) | |
| download | pkgsrc-d16a1a080fcaf3fd593e467bd9fb6eca4c9b1adb.tar.gz | |
Fix bktr build on DragonFly.
Patch from Steve O'Hara-Smith from pkgsrc-users.
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-bktr | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 73f917bea3a..a90141ac3fc 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -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 --git a/multimedia/ffmpeg/patches/patch-bktr b/multimedia/ffmpeg/patches/patch-bktr index f2586378296..132c62f933f 100644 --- a/multimedia/ffmpeg/patches/patch-bktr +++ b/multimedia/ffmpeg/patches/patch-bktr @@ -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 @@ $NetBSD: patch-bktr,v 1.2 2009/06/12 16:25:34 ahoka Exp $ #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 |