Contribs: remove unneeded change of CFLAGS for win32

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ccbca85a812d8a8fde10fd2641fd0ac3ab854f3c..ce4574d2090fa392aa61ef33bf69264168ef5efd 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -376,9 +376,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/gettext-win32.patch
-endif
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/gettext-macosx.patch
 endif
@@ -392,18 +389,18 @@ endif
 ifneq ($(HOST),$(BUILD))
   ifndef HAVE_CYGWIN
     # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
-       ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+       ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
   else
     # We are compiling for MinGW on Cygwin -- build the full current gettext
-       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
   endif
 else
 # Build and install the whole gettext
-       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h)
+       (cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -693,7 +690,7 @@ libogg-$(OGG_VERSION).tar.gz:
 
 libogg: libogg-$(OGG_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/ogg.patch
+       patch -p0 < Patches/libogg-inttypes.patch
        patch -p0 < Patches/libogg-1.1.patch
 ifdef HAVE_WINCE
        patch -p0 < Patches/libogg-wince.patch
@@ -909,6 +906,50 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+
+# ***************************************************************************
+# libvp8
+# ***************************************************************************
+
+#ibvpx-$(VPX_VERSION).tar.bz2:
+#$(WGET) $(VPX_URL)
+
+libvpx: 
+       $(GIT) clone git://review.webmproject.org/libvpx.git
+ifdef HAVE_DARWIN_OS
+       patch -p0 < Patches/libvpx-darwin.patch
+endif
+
+ifdef HAVE_WIN32
+VPX_TARGET=x86-win32-gcc
+CROSS=
+else
+ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_64
+VPX_TARGET=x86_64-darwin9-gcc
+else
+ifdef HAVE_DARWIN_OS_ON_INTEL
+VPX_TARGET=x86-darwin9-gcc
+else
+VPX_TARGET=ppc32-darwin9-gcc
+endif
+endif
+else
+VPX_TARGET=FIXME
+endif
+endif
+
+.libvpx: libvpx
+       (cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install)
+       (rm -rf $(PREFIX)/include/vpx/ && mkdir $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install?
+       rm $(PREFIX)/include/vpx/config.h
+       (cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
+       touch $@
+
+CLEAN_FILE += .libvpx
+CLEAN_PKG += libvpx
+#DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
+
 # ***************************************************************************
 # lame
 # ***************************************************************************
@@ -936,16 +977,10 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
-endif
-ifdef HAVE_WIN64
-       patch -p0 < Patches/libebml-win64.patch
-endif
 
 .ebml: libebml
 ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
 else
        (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libebml.a
@@ -965,16 +1000,12 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p0 < ./Patches/libmatroska-kaxblock.patch
-ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
-endif
 
 .matroska: libmatroska .ebml
 ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
 else
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libmatroska.a
 endif
        touch $@
@@ -1069,9 +1100,9 @@ ifdef HAVE_WIN64
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 
 else
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx
 else
-FFMPEGCONFG += --enable-pthreads
+FFMPEGCONF += --enable-pthreads
 endif
 endif
 
@@ -1081,10 +1112,10 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
-.ffmpeg: ffmpeg .lame .gsm
+.ffmpeg: ffmpeg .lame .gsm .libvpx
 endif
 endif
-       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1287,7 +1318,7 @@ goom$(GOOM2k4_VERSION).tar.gz:
 goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
-       (cd $@; dos2unix configure.in)
+       (cd $@; fromdos configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 else
        patch -p0 < Patches/goom2k4-0-mmx.patch
@@ -1366,19 +1397,11 @@ x264:
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
-
 else
+x264:
+       echo "x264 snapshot is too old, you MUST use Git !"
+       exit -1
 
-x264: x264-$(X264_VERSION).tar.gz
-       $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-  ifndef HAVE_CYGWIN
-       (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch)
-  endif
-else
-       patch -p0 < Patches/x264.patch
-       rm x264/x264.c
-endif
 endif
 
 ifdef HAVE_WIN32
@@ -2232,7 +2255,7 @@ ifdef HAVE_CYGWIN
 endif
 
 .tag: taglib
-       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --enable-mp4 --enable-asf --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@