From 3bfbbcdb54bb5d4443968d44a0582a225b499338 Mon Sep 17 00:00:00 2001
From: dbj <dbj>
Date: Thu, 2 Aug 2007 21:51:52 +0000
Subject: fix bktr patch so at least it applies compiling not tested

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

(limited to 'multimedia')

diff --git a/multimedia/ffmpeg/files/bktr.diff b/multimedia/ffmpeg/files/bktr.diff
index 690204aa74b..d3762993be2 100644
--- a/multimedia/ffmpeg/files/bktr.diff
+++ b/multimedia/ffmpeg/files/bktr.diff
@@ -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 --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index a3bc286df59..5110e7b0783 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -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 @@ post-extract:
 	${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
-- 
cgit v1.2.3