Contrib: further fixes of Goom2k4 Makefiles

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c8e4389fb4f2b6ae2fedc271f4ac17cb0ca92d84..c08482e7f112aad58de3dc64c93bc25955b96c92 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1327,9 +1327,6 @@ goom$(GOOM2k4_VERSION).tar.gz:
 
 goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/goom.patch
-endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
@@ -1337,13 +1334,11 @@ else
        patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
        patch -p0 < Patches/goom2k4-0-memleaks.patch
+       patch -p0 < Patches/goom.patch
+       (cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
 
 .goom2k4: goom
-ifdef HAVE_DARWIN_OS
-       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-else
-       (cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
-endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
        touch $@
 
 CLEAN_FILE += .goom2k4

diff --git a/extras/contrib/src/Patches/goom.patch b/extras/contrib/src/Patches/goom.patch
index 62efeccea72b7347b354f5759a7c69069e81fd8d..335257deb5d3e6f8eb9b5f9ad9b78909f0125f18 100644 (file)
--- a/extras/contrib/src/Patches/goom.patch
+++ b/extras/contrib/src/Patches/goom.patch
@@ -12,3 +12,14 @@ diff -ru goom2k4-0/configure goom/configure
  
        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 @@
+ goom2_libdir = $(libdir)
+ 
+ goom2_library_includedir=$(includedir)/goom
+-goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_tools.h goom_config.h
++goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_config.h
+ 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 \