[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg fix bktr patch so at least it applies

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed29eb2533d1
branches:  trunk
changeset: 531607:ed29eb2533d1
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Thu Aug 02 21:51:52 2007 +0000

description:
fix bktr patch so at least it applies
compiling not tested

diffstat:

 multimedia/ffmpeg/files/bktr.diff |  15 ++++++++-------
 multimedia/ffmpeg/options.mk      |   4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r b8d2d74177f1 -r ed29eb2533d1 multimedia/ffmpeg/files/bktr.diff
--- a/multimedia/ffmpeg/files/bktr.diff Thu Aug 02 21:48:33 2007 +0000
+++ b/multimedia/ffmpeg/files/bktr.diff Thu Aug 02 21:51:52 2007 +0000
@@ -1,6 +1,6 @@
---- libavformat/Makefile.orig  2004-08-14 14:51:47.000000000 +0200
-+++ libavformat/Makefile       2004-08-14 14:52:43.000000000 +0200
-@@ -32,7 +32,7 @@
+--- libavformat/Makefile.orig
++++ libavformat/Makefile
+@@ -40,7 +40,7 @@
  OBJS+= framehook.o 
  
  ifeq ($(CONFIG_VIDEO4LINUX),yes)
@@ -9,12 +9,13 @@
  endif
  
  ifeq ($(CONFIG_DV1394),yes)
---- configure.org       2004-07-31 17:12:40.000000000 +0200
-+++ configure   2004-07-31 17:12:54.000000000 +0200
-@@ -231,6 +231,8 @@
+
+--- configure.orig
++++ configure
+@@ -301,6 +301,8 @@
  *) ;;
  esac
-
+ 
 +v4l="yes"
 +
  # From mplayer configure. We need TARGET_OS available
diff -r b8d2d74177f1 -r ed29eb2533d1 multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk      Thu Aug 02 21:48:33 2007 +0000
+++ b/multimedia/ffmpeg/options.mk      Thu Aug 02 21:51:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/06/19 00:23:51 joerg Exp $
+# $NetBSD: options.mk,v 1.5 2007/08/02 21:51:52 dbj Exp $
 
 # Global and legacy options
 
@@ -34,7 +34,7 @@
        ${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat
 
 post-patch:
-       ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
+       ${PATCH} -p0 --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
 #TODO
 #Update the documentation
 #      ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/ffmpeg.1.diff