Contribs: Bump cmake version to 2.6.4 to enable build of libprojectM.

Contribs: build libprojectM trunk (fails for OSX for now).

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 980ceb5e6ef3f3c9aaa7ce2a4933b04e843f6e0f..b768838bf66d61d0b534ba6e83db61cc7fae53b0 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2500,6 +2500,27 @@ CLEAN_FILE += .gsm
 CLEAN_PKG += gsm
 DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
 
+# *********
+# projectM
+# *********
+ifdef SVN
+libprojectM:
+       $(SVN) co $(LIBPROJECTM_SVN) libprojectM
+else
+libprojectM-$(LIBPROJECTM_VERSION).tar.bz2:
+       $(WGET) $(LIBPROJECTM_URL)
+
+libprojectM: libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+endif
+
+.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 && make install)
+       touch $@
+
+CLEAN_FILE += .libprojectM
+CLEAN_PKG += libprojectM
+DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
 
 # ***************************************************************************
 # X11 C Bindings

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 1a19ad32b9340eb4e1c7711b2df57946838491ab..c39cf7d8e3300c50f8b9b79e159c5a252d3f3259 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -36,7 +36,7 @@ AUTOCONF_VERSION=2.63
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
 GNUMAKE_VERSION=3.81
 GNUMAKE_URL=$(GNU)/make/make-$(GNUMAKE_VERSION).tar.bz2
-CMAKE_VERSION=2.6.0
+CMAKE_VERSION=2.6.4
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.26
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
@@ -235,3 +235,6 @@ 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_SVN=https://projectm.svn.sourceforge.net/svnroot/projectm/trunk