sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e6cfdaf7459f0c7ac9c1e33670db8329f416a4bb)
- 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 (e6cfdaf7459f0c7ac9c1e33670db8329f416a4bb)
- Date: Mon, 5 Oct 2015 10:24:44 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 1 +
crypto/libssh/DETAILS | 6 +++---
crypto/libssh/HISTORY | 3 +++
crypto/libssh2/DETAILS | 2 +-
crypto/libssh2/HISTORY | 3 +++
gnome2-libs/gdk-pixbuf2/DETAILS | 4 ++--
gnome2-libs/gdk-pixbuf2/HISTORY | 3 +++
gnome2-libs/pango/DETAILS | 4 ++--
gnome2-libs/pango/HISTORY | 3 +++
graphics-libs/freetype2/DETAILS | 2 +-
graphics-libs/freetype2/HISTORY | 4 ++++
graphics-libs/freetype2/PRE_BUILD | 21 ---------------------
graphics-libs/freetype2/ft2build.patch | 22 ----------------------
graphics-libs/harfbuzz/DETAILS | 4 ++--
graphics-libs/harfbuzz/HISTORY | 3 +++
graphics-libs/opencv3/BUILD | 14 ++++++++++++++
graphics-libs/opencv3/CONFIGURE | 6 ++++++
graphics-libs/opencv3/CONFLICTS | 1 +
graphics-libs/opencv3/DEPENDS | 24 ++++++++++++++++++++++++
graphics-libs/opencv3/DETAILS | 19 +++++++++++++++++++
graphics-libs/opencv3/HISTORY | 7 +++++++
graphics-libs/opencv3/PREPARE | 7 +++++++
graphics-libs/opencv3/PRE_BUILD | 9 +++++++++
graphics-libs/opencv3/PROVIDES | 1 +
qt5-cmake/qca-qt5/DETAILS | 12 ++++++------
qt5-cmake/qca-qt5/HISTORY | 5 +++++
qt5-cmake/qca-qt5/PRE_BUILD | 3 ---
qt5-cmake/qca-qt5/qt55.patch | 12 ------------
video/vlc/DEPENDS | 9 +++++++--
video/vlc/HISTORY | 3 +++
30 files changed, 140 insertions(+), 77 deletions(-)
New commits:
commit e6cfdaf7459f0c7ac9c1e33670db8329f416a4bb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libssh2: => 1.6.0
commit 533a107892b6c9dbeea5eb801529af8a97a07b91
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libssh: => 0.7.2
commit 221536f94414bf621986d420b6149079622228ae
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
freetype2: => 2.6.1
commit 7193389f71911e20a2bdcb21e8c90f0c58c60e65
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vlc - fix typo, optional depends OPENCV
commit 3c9e15bdeb40a5ca7fea2cfabce02dd4768457e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
harfbuzz: => 1.0.4
commit 6fa95dca3d32533fc5db7b3c7f52ae83f8c665cd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qca-qt5: => 2.1.1
commit 35b26bffd1046feb5d71179fa3debd0d93d44a2d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
opencv3-3.0.0
commit f3e50bca18183b7e46f0d049706da53b2da48637
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pango: => 1.38.0
commit 8ecf35a931223f69337ce807504c53f86da052ad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gdk-pixbuf2: => 2.32.1
diff --git a/ChangeLog b/ChangeLog
index 1e04886..7a49e97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
2015-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* accounts-sso/accounts-qml-module: added
* accounts-sso/signon-plugin-oauth2: added
+ * graphics-libs/opencv3: added
2015-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-libs/purpose: added, Quickshare support library
diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index 2f7703d..d997f3b 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,11 +1,11 @@
SPELL=libssh
- VERSION=0.7.0
-
SOURCE_HASH=sha512:2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568
+ VERSION=0.7.2
+
SOURCE_HASH=sha512:9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://red.libssh.org/attachments/download/140/$SOURCE
+ SOURCE_URL[0]=https://red.libssh.org/attachments/download/177/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
#SOURCE2_HINTS[0]="no-check-certificate"
WEB_SITE=http://www.libssh.org/
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index 31d7d2d..84724aa 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.2
+
2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.0, SECURITY_PATCH=4, CVE-2015-3146
diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index a0c9d6b..b05f521 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -1,5 +1,5 @@
SPELL=libssh2
- VERSION=1.5.0
+ VERSION=1.6.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 21c5cab..831ae40 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,6 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.0
+
2015-03-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0
SECURITY_PATCH=1, fixes CVE-2015-1782
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
index c754103..5962bc6 100755
--- a/gnome2-libs/gdk-pixbuf2/DETAILS
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -1,6 +1,6 @@
SPELL=gdk-pixbuf2
- VERSION=2.31.6
-
SOURCE_HASH=sha512:13df6707b3f60f56a8b98106757de2c142f62badbd3f57603b275fd6207825374d73f06945eb120dfefc07bdd9da9f86cba5d29f235b573f30aed24e7378da3f
+ VERSION=2.32.1
+
SOURCE_HASH=sha512:4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2
SECURITY_PATCH=2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gdk-pixbuf-$VERSION.tar.xz
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index 8fc7804..f1c4beb 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,3 +1,6 @@
+2015-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.32.1
+
2015-08-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.31.6
SECURITY_PATCH++ fixes CVE-2015-4491
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index d262e96..5675fa2 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,6 @@
SPELL=pango
- VERSION=1.36.8
-
SOURCE_HASH=sha512:799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215
+ VERSION=1.38.0
+
SOURCE_HASH=sha512:1325a4fe458f44436295725f4c86c070fa7b29d6a546088f5288fb0dfa2f0cf6b9afa2439aa3d961e032b5d65d0fd86c99f1cf0c602a1e0898809f365dc72986
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index d568572..359dc4d 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2015-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.38.0
+
2015-07-25 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Depends on python 2
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 0c826e3..cf79f39 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
SPELL=freetype2
- VERSION=2.5.5
+ VERSION=2.6.1
SECURITY_PATCH=10
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 6d7d8dd..28d97e7 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,7 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6.1
+ * PRE_BUILD ft2build.patch: deleted
+
2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: made libpng optional; glib2 and pcre are required only if
it was built against harfbuzz with glib support
diff --git a/graphics-libs/freetype2/PRE_BUILD
b/graphics-libs/freetype2/PRE_BUILD
deleted file mode 100755
index 6caeec0..0000000
--- a/graphics-libs/freetype2/PRE_BUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/ft2build.patch &&
-
-if [[ $FT2_BYTECODE == n ]]; then
- sed -i "s:#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER::" \
- include/config/ftoption.h
-fi &&
-
-if [[ $FT2_SUBPIXEL == y ]]; then
- sedit 's:/\* \(#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING\) \*/:\1:' \
- include/config/ftoption.h
-fi
-if [[ $FT2_FIR_FILTER == light ]]; then
- sedit '/FT_END_HEADER/i#define FT_FORCE_LIGHT_LCD_FILTER' \
- include/config/ftoption.h
-elif [[ $FT2_FIR_FILTER == legacy ]]; then
- sedit '/FT_END_HEADER/i#define FT_FORCE_LEGACY_LCD_FILTER' \
- include/config/ftoption.h
-fi
diff --git a/graphics-libs/freetype2/ft2build.patch
b/graphics-libs/freetype2/ft2build.patch
deleted file mode 100644
index 95b31ac..0000000
--- a/graphics-libs/freetype2/ft2build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur freetype-2.1.9.orig/include/freetype/freetype.h
freetype-2.1.9/include/freetype/freetype.h
---- freetype-2.1.9.orig/include/freetype.h 2005-01-02 21:02:48.023840904
-0800
-+++ freetype-2.1.9/include/freetype.h 2005-01-02 21:03:40.682835520 -0800
-@@ -17,11 +17,13 @@
-
-
- #ifndef FT_FREETYPE_H
--#error "`ft2build.h' hasn't been included yet!"
--#error "Please always use macros to include FreeType header files."
--#error "Example:"
--#error " #include <ft2build.h>"
--#error " #include FT_FREETYPE_H"
-+#include <ft2build.h>
-+#warning "`ft2build.h' hasn't been included yet!"
-+#warning "Please always use macros to include FreeType header files."
-+#warning "Example:"
-+#warning " #include <ft2build.h>"
-+#warning " #include FT_FREETYPE_H"
-+#warning "Source Mage has included this for you, but please fix it"
- #endif
-
-
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index b4e5ebc..c0d9016 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.0.1
-
SOURCE_HASH=sha512:6de8d38c64772687701789d38001327a20c225e08d77bd4bb919c61613172e9cb57dd6f4dd5cedcaaad6db8228d91546d8a395dcc21033107496d0a37ded0291
+ VERSION=1.0.4
+
SOURCE_HASH=sha512:9c6b2c5588cd23f5e3aa2a8b682033758fcbfda4218639ec104def7e67262faea01d783f46abfe7feec836e41dbeb6dc3c9c26380b5d1b0383a24a049e0af1fc
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 4bd05bd..0ee3e75 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.4
+
2015-08-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1
diff --git a/graphics-libs/opencv3/BUILD b/graphics-libs/opencv3/BUILD
new file mode 100755
index 0000000..5cacc56
--- /dev/null
+++ b/graphics-libs/opencv3/BUILD
@@ -0,0 +1,14 @@
+CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
+OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
+ -DBUILD_TESTS=0 -Wno-dev" &&
+if [[ $CV_CONTRIB != none ]];then
+ OPTS+=" -DOPENCV_EXTRA_MODULES_PATH=$SOURCE_DIRECTORY/contrib"
+fi &&
+
+OPTS+=" -DOPENCV_MODULES_DISABLED_USER_ST=\"$CV_DISABLE\""
+
+if is_depends_enabled $SPELL qtbase;then
+ qt5_cmake_build
+else
+ cmake_build
+fi
diff --git a/graphics-libs/opencv3/CONFIGURE b/graphics-libs/opencv3/CONFIGURE
new file mode 100755
index 0000000..17261c2
--- /dev/null
+++ b/graphics-libs/opencv3/CONFIGURE
@@ -0,0 +1,6 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
+source $GRIMOIRE/config_query_multi.function
+config_query_multi CV_DISABLE "Which modules to DISABLE" none features2d
flann hal highgui \
+ imgcodecs imgproc java ml objdetect photo python shape stitching
superres ts video\ \
+ videoio videostab viz world
+
diff --git a/graphics-libs/opencv3/CONFLICTS b/graphics-libs/opencv3/CONFLICTS
new file mode 100755
index 0000000..f3d8ad7
--- /dev/null
+++ b/graphics-libs/opencv3/CONFLICTS
@@ -0,0 +1 @@
+conflicts opencv n
diff --git a/graphics-libs/opencv3/DEPENDS b/graphics-libs/opencv3/DEPENDS
new file mode 100755
index 0000000..6df8096
--- /dev/null
+++ b/graphics-libs/opencv3/DEPENDS
@@ -0,0 +1,24 @@
+
+depends cmake &&
+depends -sub CXX gcc &&
+depends pkgconfig &&
+depends bzip2 &&
+#message build fails with libav, use gstreamer-1.0 instead
+optional_depends gstreamer-1.0 '-DWITH_GSTREAMER=1' '-DWITH_GSTREAMER=0'
'GStreamer support'
+optional_depends LIBAVCODEC '-DWITH_FFMPEG=1' '-DWITH_FFMPEG=0' 'FFMgeg
suport'
+optional_depends v4l-utils '-DWITH_V4L=1' '-DWITH_V4L=0' 'V4L
support' &&
+optional_depends JPEG '-DWITH_JPEG=1' '-DWITH_JPEG=0' 'JPEG
support' &&
+optional_depends jasper '-DWITH_JASPER=1' '-DWITH_JASPER=0' 'JPEG-2000
support' &&
+optional_depends tiff '-DWITH_TIFF=1' '-DWITH_TIFF=1' 'TIFF
support' &&
+optional_depends libpng '-DWITH_PNG=1' '-DWITH_PNG=0' 'PNG support'
+optional_depends PYTHON '' '' 'Python bindings' &&
+optional_depends numpy '' '' 'Numerical python support' &&
+optional_depends tbb '-DWITH_TBB=1' '-DWITH_TBB=0' 'parallel
processing support' &&
+optional_depends xine-lib '-DWITH_XINE=1' '-DWITH_XINE=0' 'Xine
support' &&
+optional_depends libucil '-DWITH_UNICAP=1' '-DWITH_UNICAP=0' 'video
capture support' &&
+optional_depends libraw1394 '-DWITH_1394=1' '-DWITH_1394=0' 'Firewire
support' &&
+optional_depends gtk+3 '-DWITH_GTK=1' '-DWITH_GTK=0' 'Gtk gui
support' &&
+optional_depends qtbase '-DWITH_QT=1' '-DWITH_QT=0' 'Qt5 gui
support' &&
+optional_depends EIGEN '-DWITH_EIGEN=1' '-DWITH_EIGEN=0' 'Eigen2/3
matrix support' &&
+optional_depends openexr '-DWITH_OPENEXR=1' '-DWITH_OPENEXR=0' 'ILM
support' &&
+optional_depends libwebp '-DWITH_WEBP=1' '-DWITH_WEBP=0' 'WebP support'
diff --git a/graphics-libs/opencv3/DETAILS b/graphics-libs/opencv3/DETAILS
new file mode 100755
index 0000000..5702363
--- /dev/null
+++ b/graphics-libs/opencv3/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=opencv3
+ VERSION=3.0.0
+
SOURCE_HASH=sha512:108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
+ SOURCE=${SPELL//3}-$VERSION.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//3}-${VERSION}
+
SOURCE_URL[0]=http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/$VERSION/$SOURCE
+if ! list find "$CV_CONTRIB" none ;then
+
+fi
+ TMPFS=off
+ WEB_SITE=http://opencv.org
+ LICENSE[0]=BSD
+ ENTERED=20150917
+ KEYWORDS="graphics"
+ SHORT="real time computer vision"
+cat << EOF
+The Open Computer Vision Library has > 2500 algorithms, documentation and
+sample code for real time computer vision.
+EOF
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
new file mode 100644
index 0000000..74535d3
--- /dev/null
+++ b/graphics-libs/opencv3/HISTORY
@@ -0,0 +1,7 @@
+2015-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3,0.0
+
+2014-01-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version master (git)
+ spell created
+
diff --git a/graphics-libs/opencv3/PREPARE b/graphics-libs/opencv3/PREPARE
new file mode 100755
index 0000000..89d1bec
--- /dev/null
+++ b/graphics-libs/opencv3/PREPARE
@@ -0,0 +1,7 @@
+source $GRIMOIRE/config_query_multi.function
+config_query_multi CV_CONTRIB "Which contributed modules" none face xphoto
+message "contributed module not currently supported"
+if ! list_find "$CV_CONTRIB" none ;then
+ message "${PROBLEM_COLOR}contributed module not currently
supported${MESSAGE_COLOR}"
+ false
+fi
diff --git a/graphics-libs/opencv3/PRE_BUILD b/graphics-libs/opencv3/PRE_BUILD
new file mode 100755
index 0000000..9743fcf
--- /dev/null
+++ b/graphics-libs/opencv3/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if ! list_find "$CV_CONTRIB" none ;then
+ mkdir contrib &&
+ cd contrib &&
+ for FF in $CV_CONTRIB;do
+ ln -sf $BUILD_DIRECTORY/opencv_contrib/modules/$FF
+ done
+fi
diff --git a/graphics-libs/opencv3/PROVIDES b/graphics-libs/opencv3/PROVIDES
new file mode 100644
index 0000000..da42bf1
--- /dev/null
+++ b/graphics-libs/opencv3/PROVIDES
@@ -0,0 +1 @@
+OPENCV
diff --git a/qt5-cmake/qca-qt5/DETAILS b/qt5-cmake/qca-qt5/DETAILS
index bc7649a..a76edc5 100755
--- a/qt5-cmake/qca-qt5/DETAILS
+++ b/qt5-cmake/qca-qt5/DETAILS
@@ -1,10 +1,10 @@
SPELL=qca-qt5
- VERSION=2.1.0.3
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1
- SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
+ SPELLX=qca
+ VERSION=2.1.1
+
SOURCE_HASH=sha512:f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf
+ SOURCE=$SPELLX-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=http://download.kde.org/stable/$SPELLX/$VERSION/src/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20141229
diff --git a/qt5-cmake/qca-qt5/HISTORY b/qt5-cmake/qca-qt5/HISTORY
index 5dc90c2..6fc7dbe 100644
--- a/qt5-cmake/qca-qt5/HISTORY
+++ b/qt5-cmake/qca-qt5/HISTORY
@@ -1,3 +1,8 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.1
+ now one tarball for qt4/5 support
+ * PRE_BUILD,qt55.patch: deleted
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/qt5-cmake/qca-qt5/PRE_BUILD b/qt5-cmake/qca-qt5/PRE_BUILD
deleted file mode 100755
index 780ec1a..0000000
--- a/qt5-cmake/qca-qt5/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/qt55.patch
diff --git a/qt5-cmake/qca-qt5/qt55.patch b/qt5-cmake/qca-qt5/qt55.patch
deleted file mode 100644
index 0ad0fd0..0000000
--- a/qt5-cmake/qca-qt5/qt55.patch
+++ /dev/null
@@ -1,12 +0,0 @@
--- a/include/QtCrypto/qca_basic.h
-+++ b/include/QtCrypto/qca_basic.h
-@@ -35,6 +35,8 @@
-
- #include "qca_core.h"
-
-+#include <QIODevice>
-+
- // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4
does
- // not have. It is needed if the headers are built with
QT_NO_CAST_FROM_ASCII.
- // Defining it here as QString::fromUtf8 for convenience.
-
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index d480d94..836dad6 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -8,7 +8,7 @@ if is_depends_enabled $SPELL libxpm;then
"--disable-qt" \
"for Qt interface" &&
-if is_depends_enabled $SPELL qt4 || is_depends_enabled_spell qtbase; then
+if is_depends_enabled $SPELL qt4 || is_depends_enabled $SPELL qtbase; then
depends -sub CXX gcc
fi
fi &&
@@ -305,4 +305,9 @@ optional_depends "samba" \
optional_depends "resid" \
"--enable-sid" \
"--disable-sid" \
- "support for C64 SID files"
+ "support for C64 SID files" &&
+
+optional_depends OPENCV \
+ '--enable-opencv' \
+ '--disable-opencv' \
+ 'OpenCV support'
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 88e5493..5b86d5d 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2015-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix typo, add OPENCV
+
2015-06-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix typo
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e6cfdaf7459f0c7ac9c1e33670db8329f416a4bb), Treeve Jelbert, 10/05/2015
Archive powered by MHonArc 2.6.24.