From 41ee4f73987ce6125398e853596702db5f2661e0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Mon, 9 Aug 2010 12:18:42 +0200 Subject: [PATCH] Contribs: update projectm to 2.0.1 --- extras/contrib/src/Makefile | 6 +++--- extras/contrib/src/packages.mak | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 7018976600..d9d0dbddc4 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -2468,15 +2468,15 @@ DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz # *************************************************************************** # projectM # *************************************************************************** -libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz: +projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz: $(WGET) $(LIBPROJECTM_URL) -libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz +libprojectM: projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz rm -rf $@ || true gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true patch -p0 < Patches/libprojectM-win32.patch - cd $@; rm CMakeCache.txt + -cd $@; rm CMakeCache.txt .libprojectM: libprojectM .glew (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install) diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index aba6ba04d3..1a70029db7 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -233,8 +233,8 @@ XCB_UTIL_VERSION=0.2 XCB_UTIL_URL=$(XCB_URL) GLEW_VERSION=1.5.1 GLEW_URL=$(SF)/glew/glew/$(GLEW_VERSION)/glew-$(GLEW_VERSION)-src.tgz -LIBPROJECTM_VERSION=2.0.0 -LIBPROJECTM_URL=$(SF)/projectm/libprojectM/libprojectM-$(LIBPROJECTM_VERSION)/libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz +LIBPROJECTM_VERSION=2.0.1 +LIBPROJECTM_URL=$(SF)/projectm/$(LIBPROJECTM_VERSION)/projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz LIBPROJECTM_SVN=https://projectm.svn.sourceforge.net/svnroot/projectm/trunk PEFLAGS_URL=$(CONTRIB_VIDEOLAN) SQLITE_VERSION=3.6.20 -- 2.39.2