[vlc-devel] commit: contribs: set ffmpeg to a fixed revision for easier maintenance and fix libgpg-error compilation on some Darwin installations ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Oct 27 22:35:09 2009 +0100| [c35e25f66956475d9d9a1893bdaf821f059e940e] | committer: Felix Paul Kühne 

contribs: set ffmpeg to a fixed revision for easier maintenance and fix libgpg-error compilation on some Darwin installations

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

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5afd1c8..b1bf1d5 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1052,7 +1052,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg
+	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 20342
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1836,11 +1836,8 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 
 .gpg-error: libgpg-error
-ifdef HAVE_DARWIN_OS_ON_INTEL
-	(cd $<; ./autogen.sh)
-endif
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared --disable-languages && make && make install)
-#	$(INSTALL_NAME)
+	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .gpg-error