[vlc-commits] contribs: goom2k4: don't build mac application

[Rafaël Carré]

vlc/vlc-1.1 | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 22:56:07 2010 +0100| [a3a90325064100063aaa3ab8397f86c61256c331] | committer: Jean-Baptiste Kempf

contribs: goom2k4: don't build mac application

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/contrib/src/Makefile                  |    3 +++
 extras/contrib/src/Patches/goom2k4-osx.patch |   11 +++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7ade202..dae12f9 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1321,6 +1321,9 @@ else
 endif
 	patch -p0 < Patches/goom2k4-0-memleaks.patch
 	patch -p0 < Patches/goom2k4-autotools.patch
+ifdef HAVE_DARWIN
+	patch -p0 < Patches/goom2k4-osx.patch
+endif
 	(cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
 
 .goom2k4: goom
diff --git a/extras/contrib/src/Patches/goom2k4-osx.patch b/extras/contrib/src/Patches/goom2k4-osx.patch
new file mode 100644
index 0000000..1ab4db1
--- /dev/null
+++ b/extras/contrib/src/Patches/goom2k4-osx.patch
@@ -0,0 +1,11 @@
+--- goom/configure.in.orig	2010-11-01 00:05:11.000000000 +0100
++++ goom/configure.in	2010-11-01 00:05:16.000000000 +0100
+@@ -43,8 +43,6 @@
+ dnl HOST
+ case "$host" in
+ *-apple-darwin*)
+-	MACTARGET="yes"
+-	MACFOLDER="mac"
+ 	AC_SUBST(MACFOLDER)
+   	CCAS='$(CC)'
+   	AC_SUBST(CCAS)