- added patches:

-  compile (newer ffmpeg?)
-  gcc4
-  am (automake (1.10?) complains about install-hook)

Changed files:
    avifile-am.patch -> 1.1
    avifile-compile.patch -> 1.1
    avifile-gcc4.patch -> 1.1

diff --git a/avifile-am.patch b/avifile-am.patch
new file mode 100644 (file)
index 0000000..2e90cc3
--- /dev/null
+++ b/avifile-am.patch
@@ -0,0 +1,27 @@
+--- avifile-0.7-0.7.45/include/Makefile.am.orig        2006-12-21 14:45:33.000000000 +0000
++++ avifile-0.7-0.7.45/include/Makefile.am     2006-12-21 14:46:08.000000000 +0000
+@@ -42,9 +42,3 @@
+ EXTRA_DIST = version.h.in
+ DISTCLEANFILES = version.h
+ MAINTAINERCLEANFILES = Makefile.in config.h.in stamp-h.in stamp-h1.in
+-
+-install-hook:
+-      ln -s $(pkgincludedir) $(pkgincludedir)/avifile
+-
+-#check_PROGRAMS = t
+-#t_SOURCES = t.cpp
+--- avifile-0.7-0.7.45/Makefile.am.orig        2006-12-21 15:09:37.000000000 +0000
++++ avifile-0.7-0.7.45/Makefile.am     2006-12-21 15:10:01.000000000 +0000
+@@ -26,12 +26,6 @@
+  config.log config.status configure.ac config.h.in confdefs.h libtool \
+  avifile-config avifile.spec avifile.pc stamp-h2.in
+ 
+-# Run ldconfig after installing the library:
+-install-hook:
+-      -ldconfig
+-
+-#install-exec-local:
+-#     $(INSTALL_SCRIPT) -m 0755 $(srcdir)/avifile-config $(DESTDIR)$(bindir)
+ .SILENT: help
+ 
+ help:

diff --git a/avifile-compile.patch b/avifile-compile.patch
new file mode 100644 (file)
index 0000000..c7639b6
--- /dev/null
+++ b/avifile-compile.patch
@@ -0,0 +1,22 @@
+--- avifile-0.7-0.7.45/plugins/libffmpeg/FFAudioDecoder.cpp.orig       2006-12-21 19:14:53.000000000 +0000
++++ avifile-0.7-0.7.45/plugins/libffmpeg/FFAudioDecoder.cpp    2006-12-21 19:15:23.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+       if (m_pFormat->cbSize > 0)
+       {
+-          m_pAvContext->extradata = (char*)(m_pFormat + 1);
++          m_pAvContext->extradata = (uint8_t*)(m_pFormat + 1);
+           m_pAvContext->extradata_size = m_pFormat->cbSize;
+       }
+ 
+--- avifile-0.7-0.7.45/plugins/libffmpeg/FFVideoDecoder.cpp.orig       2006-12-21 19:18:08.000000000 +0000
++++ avifile-0.7-0.7.45/plugins/libffmpeg/FFVideoDecoder.cpp    2006-12-21 19:19:09.000000000 +0000
+@@ -197,7 +197,7 @@
+          )
+       {
+             m_pAvContext->extradata_size = m_pFormat->biSize - sizeof(BITMAPINFOHEADER);
+-          m_pAvContext->extradata = (char*) m_pFormat + sizeof(BITMAPINFOHEADER);
++          m_pAvContext->extradata = (uint8_t*) m_pFormat + sizeof(BITMAPINFOHEADER);
+           if (m_pAvContext->extradata_size > 40)
+               m_pAvContext->flags |= CODEC_FLAG_EXTERN_HUFF; // somewhat useless
+       }

diff --git a/avifile-gcc4.patch b/avifile-gcc4.patch
new file mode 100644 (file)
index 0000000..b98f1fb
--- /dev/null
+++ b/avifile-gcc4.patch
@@ -0,0 +1,11 @@
+--- avifile-0.7-0.7.45/include/avm_map.h.orig  2006-12-21 17:37:39.000000000 +0000
++++ avifile-0.7-0.7.45/include/avm_map.h       2006-12-21 17:37:43.000000000 +0000
+@@ -45,7 +45,7 @@
+ 
+     template <class Key1, class Value1> struct binary_tree_node
+     {
+-      avm_map::pair<Key1, Value1>* entry;
++      pair<Key1, Value1>* entry;
+       binary_tree_node<Key1, Value1>* left;
+       Key1 minval;
+       binary_tree_node<Key1, Value1>* right;