vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Jul 4 18:26:08 2011 +0300| [c33aef8b5f07f1a7cc7b955ab06eb35e2a475535] | committer: Rémi Denis-Courmont
contrib: build gsm only if ffmpeg is built > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c33aef8b5f07f1a7cc7b955ab06eb35e2a475535 --- contrib/src/ffmpeg/rules.mak | 9 ++++----- contrib/src/gsm/rules.mak | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index d4b7fba..c40a9ce 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -5,9 +5,11 @@ FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk FFMPEG_SVN_REV=26400 -FFMPEGCONF = --cc="$(CC)" \ +FFMPEGCONF = \ + --cc="$(CC)" \ --disable-doc \ --disable-decoder=libvpx \ + --enable-gsm \ --disable-debug \ --enable-gpl \ --enable-postproc \ @@ -19,7 +21,7 @@ FFMPEGCONF = --cc="$(CC)" \ --disable-protocols \ --disable-avfilter \ --disable-network -DEPS_ffmpeg = zlib +DEPS_ffmpeg = zlib gsm # Optional dependencies ifdef BUILD_ENCODERS @@ -31,9 +33,6 @@ FFMPEGCONF += --disable-encoders --disable-muxers # XXX: REVISIT --enable-small ? endif -#FFMPEGCONF += --enable-libgsm -#DEPS_ffmpeg += gsm $(DEPS_gsm) - #FFMPEGCONF += --enable-libvpx #DEPS_ffmpeg += vpx $(DEPS_vpx) diff --git a/contrib/src/gsm/rules.mak b/contrib/src/gsm/rules.mak index 3a12f1b..1353354 100644 --- a/contrib/src/gsm/rules.mak +++ b/contrib/src/gsm/rules.mak @@ -2,8 +2,6 @@ GSM_VERSION := 1.0.12 GSM_URL := $(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz -PKGS += gsm - $(TARBALLS)/gsm-$(GSM_VERSION).tar.gz: $(call download,$(GSM_URL)) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
