* Lets use the final version of goom2k4

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 478e4e766f1a3c70408e52e2218c3d8580c74e76..08eb0368573b5b33298f2d98e8ac94987c88aa67 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -834,19 +834,21 @@ DISTCLEAN_PKG += live.$(LIVEDOTCOM_VERSION).tar.gz
 # goom2k4
 # ***************************************************************************
 
-goom2k4-$(GOOM2k4_VERSION).tar.gz:
+goom$(GOOM2k4_VERSION).tar.gz:
        $(WGET) $(GOOM2k4_URL)
+       mv goom-$(GOOM2k4_VERSION)-src.tar.gz goom$(GOOM2k4_VERSION).tar.gz
 
-goom: goom2k4-$(GOOM2k4_VERSION).tar.gz
+goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/goom.patch
 
 .goom2k4: goom
-       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -faltivec" && make && make install )
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install )
        touch $@
 
 CLEAN_FILE += .goom2k4
 CLEAN_PKG += goom
-DISTCLEAN_PKG += goom2k4-$(GOOM2k_VESION).tar.gz
+DISTCLEAN_PKG += goom$(GOOM2k_VESION).tar.gz
 
 # ***************************************************************************
 # libcaca

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 054fb1ee528a9e9e8e6cfca06814a0dfc77f38a3..970bf9783c97c4813737ff909fd19483c42bb0c6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -91,8 +91,8 @@ LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_
 LIVEDOTCOM_VERSION=2004.11.11a
 LIVEDOTCOM_URL=$(VIDEOLAN)/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
 #GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
-GOOM2k4_VERSION=dev21
-GOOM2k4_URL=$(SF)/goom/goom2k4-$(GOOM2k4_VERSION).tar.gz
+GOOM2k4_VERSION=2k4-0
+GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDTS_VERSION=0.0.2