From: Eric Petit <titer@videolan.org>
Date: Tue, 14 Feb 2006 13:48:43 +0000 (+0000)
Subject: FFmpeg forgets to create include/postproc/
X-Git-Tag: 0.9.0-test0~12341
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8cf1cce67373ec9628323b5bec1d065f20844351;p=vlc

FFmpeg forgets to create include/postproc/
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 76e1d3f550..b32df86db6 100644
--- 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 c6beca02d7..a729ccbb1a 100644
--- 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