[vlc-devel] Extras/contrib faac patch patch...

[Mark Moriarty]

WinXP, Cygwin (new install this past week).
Extras/contrib has been failing on faac, apparently breaking on the patch.
I've tried multiple times over the last 24 hours, killing the faac zip file
and directory, deleting the existing faac patch, rebooting.  I keep getting
the following:

	make[2]: Entering directory `/home/mfm/vlc-trunk/extras/contrib/src'
	/usr/bin/wget -c
http://switch.dl.sourceforge.net/sourceforge/faac/faac-1.25.tar
	.gz
	--16:46:27--
http://switch.dl.sourceforge.net/sourceforge/faac/faac-1.25.tar.gz

	           => `faac-1.25.tar.gz'
	Resolving switch.dl.sourceforge.net... 130.59.138.20
	Connecting to switch.dl.sourceforge.net|130.59.138.20|:80...
connected.
	HTTP request sent, awaiting response... 200 OK
	Length: 386,608 (378K) [application/x-tar]

	100%[====================================>] 386,608      114.34K/s
ETA 00:00

	16:46:31 (114.07 KB/s) - `faac-1.25.tar.gz' saved [386608/386608]

	rm -rf faac || true
	gunzip -c faac-1.25.tar.gz | tar xf - --exclude='[*?:<>\|]'
	mv faac-1.25 faac || true
	mv: cannot stat `faac-1.25': No such file or directory    // Not
causing an issue -- the unzipped faac is being put in the directory faac OK
	touch faac
	patch -p0 < Patches/faac.patch
	patching file faac/bootstrap
	Hunk #1 FAILED at 1.
	1 out of 1 hunk FAILED -- saving rejects to file faac/bootstrap.rej
	make[2]: *** [faac] Error 1
	make[2]: Leaving directory `/home/mfm/vlc-trunk/extras/contrib/src'
	make[1]: *** [src] Error 2

The bootstrap.rej file is:
	***************
	*** 1,6 ****
	  #! /bin/sh
	  
	- aclocal -I .
	  autoheader
	  if test "`uname -s`" = Darwin; then
	      glibtoolize --automake
	--- 1,6 ----
	  #! /bin/sh
	  
	+ aclocal -I /usr/share/aclocal
	  autoheader
	  if test "`uname -s`" = Darwin; then
	      glibtoolize --automake

There's something that it just doesn't like, beats me why.
I ended up deleting some lines in the faac.patch file, now the build
continues OK.

Attached is my updated faac.patch. 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20070916/4d9f0f36/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: faac.patch
Type: application/octet-stream
Size: 250 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20070916/4d9f0f36/attachment.obj>