Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d00e1cd2e0de7911a2a80516d77325672eeef4e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d00e1cd2e0de7911a2a80516d77325672eeef4e1)
  • Date: Sun, 4 Oct 2009 04:55:27 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/opencv/BUILD | 5 +----
graphics-libs/opencv/DEPENDS | 20 +++++++++++---------
graphics-libs/opencv/DETAILS | 9 +++++----
graphics-libs/opencv/HISTORY | 8 ++++++++
graphics-libs/opencv/PRE_BUILD | 8 --------
kde4-apps/kipi-plugins4/HISTORY | 3 +++
kde4-apps/kipi-plugins4/TRIGGERS | 1 +
kde4/kdegraphics4/DEPENDS | 1 +
kde4/kdegraphics4/HISTORY | 3 +++
9 files changed, 33 insertions(+), 25 deletions(-)

New commits:
commit d00e1cd2e0de7911a2a80516d77325672eeef4e1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdegraphics4 - add optional libxxf86vm

commit d3de2e9335fb773347d5329d40fe51141586207a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kipi-plugins4 - add trigger on opencv

commit 36aaf54d5e04b06cd5a1ede2025950ad3468002a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv: => 2.0.0

diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
index 6524afc..e013b8d 100755
--- a/graphics-libs/opencv/BUILD
+++ b/graphics-libs/opencv/BUILD
@@ -1,4 +1 @@
-if [[ $FFM = none ]];then
-OPTS="--without-gstreamer --without-ffmpeg --without-quicktime $OPTS"
-fi &&
-default_build
+cmake_build
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 5ab3644..a27831f 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -1,20 +1,22 @@
depends g++ &&
depends pkgconfig &&
+depends cmake &&

if [[ $FFM = ffmpeg ]];then
- depends LIBAVCODEC '--with-ffmpeg --without-gstreamer
--without-quicktime'
+ depends LIBAVCODEC
elif [[ $FFM = gstreamer ]]; then
- depends gstreamer '--with-gstreamer --without-ffmpeg --without-quicktime'
+ depends gstreamer
elif [[ $FFM = libquicktime ]];then
- depends libquicktime '--with-quicktime --without-gstreamer
--without-ffmpeg'
+ depends libquicktime
fi &&

+optional_depends libv4l '' '' 'V4L support' &&
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 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'
+optional_depends python '' '' '' &&
+optional_depends swig '' '' '' &&
+optional_depends xine-lib '' '' '' &&
+optional_depends libraw1394 '' '' '' &&
+optional_depends unicap '' '' '' &&
+optional_depends gtk+2 '' '' ''
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 34f8580..6af91e8 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,8 +1,9 @@
SPELL=opencv
- VERSION=1.1pre1
-
SOURCE_HASH=sha512:d241f4cc19f7c3783cfe327ed8c7246dbfb7a217c55b5b03841f04d674eaf387a363c5e3dcd5b26ab7082cd66944ace10c9bc79dced2cf566bfa2b020f700168
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/pre?/.0}
+ SPELLX=OpenCV
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:88602f29b145fbc85f0d0f2068f810723449197dbcf13fb6622087ee0d2f7cec429f35235f7e19095010805771cf7cd9f1381cea4e6656ebbf2659adaa60c3c2
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/opencvlibrary/$SOURCE
WEB_SITE=http://opencv.willowgarage.com/wiki/
LICENSE[0]=GPL
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 52a38d0..5777e7c 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,11 @@
+2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.0
+ * PRE_BUILD: deleted
+ * DEPENDS: add cmake,remove all flags
+ add optional libv4l
+ * BUILD: cmake_build
+ cmake is now the recommended way of building opencv
+
2009-09-01 Peng Chang (Charles) <chp AT sourcemage.org>
* DEPENDS, BUILD, CONFIGURE: resolved conflict between ffmpeg and
gstreamer
diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD
deleted file mode 100755
index 90abccf..0000000
--- a/graphics-libs/opencv/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix for recent ffmpeg
-sed -i -e
's|ffmpeg/avc|libavcodec/avc|;s|ffmpeg/sw|libswscale/sw|;s|ffmpeg/avf|libavformat/avf|'
\
-configure otherlibs/highgui/cvcap_ffmpeg.cpp
-# fix for gcc-4.4
-sed -i 's|^#elif$|#else|' cxcore/include/cxmisc.h
-#patch -p0 < $SPELL_DIRECTORY/xxx.diff
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index 372a956..f6fe19f 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * TRIGGERS: added, for opencv
+
2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0

diff --git a/kde4-apps/kipi-plugins4/TRIGGERS
b/kde4-apps/kipi-plugins4/TRIGGERS
new file mode 100755
index 0000000..09d8497
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/TRIGGERS
@@ -0,0 +1 @@
+on_cast opencv check_self
diff --git a/kde4/kdegraphics4/DEPENDS b/kde4/kdegraphics4/DEPENDS
index 7db2fd9..4ca27e3 100755
--- a/kde4/kdegraphics4/DEPENDS
+++ b/kde4/kdegraphics4/DEPENDS
@@ -19,4 +19,5 @@ optional_depends qca2 '-DWITH_QCA2=ON' \
'-DWITH_QCA2=OFF' \
'import encrypted docs in okular' &&
optional_depends qimageblitz '' '' 'build kolourpoint' &&
+optional_depends libxxf86vm '' '' 'video timings for kgamma' &&
optional_depends xf86vidmodeproto '' '' 'build kgamma control module'
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index ccfddc9..1e430d6 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional libxxf86vm
+
2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.69svn1027298 (unstable)




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d00e1cd2e0de7911a2a80516d77325672eeef4e1), Treeve Jelbert, 10/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page