Only install libswscale.pc and swscale headers when needed.
authorChristophe Mutricy <xtophe@videolan.org>
Tue, 3 Apr 2007 16:01:25 +0000 (16:01 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Tue, 3 Apr 2007 16:01:25 +0000 (16:01 +0000)
This is in the process to be submitted upstream

extras/contrib/src/Makefile
extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch [new file with mode: 0644]

index 434a27d..d221d3f 100644 (file)
@@ -908,6 +908,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
        $(SVN) export $(FFMPEG_SVN)  ffmpeg
        (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-nofile.patch)
+       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch b/extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
new file mode 100644 (file)
index 0000000..0aba944
--- /dev/null
@@ -0,0 +1,14 @@
+Index: Makefile
+===================================================================
+--- Makefile    (revision 8597)
++++ Makefile    (working copy)
+@@ -149,7 +149,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
+