ffmpeg-cvs.patch: fix upstream

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1a54be944c24233e56a571710600808e332a80ce..76e1d3f550db60744b5da304d17afaf5807cdd9a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -98,7 +98,7 @@ endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-codec=snow --disable-codec=vc9 --disable-codec=wmv3 --disable-codec=vorbis --disable-codec=vorbis --disable-codec=dvdsub --disable-codec=dvbsub --disable-protocols
+FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 else
 FFMPEGCONF+= --enable-mp3lame --enable-faac
 endif
@@ -119,12 +119,12 @@ ifdef HAVE_DARWIN_OS
  all: .autoconf .automake .libtool .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
-       .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+       .dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
        .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
        .glib .libidl .gecko .mpcdec .expat .clinkcc .aclocal
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
 ifneq ($(HOST),i686-apple-darwin8)
- all: .x264 .goom2k4
+all: .goom2k4
 endif
 else
 
@@ -856,10 +856,8 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
        echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
        CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
-       (cd $@;patch -p 0 <../Patches/ffmpeg-cvs.patch) 
 ifeq ($(HOST),i586-pc-beos)
-       patch -p 0 < Patches/ffmpeg-beos.patch.cvs
-       (cd $@; ./bootstrap)
+       (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch)
 endif
 ifdef HAVE_WIN32
        patch -p 0 < Patches/ffmpeg-cvs-win32.patch
@@ -887,7 +885,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers)
        touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -952,6 +950,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 .dvdread: .dvdnav
        $(INSTALL_NAME)
+       (install_name_tool -change $(PREFIX)/lib/libdvdread.0.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/libdvdnav.dylib)
        touch $@
 
 CLEAN_FILE += .dvdread
@@ -1134,14 +1133,10 @@ x264:
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 ifdef HAVE_WIN32
        (cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
-else
-ifdef HAVE_DARWIN_OS
-       (cd x264;patch -p 0 < ../Patches/x264-mactel-ugly.patch)
 else
        patch -p 0 < Patches/x264_svn.patch
        rm x264/x264.c
 endif
-endif
 else
 x264-$(X264_VERSION).tar.gz:
        $(WGET) $(X264_URL)
@@ -1156,7 +1151,11 @@ else
 endif
 endif
 
+ifeq ($(HOST),i686-apple-darwin8)
+.x264: x264 .nasm
+else
 .x264: x264
+endif
        (cd $<; ./configure $(X264CONF) --prefix=$(PREFIX) && make && make install)
        touch $@
 
@@ -1810,6 +1809,29 @@ CLEAN_FILE += .clinkcc
 CLEAN_PKG += clinkcc
 DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz
 
+# ***************************************************************************
+# NASM assembler
+# ***************************************************************************
+
+nasm-$(NASM_VERSION).tar.bz2:
+       $(WGET) $(NASM_URL)
+
+nasm: nasm-$(NASM_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+#nasm:
+#      echo $(NASM_CVSROOT) A > ./nasm.cvs
+#      CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
+#      (cd $@ && autoconf && autoheader)
+
+.nasm: nasm
+       (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .nasm
+CLEAN_PKG += nasm nasm.cvs
+DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a