Changeset 98622388c1b02f46c29fd7e46a1750396d3eae03

Show
Ignore:
Timestamp:
09/20/07 20:13:13 (1 year ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1190311993 +0000
git-parent:

[aa1fb87c4f81315a73bdd6e91ea51b92b0ef02fa]

git-author:
Rafaël Carré <funman@videolan.org> 1190311993 +0000
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    raa1fb87 r9862238  
    12281228    (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) 
    12291229else 
    1230     (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) 
     1230    (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) 
    12311231endif 
    12321232    touch $@ 

  • extras/contrib/src/Patches/goom2k4-0-win32.patch

    r7cc27cb r9862238  
    1 diff -ur goom.orig/configure.in goom/configure.in 
    2 --- goom.orig/configure.in 2007-09-20 17:16:48.000000000 +0200 
    3 +++ goom/configure.in   2007-09-20 17:17:36.000000000 +0200 
     1diff -Naur goom-orig/configure.in goom/configure.in 
     2--- goom-orig/configure.in 2005-02-07 14:46:41.000000000 +0100 
     3+++ goom/configure.in   2005-08-26 16:37:03.000000000 +0200 
    44@@ -1,6 +1,5 @@ 
    55 AC_INIT(README) 
    …… 
    99  
    1010 ACLOCAL="$ACLOCAL -I m4" 
    11 @@ -19,17 +18,13 @@ 
    12   
    13  dnl *** check for xmms *** 
    14   
    15 -AM_PATH_XMMS2(0.9.5.1, HAVE_XMMS="yes", HAVE_XMMS="no") 
    16 +HAVE_XMMS="no" 
    17  AM_CONDITIONAL(HAVE_XMMS,test "x$HAVE_XMMS" = "xyes") 
    18   
    19   
    20  dnl *** SDL *** 
    21   
    22 -if test "x$HAVE_XMMS" = "xyes"; then 
    23 -  AM_PATH_SDL2(1.2.0, HAVE_SDL="yes", HAVE_SDL="no"]) 
    24 -else 
    25 -  HAVE_SDL="no" 
    26 -fi 
    27 +HAVE_SDL="no" 
    28  AM_CONDITIONAL(HAVE_SDL,test "x$HAVE_SDL" = "xyes") 
    29   
    30   
    31 @@ -76,24 +71,7 @@ 
     11@@ -76,24 +75,7 @@ 
    3212 AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes") 
    3313  
    …… 
    5535 dnl rm -f mmx_zoom.s 
    5636 dnl    echo -n checking for nasm... 
    57 diff -ur goom2k4-0.orig/src/filters.c goom2k4-0/src/filters.c 
    58 --- goom.orig/src/filters.c   2005-02-07 14:46:41.000000000 +0100 
    59 +++ goom/src/filters.c  2007-09-20 17:17:11.000000000 +0200 
     37diff -Naur goom-orig/src/filters.c goom/src/filters.c 
     38--- goom-orig/src/filters.c   2005-02-07 14:46:41.000000000 +0100 
     39+++ goom/src/filters.c  2005-08-26 16:31:17.000000000 +0200 
    6040@@ -201,8 +201,8 @@ 
    6141     /* Noise */ 
    …… 
    6949      
    7050     /* Hypercos */ 
    71 diff -ur goom/src/goom_core.c goom/src/goom_core.c 
    72 --- goom/src/goom_core.c  2005-02-07 14:46:41.000000000 +0100 
    73 +++ goom/src/goom_core.c    2007-09-20 17:17:11.000000000 +0200 
     51diff -Naur goom-orig/src/goom_core.c goom/src/goom_core.c 
     52--- goom-orig/src/goom_core.c 2005-02-07 14:46:41.000000000 +0100 
     53+++ goom/src/goom_core.c    2005-08-26 16:33:01.000000000 +0200 
    7454@@ -40,11 +40,11 @@ 
    7555 static void init_buffers(PluginInfo *goomInfo, int buffsize)