[vlc-devel] commit: Fix contribs building for FFmpeg ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <rcarre at m2x.nl> | Mon May 19 10:11:46 2008 +0200| [aa32821d97fdc61e4ae9eea7b60ab34a9f8ce9c9]

Fix contribs building for FFmpeg

--
Rafaël Carré <rcarre at m2x.nl>

commit dc9057ec9b4bb41a74bb07197c64cee8c1976fe0
Author: Rafaël Carré <funman at videolan.org>
Date:   Mon May 19 10:08:04 2008 +0200

    Do not install swscale headers if it was not enabled

Signed-off-by: Jean-Paul Saman <jpsaman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa32821d97fdc61e4ae9eea7b60ab34a9f8ce9c9
---

 .gitignore                                         |    2 ++
 extras/contrib/src/Makefile                        |    1 +
 .../src/Patches/ffmpeg-swscale-headers.patch       |   14 ++++++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1401341..ff6b69e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ configure
 intl
 libtool
 Makefile
+!extras/contrib/Makefile
+!extras/contrib/src/Makefile
 Makefile.in
 stamp-*
 vlc-config
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8527b60..99d7469 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -926,6 +926,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN) -r 7407 ffmpeg
+	(cd $@; patch -p 0 < ../Patches/ffmpeg-swscale-headers.patch)
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-swscale-headers.patch b/extras/contrib/src/Patches/ffmpeg-swscale-headers.patch
new file mode 100644
index 0000000..17ea6ac
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-swscale-headers.patch
@@ -0,0 +1,14 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 7407)
++++ Makefile	(working copy)
+@@ -159,7 +159,9 @@
+ ifeq ($(CONFIG_PP),yes)
+ 	$(MAKE) -C libpostproc install-headers
+ endif
++ifeq ($(CONFIG_SWSCALER),yes)
+ 	$(MAKE) -C libswscale  install-headers
++endif
+ 
+ uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+