[SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (c91d11d745ae7e815f6616166cb1c9dafacac0b5)

Peng Chang (Charles) scm at sourcemage.org
Sat Nov 7 01:24:44 EST 2009


GIT changes to master grimoire by Peng Chang (Charles) <chp at sourcemage.org>:

 video/mplayer/DEPENDS |   10 +++++++---
 video/mplayer/HISTORY |    5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit c91d11d745ae7e815f6616166cb1c9dafacac0b5
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    mplayer: check if win32codecs enabled before querying other codecs
    
    win32codecs includes quicktime-codecs, real-codecs and xanim-codecs

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 65c0bf4..12c7570 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -43,11 +43,15 @@ optional_depends  faac      "" "--disable-faac"   "for faac support"
 optional_depends  libtheora "" "--disable-theora" "for Theora video support"              &&
 optional_depends  zlib "" "" "to play movies using losless compression algorithms"  &&
 optional_depends  win32codecs "" "--disable-win32dll" "to use windows codec DLLs for video decoding" "z-rejected"  &&
+
+if ! is_depends_enabled $SPELL win32codecs ; then
+  optional_depends  quicktime-codecs "" "--disable-qtx" "for some audio/video codecs sometimes used in quicktime files" "z-rejected"  &&
+  optional_depends  real-codecs "" "--disable-real" "to decode RealMedia files" "z-rejected" &&
+  optional_depends  xanim-codecs "" "--disable-xanim" "for additional codecs (intel indeo, ...)" "z-rejected"
+fi  &&
+
 optional_depends  libdv "" "--disable-libdv" "to play files encoded with libdv (used by most digital camcorders)"  &&
-optional_depends  quicktime-codecs "" "--disable-qtx" "for some audio/video codecs sometimes used in quicktime files" "z-rejected"  &&
-optional_depends  real-codecs "" "--disable-real" "to decode RealMedia files" "z-rejected" &&
 optional_depends  x264        "" "--disable-x264" "for x264 codec"                         &&
-optional_depends  xanim-codecs "" "--disable-xanim" "for additional codecs (intel indeo, ...)" "z-rejected" &&
 optional_depends  xvid "" "--disable-xvid" "for encoding with the xvid codec (distribution in USA and Japan is forbidden)"  &&
 optional_depends  twolame "" "--disable-twolame" "Twolame (MPEG layer 2 audio) support in mencoder"  &&
 
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index c88ed94..39e5fb8 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2009-11-07 Peng Chang (Charles) <chp at sourcemage.org>
+	* DEPENDS: win32codecs includes quicktime-codecs, real-codecs and
+	  xanim-codecs. A combination like "--enable-win32dll --disable-qtx"
+	  will cause compilation failure.
+
 2009-04-21 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* DEPENDS: openal -> OPENAL
 



More information about the SM-Commit mailing list