Commit 98622388 authored by Rafaël Carré's avatar Rafaël Carré

contribs: Reverts [22188] for the goom patch, and use the included m4 files

parent aa1fb87c
......@@ -1227,7 +1227,7 @@ endif
ifdef HAVE_DARWIN_OS
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
else
(cd $< && rm -f configure; aclocal && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
(cd $< && rm -f configure; aclocal -Im4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
endif
touch $@
......
diff -ur goom.orig/configure.in goom/configure.in
--- goom.orig/configure.in 2007-09-20 17:16:48.000000000 +0200
+++ goom/configure.in 2007-09-20 17:17:36.000000000 +0200
diff -Naur goom-orig/configure.in goom/configure.in
--- goom-orig/configure.in 2005-02-07 14:46:41.000000000 +0100
+++ goom/configure.in 2005-08-26 16:37:03.000000000 +0200
@@ -1,6 +1,5 @@
AC_INIT(README)
......@@ -8,27 +8,7 @@ diff -ur goom.orig/configure.in goom/configure.in
AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
ACLOCAL="$ACLOCAL -I m4"
@@ -19,17 +18,13 @@
dnl *** check for xmms ***
-AM_PATH_XMMS2(0.9.5.1, HAVE_XMMS="yes", HAVE_XMMS="no")
+HAVE_XMMS="no"
AM_CONDITIONAL(HAVE_XMMS,test "x$HAVE_XMMS" = "xyes")
dnl *** SDL ***
-if test "x$HAVE_XMMS" = "xyes"; then
- AM_PATH_SDL2(1.2.0, HAVE_SDL="yes", HAVE_SDL="no"])
-else
- HAVE_SDL="no"
-fi
+HAVE_SDL="no"
AM_CONDITIONAL(HAVE_SDL,test "x$HAVE_SDL" = "xyes")
@@ -76,24 +71,7 @@
@@ -76,24 +75,7 @@
AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
......@@ -54,9 +34,9 @@ diff -ur goom.orig/configure.in goom/configure.in
dnl rm -f mmx_zoom.s
dnl echo -n checking for nasm...
diff -ur goom2k4-0.orig/src/filters.c goom2k4-0/src/filters.c
--- goom.orig/src/filters.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/filters.c 2007-09-20 17:17:11.000000000 +0200
diff -Naur goom-orig/src/filters.c goom/src/filters.c
--- goom-orig/src/filters.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/filters.c 2005-08-26 16:31:17.000000000 +0200
@@ -201,8 +201,8 @@
/* Noise */
if (data->noisify)
......@@ -68,9 +48,9 @@ diff -ur goom2k4-0.orig/src/filters.c goom2k4-0/src/filters.c
}
/* Hypercos */
diff -ur goom/src/goom_core.c goom/src/goom_core.c
--- goom/src/goom_core.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/goom_core.c 2007-09-20 17:17:11.000000000 +0200
diff -Naur goom-orig/src/goom_core.c goom/src/goom_core.c
--- goom-orig/src/goom_core.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/goom_core.c 2005-08-26 16:33:01.000000000 +0200
@@ -40,11 +40,11 @@
static void init_buffers(PluginInfo *goomInfo, int buffsize)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment