Contribs: use projectM 2.0.0

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9772704e78ce8373ee38338c98c0ad0ab9fb144a..689d3d8e5ecdc7ded73524e1d2d40e4ebecff39d 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2512,20 +2512,17 @@ DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
 # ***************************************************************************
 # projectM
 # ***************************************************************************
-ifdef SVN
-libprojectM:
-       $(SVN) co $(LIBPROJECTM_SVN) libprojectM
-       patch -d libprojectM -p0 < Patches/libprojectM-fpic.patch
-else
-libprojectM-$(LIBPROJECTM_VERSION).tar.bz2:
+libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
        $(WGET) $(LIBPROJECTM_URL)
 
-libprojectM: libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-endif
+libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
+       rm -rf $@ || true
+       gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
+       mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true
+       cd $@; rm CMakeCache.txt
 
 .libprojectM: libprojectM
-       (cd $</src; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DUSE_FBO:STRING=FALSE -DUSE_FBO:BOOL=OFF -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
+       (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DUSE_FBO:STRING=FALSE -DUSE_FBO:BOOL=OFF -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
        touch $@
 
 CLEAN_FILE += .libprojectM

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 27603d8e6d4e4482c44171f03100c619588d4d0b..c6be8911450c88e490f2789cbe09bbf3afe2ca5e 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -241,8 +241,8 @@ XCB_VERSION=1.2
 XCB_URL=http://xcb.freedesktop.org/dist/
 XCB_UTIL_VERSION=0.2
 XCB_UTIL_URL=$(XCB_URL)
-LIBPROJECTM_VERSION=1.2.0
-LIBPROJECTM_URL=$(SF)/projectm/libprojectM/libprojectM-$(LIBPROJECTM_VERSION)/libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+LIBPROJECTM_VERSION=2.0.0
+LIBPROJECTM_URL=$(SF)/projectm/libprojectM/libprojectM-$(LIBPROJECTM_VERSION)/libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
 LIBPROJECTM_SVN=https://projectm.svn.sourceforge.net/svnroot/projectm/trunk
 PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
 SQLITE_VERSION=3.6.20