[vlc-commits] commit: contribs: goom2k4 ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 21:45:27 2010 +0100| [e1aec8ff333c21e349803d18f379b77e3513f32f] | committer: Rafaël Carré 

contribs: goom2k4

Don't patch a file which we'll delete
Use ACLOCAL_AMFLAGS to point aclocal to m4/

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

 extras/contrib/src/Patches/goom2k4-autotools.patch |   21 ++++++-------------
 extras/contrib/src/contrib-src.mak                 |    2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/extras/contrib/src/Patches/goom2k4-autotools.patch b/extras/contrib/src/Patches/goom2k4-autotools.patch
index 335257d..62b7ad8 100644
--- a/extras/contrib/src/Patches/goom2k4-autotools.patch
+++ b/extras/contrib/src/Patches/goom2k4-autotools.patch
@@ -1,17 +1,3 @@
-diff -ru goom2k4-0/configure goom/configure
---- goom2k4-0/configure	Mon Feb  7 14:49:28 2005
-+++ goom/configure	Wed Feb 23 16:03:25 2005
-@@ -21069,8 +21069,8 @@
- 
- case "$host" in
- *-apple-darwin*)
--	MACTARGET="yes"
--	MACFOLDER="mac"
-+	MACTARGET="no"
-+	MACFOLDER=""
- 
-   	CCAS='$(CC)'
- 
 --- goom/src/Makefile.am	2005-02-07 14:46:41.000000000 +0100
 +++ goom.new/src/Makefile.am	2009-08-19 09:21:57.000000000 +0200
 @@ -16,7 +16,7 @@
@@ -23,3 +9,10 @@ diff -ru goom2k4-0/configure goom/configure
  libgoom2_la_LDFLAGS = -export-dynamic -export-symbols-regex "goom.*" 
  libgoom2_la_SOURCES = \
  	goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
+--- goom/Makefile.am.orig	2010-10-31 21:43:45.514184001 +0100
++++ goom/Makefile.am	2010-10-31 21:44:01.382194251 +0100
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src xmms-goom sdl-goom @MACFOLDER@
+ 
+ #.pc file
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index d1d8373..521f793 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1346,7 +1346,7 @@ else
 endif
 	patch -p0 < Patches/goom2k4-0-memleaks.patch
 	patch -p0 < Patches/goom2k4-autotools.patch
-	(cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
+	(cd $@; rm -f configure; autoreconf -ivf)
 
 .goom2k4: goom
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)