[vlc-devel] commit: contrib: avoid Darwin patch on other systems ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Aug 29 17:45:12 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 18:43:25 2009 +0300| [ae83354aaebf532e050642f4f25ac84ed29bea2d] | committer: Rémi Denis-Courmont 

contrib: avoid Darwin patch on other systems

(cherry picked from commit 0e00a98ad167f869cdb995f457a9baa3903c2659)

Conflicts:

	extras/contrib/src/Makefile

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

 extras/contrib/src/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1475cde..4709b64 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1027,11 +1027,13 @@ endif
 ifdef HAVE_BEOS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 else
 	(cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
+endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch




More information about the vlc-devel mailing list