Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Peng Chang (Charles)" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (b4635fbb2632ce2563cf3d798b2a6d41c621920b)
  • Date: Tue, 1 Sep 2009 01:51:59 -0500

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

graphics-libs/opencv/BUILD | 2 +-
graphics-libs/opencv/CONFIGURE | 2 +-
graphics-libs/opencv/DEPENDS | 9 ++++++---
graphics-libs/opencv/HISTORY | 6 +++++-
4 files changed, 13 insertions(+), 6 deletions(-)

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

opencv: resolved a conflict between two optional dependencies

diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
index dc0514c..6524afc 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 fb3efb3..198005e 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 4048d9b..5ab3644 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 4f9a3d9..52a38d0 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,4 +1,8 @@
-2009-08-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-01 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DEPENDS, BUILD, CONFIGURE: resolved conflict between ffmpeg and
+ gstreamer
+
+2009-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional jpeg, jasper, tiff
* PRE_BUILD: add fix for gcc-4.4




  • [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (b4635fbb2632ce2563cf3d798b2a6d41c621920b), Peng Chang (Charles), 09/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page