FFmpeg forgets to create include/postproc/

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 76e1d3f550db60744b5da304d17afaf5807cdd9a..b32df86db6156f77067aa98995c8e522a6b520bf 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -856,6 +856,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
        echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
        CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
+       (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch)
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-cvs.patch b/extras/contrib/src/Patches/ffmpeg-cvs.patch
index c6beca02d7fd212bf72a821dad74eef7186bd7cd..a729ccbb1a3035a5dbac9079db4bec0b32d2cb68 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg-cvs.patch
+++ b/extras/contrib/src/Patches/ffmpeg-cvs.patch
@@ -1,16 +1,15 @@
-Index: libavcodec/libpostproc/Makefile
+Index: Makefile
 ===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
-retrieving revision 1.26
-diff -u -r1.26 Makefile
---- libavcodec/libpostproc/Makefile    26 Sep 2005 10:05:13 -0000      1.26
-+++ libavcodec/libpostproc/Makefile    31 Oct 2005 20:23:34 -0000
-@@ -48,7 +48,7 @@
-       $(AR) rc $@ $(PPOBJS)
-       $(RANLIB) $@
+RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
+retrieving revision 1.99
+diff -u -r1.99 Makefile
+--- Makefile   13 Feb 2006 14:28:32 -0000      1.99
++++ Makefile   14 Feb 2006 13:39:47 -0000
+@@ -151,6 +151,7 @@
  
--install: all
-+installlib: all
- ifeq ($(BUILD_SHARED),yes)
- ifeq ($(CONFIG_WIN32),yes)
-       install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
+ install-headers:
+       install -d "$(incdir)"
++      install -d "$(prefix)/include/postproc"
+       install -d "$(libdir)/pkgconfig"
+       $(MAKE) -C libavutil   install-headers
+       $(MAKE) -C libavcodec  install-headers