diff options
| author | Peng Chang (Charles) | 2009-09-01 14:47:04 +0800 |
|---|---|---|
| committer | Peng Chang (Charles) | 2009-09-01 14:50:26 +0800 |
| commit | b4635fbb2632ce2563cf3d798b2a6d41c621920b (patch) | |
| tree | cc381dc50f432c01be5245cb0611aad143071e7a | |
| parent | eb26d7e0e990372973bf59c496fdf1b2083515c1 (diff) | |
opencv: resolved a conflict between two optional dependencies
| -rwxr-xr-x | graphics-libs/opencv/BUILD | 2 | ||||
| -rwxr-xr-x | graphics-libs/opencv/CONFIGURE | 2 | ||||
| -rwxr-xr-x | graphics-libs/opencv/DEPENDS | 9 | ||||
| -rw-r--r-- | graphics-libs/opencv/HISTORY | 6 |
4 files changed, 13 insertions, 6 deletions
diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD index dc0514c3d5..6524afcf9d 100755 --- a/graphics-libs/opencv/BUILD +++ b/graphics-libs/opencv/BUILD @@ -1,4 +1,4 @@ if [[ $FFM = none ]];then -OPTS='--without-ffmpeg --without-quicktime $OPTS' +OPTS="--without-gstreamer --without-ffmpeg --without-quicktime $OPTS" fi && default_build diff --git a/graphics-libs/opencv/CONFIGURE b/graphics-libs/opencv/CONFIGURE index fb3efb3b95..198005e76f 100755 --- a/graphics-libs/opencv/CONFIGURE +++ b/graphics-libs/opencv/CONFIGURE @@ -1,2 +1,2 @@ -config_query_list FFM 'which video decoder?' ffmpeg libquicktime none +config_query_list FFM 'which video decoder?' ffmpeg gstreamer libquicktime none diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS index 4048d9b537..5ab36448f8 100755 --- a/graphics-libs/opencv/DEPENDS +++ b/graphics-libs/opencv/DEPENDS @@ -1,17 +1,20 @@ depends g++ && depends pkgconfig && + if [[ $FFM = ffmpeg ]];then -depends LIBAVCODEC '--with-ffmpeg --without-quicktime' + depends LIBAVCODEC '--with-ffmpeg --without-gstreamer --without-quicktime' +elif [[ $FFM = gstreamer ]]; then + depends gstreamer '--with-gstreamer --without-ffmpeg --without-quicktime' elif [[ $FFM = libquicktime ]];then -depends libquicktime '--with-quicktime --without-ffmpeg' + depends libquicktime '--with-quicktime --without-gstreamer --without-ffmpeg' fi && + optional_depends jpeg '' '' 'JPEG support' && optional_depends jasper '' '' 'JPEG-2000 support' && optional_depends tiff '' '' 'TIFF support' && optional_depends python '--with-python' '--without-python' '' && optional_depends swig '--with-swig' '--without-swig' '' && optional_depends xine-lib '--with-xine' '--without-xine' '' && -optional_depends gstreamer '--with-gstreamer' '--without-gstreamer' '' && optional_depends libraw1394 '--with-1394libs' '--without-1394libs' 'Firewire support' && optional_depends unicap '--with-unicap' '--without-unicap' 'video capture' && optional_depends gtk+2 '--with-gtk' '--without-gtk' 'gtk+ 2.0 windows' diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY index 4f9a3d938b..52a38d0874 100644 --- a/graphics-libs/opencv/HISTORY +++ b/graphics-libs/opencv/HISTORY @@ -1,4 +1,8 @@ -2009-08-08-19 Treeve Jelbert <treeve@sourcemage.org> +2009-09-01 Peng Chang (Charles) <chp@sourcemage.org> + * DEPENDS, BUILD, CONFIGURE: resolved conflict between ffmpeg and + gstreamer + +2009-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: add optional jpeg, jasper, tiff * PRE_BUILD: add fix for gcc-4.4 |