From 49651c67bc7e950d56342cae1088eb78185216d1 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Sat, 30 Aug 2008 12:20:22 +0200
Subject: [PATCH] avifile: fixed to build with new ffmpeg version

---
 multimedia/avifile/avifile.conf     |  4 +++-
 multimedia/avifile/ffmpeg-api.patch | 37 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/avifile/ffmpeg-api.patch

diff --git a/multimedia/avifile/avifile.conf b/multimedia/avifile/avifile.conf
index ed58a64db..5cba9f6b3 100644
--- a/multimedia/avifile/avifile.conf
+++ b/multimedia/avifile/avifile.conf
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../avifile/avifile.conf
+# Copyright (C) 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -16,7 +17,8 @@ autogen=1
 
 # Prevent using the internal ffmpeg and use an external one instead.
 pkgprefix -t ffmpeg
-var_append GCC_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir ffmpeg)/ffmpeg"
+var_append GCC_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir ffmpeg)/libavformat"
+var_append GCC_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir ffmpeg)/libavcodec"
 
 # some addition to the patches to use the system ffmpeg
 var_append makeopt ' ' 'FF_LIB="-lavformat -lavcodec -lavutil"'
diff --git a/multimedia/avifile/ffmpeg-api.patch b/multimedia/avifile/ffmpeg-api.patch
new file mode 100644
index 000000000..b5be3e070
--- /dev/null
+++ b/multimedia/avifile/ffmpeg-api.patch
@@ -0,0 +1,37 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../avifile/ffmpeg-api.patch
+# Copyright (C) 2008 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur avifile-0.6-orig/lib/aviread/FFReadHandler.cpp avifile-0.6/lib/aviread/FFReadHandler.cpp
+--- avifile-0.6-orig/lib/aviread/FFReadHandler.cpp	2008-08-30 12:00:40.000000000 +0200
++++ avifile-0.6/lib/aviread/FFReadHandler.cpp	2008-08-30 12:03:32.000000000 +0200
+@@ -145,7 +145,7 @@
+ int FFReadHandler::seek(framepos_t pos)
+ {
+     Locker locker(m_Mutex);
+-    url_fseek(&m_pContext->pb, 0, SEEK_SET);
++    url_fseek(m_pContext->pb, 0, SEEK_SET);
+     flush();
+     //av_find_stream_info(m_pContext);
+     return 0;
+@@ -158,7 +158,7 @@
+     AVM_WRITE("FF reader", 5, "readPacket()\n");
+     if (av_read_packet(m_pContext, &pkt) < 0)
+     {
+-        if (!url_feof(&m_pContext->pb))
++        if (!url_feof(m_pContext->pb))
+ 	    AVM_WRITE("FF reader", "ffmpeg packet error and not eof??\n");
+         return -1;
+     }