diff options
| author | joerg <joerg> | 2006-02-02 08:18:04 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-02-02 08:18:04 +0000 |
| commit | 2fece101167445baf999bd48d67c8dca3c2dea4e (patch) | |
| tree | d0e37f94df12c4acc48a872fec206b7658341b4c /multimedia | |
| parent | 7605034a58bce9342d46dd78f4b93667ee6a4f26 (diff) | |
| download | pkgsrc-2fece101167445baf999bd48d67c8dca3c2dea4e.tar.gz | |
Sync grab_bsdbktr.c with multimedia/ffmpeg. Don't build v4l on DragonFly
if bktr is not active.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/grab_bsdbktr.c | 15 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/patches/patch-aa | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo index 66192f6c32a..6ac70cbf861 100644 --- a/multimedia/ffmpeg-devel/distinfo +++ b/multimedia/ffmpeg-devel/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2006/02/02 08:18:04 joerg Exp $ SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3 RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4 Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes -SHA1 (patch-aa) = 012e6330303c023884e8d9ab44d1d265c1e765f4 +SHA1 (patch-aa) = acc31f2c428411f912750e05703f5cad506c12bc SHA1 (patch-ab) = f596db3c555ab772eae2da5b8144c23fb4f2eaa0 SHA1 (patch-ac) = 2e7aa9021ddfe46cda35a9399e59f63848610d83 SHA1 (patch-ad) = 95eea8ef74a270a0c60243eff740aa3346efaaaf diff --git a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c b/multimedia/ffmpeg-devel/files/grab_bsdbktr.c index 8932d6364f9..8db64a678b5 100644 --- a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c +++ b/multimedia/ffmpeg-devel/files/grab_bsdbktr.c @@ -24,7 +24,22 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "avformat.h" +#if defined __DragonFly__ +#include <dev/video/meteor/ioctl_meteor.h> +#include <dev/video/bktr/ioctl_bt848.h> +#else +#if defined __FreeBSD__ +#if __FreeBSD__ >= 502100 +#include <dev/bktr/ioctl_meteor.h> +#include <dev/bktr/ioctl_bt848.h> +#else +#include <machine/ioctl_meteor.h> +#include <machine/ioctl_bt848.h> +#endif +#else #include <dev/ic/bt8xx.h> +#endif +#endif #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> diff --git a/multimedia/ffmpeg-devel/patches/patch-aa b/multimedia/ffmpeg-devel/patches/patch-aa index c75344bea88..924e3e97204 100644 --- a/multimedia/ffmpeg-devel/patches/patch-aa +++ b/multimedia/ffmpeg-devel/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/02/02 08:18:04 joerg Exp $ --- configure.orig 2004-11-28 16:56:25.000000000 +0100 +++ configure @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ extralibs="$extralibs -lsocket -lnsl" ;; -FreeBSD) -+FreeBSD|NetBSD) ++FreeBSD|NetBSD|DragonFly) v4l="no" audio_oss="yes" dv1394="no" |