diff options
| author | Pol Vinogradov | 2012-05-29 17:07:48 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 12:26:34 +0400 |
| commit | c721e0587e9d4614096dc1f8d500e4f671ad91a2 (patch) | |
| tree | 55e437709042ed0942a717f159bf8dc02f72a298 | |
| parent | b94ce60f9c21fc8e31dcf222b90bacc270c54b6e (diff) | |
video/mplayer2: changed git url, disabled esound and arts dependencies for scm branch
(cherry picked from commit f8abd674aef9393aaf09e1ddd5108a1062194dc2)
| -rwxr-xr-x | video/mplayer2/DEPENDS | 6 | ||||
| -rwxr-xr-x | video/mplayer2/DETAILS | 2 | ||||
| -rw-r--r-- | video/mplayer2/HISTORY | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS index a28ed506e0..c4cf995e71 100755 --- a/video/mplayer2/DEPENDS +++ b/video/mplayer2/DEPENDS @@ -32,8 +32,10 @@ optional_depends x264 "" "" "for x264 codec" optional_depends twolame "" "" "Twolame (MPEG layer 2 audio) support in mencoder" && # audio devices -optional_depends esound "" "--disable-esd" "for direct esd audio output" && -optional_depends arts "" "--disable-arts" "for arts audio output" && +if [ "$MPLAYER2_BRANCH" != "scm" ]; then + optional_depends esound "" "--disable-esd" "for direct esd audio output" && + optional_depends arts "" "--disable-arts" "for arts audio output" +fi && optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" && optional_depends nas "" "--disable-nas" "for NAS audio output" && optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio output" && diff --git a/video/mplayer2/DETAILS b/video/mplayer2/DETAILS index e64d3d5710..018512a4e0 100755 --- a/video/mplayer2/DETAILS +++ b/video/mplayer2/DETAILS @@ -6,7 +6,7 @@ if [ "$MPLAYER2_BRANCH" == "scm" ]; then VERSION=git fi SOURCE=$SPELL-git.tar.bz2 - SOURCE_URL[0]=git_http://git.mplayer2.org/$SPELL:$SPELL-git + SOURCE_URL[0]=git://git.mplayer2.org/$SPELL:$SPELL-git SOURCE_IGNORE=volatile FORCE_DOWNLOAD=on SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY index caa59db653..457812cadd 100644 --- a/video/mplayer2/HISTORY +++ b/video/mplayer2/HISTORY @@ -1,3 +1,7 @@ +2012-05-29 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: git_http -> git in scm branch + * DEPENDS: esound and arts are for stable branch only now + 2012-01-01 Pol Vinogradov <vin.public@gmail.com> * DEPENDS: added LIBAVCODEC, fixed some flags |