X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=86492ac899888ca83724870fa71201836b87d615;hb=b3134f44d76cdb2edfb86ae72e2ac4a6190ef375;hp=66b2ed7f92b30e372a3141f82875efc7db174518;hpb=1e756a835e2fddd883b8475fe3b8f87230781163;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 66b2ed7f92..86492ac899 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -294,9 +294,6 @@ cmake-$(CMAKE_VERSION).tar.gz: cmake: cmake-$(CMAKE_VERSION).tar.gz $(EXTRACT_GZ) -#cmake: -# cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake - .cmake: cmake (cd $<; ./configure --prefix=$(PREFIX) && make && make install) touch $@ @@ -402,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 $@ @@ -423,6 +420,10 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz ifdef HAVE_WIN64 patch -p0 < Patches/libiconv-win64.patch endif +ifdef HAVE_WINCE + patch -p0 < Patches/libiconv-wince.patch + patch -p0 < Patches/libiconv-wince-hack.patch +endif libiconv-snowleopard.tar.bz2: $(WGET) $(LIBICONVMAC_URL) @@ -433,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: @@ -498,11 +499,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz $(EXTRACT_GZ) .freetype: freetype2 -ifdef HAVE_CYGWIN - (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install) -else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) -endif $(INSTALL_NAME) touch $@ @@ -561,9 +558,7 @@ libmpeg2-$(LIBMPEG2_VERSION).tar.gz: libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WINCE patch -p0 < Patches/libmpeg2-arm-pld.patch -endif cd libmpeg2 && patch -p0 < ../Patches/libmpeg2-mc-neon.patch cd libmpeg2 && ./bootstrap @@ -718,9 +713,7 @@ libvorbis-$(VORBIS_VERSION).tar.gz: libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WINCE patch -p0 < Patches/vorbis-noapps.patch -endif .vorbis: libvorbis .ogg (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -1042,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." @@ -1069,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 @@ -1141,8 +1135,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** # libdvdread: We use dvdnav's dvdread # *************************************************************************** - - libdvdread: $(SVN) co $(LIBDVDREAD_SVN) libdvdread (cd $@; patch -p 0 < ../Patches/libdvdread.patch) @@ -2170,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 @@ -2180,11 +2172,17 @@ DISTCLEAN_PKG += win32-dx7headers.tgz # ************************************************************************* dshow-headers.tgz: $(WGET) $(DSHOW_HEADERS_URL) -.dshow_headers: dshow-headers.tgz - (cd ../include ; tar xzf ../src/$<) + +dxva2api.h: + $(WGET) $(DXVA2_URL) + +.dshow_headers: dshow-headers.tgz dxva2api.h + tar xzf $< -C $(PREFIX)/include + cp dxva2api.h $(PREFIX)/include touch $@ + CLEAN_FILE += .dshow_headers -DISTCLEAN_PKG += dshow-headers.tgz +DISTCLEAN_PKG += dshow-headers.tgz dxva2api.h # *************************************************************************** # libexpat @@ -2295,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 @@ -2356,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 @@ -2399,8 +2398,6 @@ liboil: liboil-$(OIL_VERSION).tar.gz patch -d liboil -p1 < Patches/liboil-Xcompile.patch (cd $@; autoreconf) - - .liboil: liboil ifdef HAVE_DARWIN_OS (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)") @@ -2433,7 +2430,7 @@ CLEAN_PKG += schroedinger DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz # *************************************************************************** -# ASS library +# libass # *************************************************************************** libass-$(ASS_VERSION).tar.bz2: @@ -2487,9 +2484,9 @@ CLEAN_FILE += .libupnp CLEAN_PKG += libupnp DISTCLEAN_PKG += libupnp-$(UPNP_VERSION).tar.bz2 -# ********* +# *************************************************************************** # GSM -# ********* +# *************************************************************************** gsm-$(GSM_VERSION).tar.gz: $(WGET) $(GSM_URL) @@ -2512,23 +2509,46 @@ 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 $