[vlc-devel] vlc: svn commit r22437 (funman)

[John Dalgliesh]

Hi,

On Thu, 4 Oct 2007 at 20:23 +0200, Subversion daemon wrote:
>
> r22437 | funman | 2007-10-04 20:23:08 +0200 (Thu, 04 Oct 2007) | 1 line
> Changed paths:
>   M /trunk/extras/contrib/src/Makefile
>
> contribs: don't build faad shared library
> > http://trac.videolan.org/vlc/changeset/22437

As far as I can tell, this change causes the Mac OS X (and probably BeOS) 
build to fail. It still tries to install a faad dynamic library - see the 
buildbot logs.

I've attached a patch which I believe should fix it. VLC then builds 
correctly and seems to run OK too. I tried playing an AAC file and it 
worked and said it used the 'faad' module.

That said I'm not 100% sure it's correct, please check it.


{P^/
John
-------------- next part --------------
Index: extras/contrib/src/Makefile
===================================================================
--- extras/contrib/src/Makefile	(revision 22470)
+++ extras/contrib/src/Makefile	(working copy)
@@ -879,7 +879,6 @@
 
 .faad: faad
 	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
-	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .faad