Contribs - remove unnecessary action.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8cae0eb477fcd58839cc1964368036fb883ab25b..cdea7206804129082178b647e7d5c156688e3743 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -133,7 +133,7 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --enable-pthreads --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders
+FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler
@@ -147,6 +147,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
 endif
 
+ifdef HAVE_DARWIN_9
+FFMPEGCONF += --disable-mmx
+endif
+
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -727,7 +731,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
 
 ifdef SVN
 tremor: 
-       $(SVN) export http://svn.xiph.org/trunk/Tremor tremor
+       $(SVN) co http://svn.xiph.org/trunk/Tremor tremor
        (cd $@ && patch -p0 < ../Patches/tremor.patch)
        (cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
 else
@@ -939,7 +943,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #ifdef SVN
 #libebml:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
 #else
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -978,7 +982,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #if SVN
 #libmatroska:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
 #else
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -1053,8 +1057,9 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-       $(SVN) export $(FFMPEG_SVN)  ffmpeg
-       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch)
+       $(SVN) co $(FFMPEG_SVN) ffmpeg
+       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \
+        patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1067,9 +1072,15 @@ endif
 ifdef HAVE_DARWIN_OS
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
+ifdef HAVE_DARWIN_9
+ifdef HAVE_DARWIN_OS_ON_INTEL
+       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
+endif
+endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
+       patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
 
 else
@@ -1114,7 +1125,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
 
 ifdef SVN
 libdvdcss: 
-       $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+       $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
        cd $@ && sh bootstrap
 else
 libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
@@ -1155,16 +1166,22 @@ CLEAN_FILE += .dvdread
 
 ifdef SVN
 libdvdnav:
-       $(SVN) export $(LIBDVDNAV_SVN)  libdvdnav
+       $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 else
-libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
        $(WGET) $(LIBDVDNAV_URL)
 
-libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+       $(EXTRACT_GZ)
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 endif
 
@@ -1209,26 +1226,14 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/live.patch
-ifdef HAVE_WIN32 
-       patch -p0 < Patches/livedotcom-win32.patch
-endif
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/live-osx.patch
-endif
-       patch -p0 < Patches/live-starttime.patch
+#Still needed 
        (cd live/liveMedia/include; \
                mv liveMedia_version.hh liveMedia_version.hh.bak; \
        sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT         9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh )
        patch -Np0 < Patches/live-config.patch
-ifdef HAVE_UCLIBC
        patch -p0 < Patches/live-noapps.patch
-endif
 
 .live: live
-ifdef HAVE_WIN32 
-       (cd $<;./genMakefiles mingw && make $(HOSTCC))
-else
 ifdef HAVE_DARWIN_OS
        (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
        (cd $<; ./genMakefiles macosx && make)
@@ -1241,7 +1246,6 @@ endif
 else
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
-endif
 endif
        touch $@
 
@@ -1348,10 +1352,13 @@ x264-$(X264_VERSION).tar.gz:
 
 ifdef SVN
 x264: 
-       $(SVN) export svn://svn.videolan.org/x264/trunk/ x264
+       $(SVN) co svn://svn.videolan.org/x264/trunk/ -r 701 x264
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
+ifdef HAVE_DARWIN_OS
+       (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
+endif
 else
 
 x264: x264-$(X264_VERSION).tar.gz
@@ -1720,7 +1727,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 
 #ifdef SVN
 #libraw1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \
@@ -1751,7 +1758,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 
 #ifdef SVN
 #libdc1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \