Skip to Content.
Sympa Menu

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

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 (ee4954af40d655095e3df2a33b0f5e5b221c5b9c)
  • Date: Fri, 13 Feb 2009 11:38:41 -0600

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

graphics-libs/libraw/DETAILS | 4 ++--
graphics-libs/libraw/HISTORY | 3 +++
graphics-libs/opencv/BUILD | 4 ++++
graphics-libs/opencv/CONFIGURE | 2 ++
graphics-libs/opencv/DEPENDS | 12 +++++++++---
graphics-libs/opencv/HISTORY | 4 ++++
x11-libs/wine/DETAILS | 2 +-
x11-libs/wine/HISTORY | 3 +++
8 files changed, 28 insertions(+), 6 deletions(-)

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

wine-1.1.15

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

libraw-0.6.13

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

opendcv

diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 86785b3..abc405d 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,7 +1,7 @@
SPELL=libraw
SPELLX=LibRaw
- VERSION=0.6.12
-
SOURCE_HASH=sha512:588d9d083024a58f615788318bde0b3b662efd3e2dff050546b88d9adc807dc29cc90783f67a629650f81e8aeee95e9735b4b94544609f63e4f100deccbce307
+ VERSION=0.6.13
+
SOURCE_HASH=sha512:8534b5fb2fdf42a396d764bbbd1ea39bc5bf72ec42c529957fe1872155ccb0c78df5eda4607b547b596835cb8c222160233f40eace6ba482f7151fe23451cf80
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://www.libraw.org/
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index 5575a02..4b110df 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2009-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.13
+
2009-02-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.12

diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
new file mode 100755
index 0000000..dc0514c
--- /dev/null
+++ b/graphics-libs/opencv/BUILD
@@ -0,0 +1,4 @@
+if [[ $FFM = none ]];then
+OPTS='--without-ffmpeg --without-quicktime $OPTS'
+fi &&
+default_build
diff --git a/graphics-libs/opencv/CONFIGURE b/graphics-libs/opencv/CONFIGURE
new file mode 100755
index 0000000..fb3efb3
--- /dev/null
+++ b/graphics-libs/opencv/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_list FFM 'which video decoder?' ffmpeg libquicktime none
+
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 9932b87..3edd2c6 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -1,11 +1,17 @@
depends g++ &&
depends pkgconfig &&
+if [[ $FFM = ffmpeg ]];then
+depends LIBAVCODEC '--with-ffmpeg --without-quicktime'
+elif [[ $FFM = libquicktime ]];then
+depends libquicktime '--with-quicktime --without-ffmpeg'
+fi &&
+#optional_depends jpeg
+#optional_depends jasper
+#optional_depends tiff
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 libquicktime '--with-quicktime' '--without-quicktime' ''
&&
-optional_depends gtk+2 '--with-gtk' '--without-gtk' 'gtk+ 2.0
windows' &&
-optional_depends LIBAVCODEC '--with-ffmpeg' '--without-ffmpeg' ''
+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 4c2e83c..203c3d3 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,7 @@
+2009-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: libquicktime and ffmpeg are mutually exclusive
+ * CONFIGURE, BUILD: added
+
2008-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1pre1
* PRE_BUILD: added, fix for recent ffmpeg
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 8e9877c..d14b4e7 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.1.14
+ VERSION=1.1.15
else
VERSION=1.0.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 9beaf6d..7c3b2d5 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2009-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.15
+
2009-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.14




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee4954af40d655095e3df2a33b0f5e5b221c5b9c), Treeve Jelbert, 02/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page