head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.6 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.4 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.2 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.2 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.4.0.4 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.3.0.8 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.2.0.2 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.1.0.8 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.6 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.4 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.2 cube-native-xorg-base:1.1; locks; strict; comment @# @; 1.6 date 2011.07.19.19.53.18; author drochner; state dead; branches; next 1.5; 1.5 date 2011.01.17.16.51.05; author drochner; state Exp; branches; next 1.4; 1.4 date 2010.09.05.22.55.24; author wiz; state Exp; branches; next 1.3; 1.3 date 2009.09.22.16.46.50; author ahoka; state Exp; branches; next 1.2; 1.2 date 2009.06.12.16.25.34; author ahoka; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2008.09.07.23.39.38; author ahoka; state Exp; branches; next ; 1.2.2.1 date 2009.09.28.08.08.31; author spz; state Exp; branches; next ; desc @@ 1.6 log @update to 0.7.1 changes: many new features and bugfixes (those of the 0.8 branch), but API/ABI compatible with 0.6 @ text @$NetBSD: patch-bktr,v 1.5 2011/01/17 16:51:05 drochner Exp $ --- libavdevice/bktr.c.orig 2010-03-31 08:30:55.000000000 +0900 +++ libavdevice/bktr.c 2011-01-05 16:58:47.000000000 +0900 @@@@ -24,8 +24,12 @@@@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* u_short, u_int */ #define _BSD_SOURCE 1 -#define _NETBSD_SOURCE + #define _BSD_SOURCE 1 +#ifdef __NetBSD__ +# define _NETBSD_SOURCE 1 +#endif #include "libavformat/avformat.h" #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H @ 1.5 log @update to 20101018.0.6.1, from Makoto Fujiwara per pkgsrc-wip, with two changes by me: -disabled symbol versioning - this didn't work correctly for me -changed PKGVERSION to start with the release date, so that it sorts correctly against the snapshots we had before vlc-1.0.6 does still build, but can be updated now @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Add RCS Id. @ text @d3 3 a5 3 --- 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 @@@@ d11 2 d16 1 a18 10 # include @@@@ -32,7 +36,7 @@@@ #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H # include # include -#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 # include #elif HAVE_DEV_IC_BT8XX_H @ 1.3 log @Fix bktr build on DragonFly. Patch from Steve O'Hara-Smith from pkgsrc-users. @ text @d1 2 @ 1.2 log @Update to nightly the snapshot as of 2009-06-11. Also modularize a bit, so we can have a separate ffplay package. Too many changes to list them. @ text @d1 2 a2 4 $NetBSD$ --- libavdevice/bktr.c.orig 2009-01-19 16:46:40.000000000 +0100 +++ libavdevice/bktr.c d15 9 @ 1.2.2.1 log @Pullup ticket 2902 - requested by tron security patch Revisions pulled up: - pkgsrc/multimedia/ffmpeg/Makefile by patch - pkgsrc/multimedia/ffmpeg/distinfo by patch - pkgsrc/multimedia/ffmpeg/options.mk by patch - pkgsrc/multimedia/ffmpeg/patches/patch-bktr by patch - pkgsrc/multimedia/ffmpeg/patches/patch-configure by patch Files added: pkgsrc/multimedia/ffmpeg/patches/patch-aa 1.9 pkgsrc/multimedia/ffmpeg/patches/patch-ab 1.6 pkgsrc/multimedia/ffmpeg/patches/patch-powerpc 1.6 ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Fri Sep 25 11:10:21 UTC 2009 Modified Files: pkgsrc/multimedia/ffmpeg: Makefile distinfo Added Files: pkgsrc/multimedia/ffmpeg/patches: patch-ab Log Message: Add patch from ffmpeg GIT repository to fix the vulnerability reported in SA36760. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/ffmpeg/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg/distinfo cvs rdiff -u -r0 -r1.6 pkgsrc/multimedia/ffmpeg/patches/patch-ab @ text @d1 4 a4 2 --- libavdevice/bktr.c.orig 2009-01-19 15:46:40 +0000 +++ libavdevice/bktr.c 2009-09-21 11:29:29 +0000 a16 9 @@@@ -32,7 +36,7 @@@@ #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H # include # include -#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 # include #elif HAVE_DEV_IC_BT8XX_H @ 1.1 log @Track FreeBSD's SVN snapshots of ffmpeg as there are no more stable releases produced by the ffmpeg team. Add v4l2 support for NetBSD. @ text @d3 1 a3 1 --- libavdevice/bktr.c.orig 2008-06-03 18:20:54.000000000 +0200 d5 12 a16 9 @@@@ -31,7 +31,7 @@@@ #elif defined (HAVE_MACHINE_IOCTL_METEOR_H) && defined (HAVE_MACHINE_IOCTL_BT848_H) # include # include -#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H) +#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H) # include # include #elif HAVE_DEV_IC_BT8XX_H @