contrib: fix clean-up of libprojectM files

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9d55274ff5f04d525645dcfc1db836c57aa4661d..313040122f0b369f481ac1a850445efcf90068a8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -399,7 +399,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd ../include; sed -i.orig '311 c #if 0' libintl.h)
+       (cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -434,7 +434,7 @@ libiconv-snowleopard: libiconv-snowleopard.tar.bz2
 ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_10
 .iconv: libiconv-snowleopard
-       (cd libiconv-snowleopard && cp libiconv.* ../../lib/)
+       (cd libiconv-snowleopard && cp libiconv.* $(PREFIX)/lib/)
        touch $@
 else
 .iconv:
@@ -1035,6 +1035,7 @@ ifdef HAVE_UCLIBC
 endif
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
+       (cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
 endif
 ifdef NO_TEXT_RELOCATION
        echo "Broken LD. Fix your tools."
@@ -1062,7 +1063,7 @@ FFMPEGCONF += \
        --disable-protocols \
        --disable-network
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=ac3 --enable-libmp3lame --enable-w32threads
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
 else
 FFMPEGCONFG += --enable-pthreads
 endif
@@ -2161,7 +2162,7 @@ DISTCLEAN_PKG += dirac-$(DIRAC_VERSION).tar.gz
 win32-dx7headers.tgz:
        $(WGET) $(DX_HEADERS_URL)
 .dx_headers: win32-dx7headers.tgz
-       (cd ../include ; tar xzf ../src/$<)
+       tar xzf $< -C $(PREFIX)/include
        touch $@
 CLEAN_FILE += .dx_headers
 DISTCLEAN_PKG += win32-dx7headers.tgz
@@ -2176,8 +2177,8 @@ dxva2api.h:
        $(WGET) $(DXVA2_URL)
 
 .dshow_headers: dshow-headers.tgz dxva2api.h
-       (cd ../include ; tar xzf ../src/$<)
-       (cp dxva2api.h ../include)
+       tar xzf $< -C $(PREFIX)/include
+       cp dxva2api.h $(PREFIX)/include
        touch $@
 
 CLEAN_FILE += .dshow_headers
@@ -2292,7 +2293,7 @@ DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz
 # **************************************************************************
 
 .aclocal:
-       cp -R $(PREFIX)/share/aclocal/* $(PREFIX)/../../m4/
+       cp -R $(PREFIX)/share/aclocal/* ../../../m4/
        touch $@
 
 CLEAN_FILE += .aclocal
@@ -2353,7 +2354,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .ncurses: ncurses
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-debug --enable-widec --without-develop --without-shared && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=/usr --without-debug --enable-widec --without-develop --without-shared && make -C ncurses && make -C include && make -C ncurses DESTDIR=$(PREFIX) install && make -C include DESTDIR=$(PREFIX) install)
+       (cp -R $(PREFIX)/usr/* $(PREFIX) && rm -rf $(PREFIX)/usr)
        touch $@
 
 CLEAN_FILE += .ncurses
@@ -2507,28 +2509,51 @@ CLEAN_FILE += .gsm
 CLEAN_PKG += gsm
 DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
 
+# ***************************************************************************
+### GLEW 
+# ***************************************************************************
+glew-$(GLEW_VERSION)-src.tgz:
+       $(WGET) $(GLEW_URL)
+
+glew: glew-$(GLEW_VERSION)-src.tgz
+       $(EXTRACT_GZ)
+       (patch -p0 < Patches/glew-win32.patch)
+
+.glew: glew
+       (cd $<; $(HOSTCC) CFLAGS="$(CFLAGS) -DGLEW_STATIC" make && $(HOSTCC) GLEW_DEST=$(PREFIX) make install)
+ifdef HAVE_WIN32
+       rm -rf $(PREFIX)/lib/libglew32.dll*
+endif
+       touch $@
+
+CLEAN_FILE += .glew
+CLEAN_PKG += glew
+DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz
+
+
 # ***************************************************************************
 # 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
+       patch -p0 < Patches/libprojectM-win32.patch
+       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)
+.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)
+ifdef HAVE_WIN32
+       (cd $<;cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib)
+endif
        touch $@
 
 CLEAN_FILE += .libprojectM
 CLEAN_PKG += libprojectM
-DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
 
 # ***************************************************************************
 # X11 C Bindings
@@ -2617,6 +2642,7 @@ regex: regex-$(REGEX_VERSION).tar.gz
 
 .regex: regex
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make subirs= && $(AR) ru libregex.a regex.o && $(RANLIB) libregex.a && cp -v regex.h $(PREFIX)/include && cp -v libregex.a $(PREFIX)/lib )
+       touch $@
 
 CLEAN_FILE += .regex
 CLEAN_PKG += regex
@@ -2633,6 +2659,7 @@ sqlite-$(SQLITE_VERSION): sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 
 .sqlite3: sqlite-$(SQLITE_VERSION)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install )
+       touch $@
 
 CLEAN_FILE += .sqlite3
 CLEAN_PKG += sqlite-$(SQLITE_VERSION)