]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Contrib: remove patch unneeded for Windows
[vlc] / extras / contrib / src / Makefile
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4601755004750a2219c939a8a8ba962915d274b9..e0d7509a697800bf4a8781cd363012abed1ae355 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:
@@ -1023,7 +1023,11 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # ***************************************************************************
 
 ifdef SVN
-ffmpeg:
+ifdef HAVE_WIN32
+ffmpeg: .dshow_headers
+else
+ffmpeg: 
+endif
        $(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
@@ -1034,7 +1038,6 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
 ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
        (cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
 endif
 ifdef NO_TEXT_RELOCATION
@@ -1063,7 +1066,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
@@ -1937,8 +1940,8 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
        $(EXTRACT_GZ)
 
 .gecko: gecko-sdk
-       rm -rf ../gecko-sdk
-       mv gecko-sdk ..
+       rm -rf $(PREFIX)/gecko-sdk
+       mv gecko-sdk $(PREFIX)
        mkdir gecko-sdk #creating an empty dir is faster than copying the whole dir
        (cd $<)
        touch $@
@@ -1962,11 +1965,11 @@ glib-19990228.zip:
 
 .gecko-win32: gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
        unzip gecko-sdk-i586-pc-msvc-1.8b1.zip
-       rm -rf ../gecko-sdk
-       mv gecko-sdk ..
-       unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d ../gecko-sdk/bin
-       unzip glib-19990228.zip glib-1.2.dll -d ../gecko-sdk/bin
-       chmod a+x ../gecko-sdk/bin/*
+       rm -rf $(PREFIX)/gecko-sdk
+       mv gecko-sdk $(PREFIX)
+       unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d $(PREFIX)/gecko-sdk/bin
+       unzip glib-19990228.zip glib-1.2.dll -d $(PREFIX)/gecko-sdk/bin
+       chmod a+x $(PREFIX)/gecko-sdk/bin/*
        touch $@
 
 CLEAN_FILE += .gecko-win32
@@ -2125,13 +2128,10 @@ dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
-       patch -p0 <Patches/dirac-cygwin.patch
+       patch -p0 < Patches/dirac-cygwin.patch
 endif
-ifndef HAVE_DARWIN_OS
-       (cd $@; aclocal -I m4 && autoconf && automake)
-else
+       patch -p0 < Patches/dirac-noutils.patch
        (cd $@; ./bootstrap)
-endif
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2162,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
@@ -2177,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
@@ -2293,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
@@ -2354,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
@@ -2419,9 +2420,10 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/schroedinger-notests.patch
 
 .schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gstreamer --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make -C schroedinger && make -C schroedinger install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger
@@ -2508,28 +2510,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
@@ -2618,6 +2643,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
@@ -2634,6 +2660,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)
Unnamed repository; edit this file 'description' to name the repository.