]> git.sesse.net Git - vlc/commitdiff
Use --disable-devices in contribs.
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 28 Jan 2008 19:50:33 +0000 (19:50 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 28 Jan 2008 19:50:33 +0000 (19:50 +0000)
extras/contrib/src/Makefile

index c0741185b0a096b6e1c8f016a6de1213c44ac17c..33a03d279a0cebc0a4b58a73f8b09705a6ff334e 100644 (file)
@@ -1038,7 +1038,6 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
        $(SVN) co $(FFMPEG_SVN) ffmpeg
-       (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1079,7 +1078,7 @@ else
 .ffmpeg: ffmpeg .faac .lame
 endif
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN