Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (63b6dce4347cd55e2f261edc004768f32eb97659)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (63b6dce4347cd55e2f261edc004768f32eb97659)
  • Date: Sun, 26 Aug 2018 10:34:45 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics-libs/opencv/DEPENDS | 3 ---
graphics-libs/opencv/DETAILS | 4 ++--
graphics-libs/opencv/HISTORY | 4 ----
graphics/nomacs/DEPENDS | 4 ++--
graphics/nomacs/DETAILS | 1 +
graphics/nomacs/HISTORY | 4 ++++
6 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 63b6dce4347cd55e2f261edc004768f32eb97659
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "graphics-libs/opencv: version 3.4.2"

This reverts commit e143bc9c60b26601bab3fbf2e7ecad619ced5b2a.

We have opencv3 for version 3 of opencv.

commit 634f4b533ea8e75a0e293f840079b3f761b816df
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/nomacs: depend on opencv3 instead of opencv

diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 8f969c8..ea3f082 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -10,9 +10,6 @@ elif [[ $FFM = libquicktime ]];then
depends libquicktime
fi &&
depends bzip2 &&
-optional_depends lapack '-DWITH_LAPACK=on' '-DWITH_LAPACK=off' 'support
for lapack' &&
-optional_depends protobuf '-DWITH_PROTOBUF=on' '-DWITH_PROTOBUF=off'
'support for protobuf' &&
-optional_depends libwebp '-DWITH_WEBP=on' '-DWITH_WEBP=off' 'support for
the webp codec' &&
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' &&
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index f5700c7..210c7fe 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
- VERSION=3.4.2
-
SOURCE_HASH=sha512:404ebc2d6bc43b29ce3a64a22f6aa079245745aaf6831a4b36895bc17c82da9301bb7aa1c4cc911d79a3acd6b3c26ef6407dc7e5d5441f180e029a3a238ca5b1
+ VERSION=2.4.13
+
SOURCE_HASH=sha512:efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$VERSION.tar.gz
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index eff67f8..e8ca558 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,7 +1,3 @@
-2018-08-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 3.4.2
- * DEPENDS: add optional dependencies on lapack, protobuf, libwebp
-
2016-11-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.4.13
* BUILD: disabled PCH, causing build failures
diff --git a/graphics/nomacs/DEPENDS b/graphics/nomacs/DEPENDS
index 1322142..13ce7eb 100755
--- a/graphics/nomacs/DEPENDS
+++ b/graphics/nomacs/DEPENDS
@@ -18,8 +18,8 @@ optional_depends libraw \
"-DENABLE_RAW=OFF" \
"for RAW support" &&

-if ! is_depends_enabled opencv qt4; then
- depends opencv
+if ! is_depends_enabled opencv3 qtbase; then
+ depends opencv3
fi &&

optional_depends quazip \
diff --git a/graphics/nomacs/DETAILS b/graphics/nomacs/DETAILS
index f6fcf3f..f274970 100755
--- a/graphics/nomacs/DETAILS
+++ b/graphics/nomacs/DETAILS
@@ -1,5 +1,6 @@
SPELL=nomacs
VERSION=3.10.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/${VERSION}.tar.gz

SOURCE_HASH=sha512:977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
diff --git a/graphics/nomacs/HISTORY b/graphics/nomacs/HISTORY
index afc1b0d..4681584 100644
--- a/graphics/nomacs/HISTORY
+++ b/graphics/nomacs/HISTORY
@@ -1,3 +1,7 @@
+2018-08-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on opencv3 instead of opencv
+ * DETAILS: PATCHLEVEL++
+
2018-08-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.10.2




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (63b6dce4347cd55e2f261edc004768f32eb97659), Florian Franzmann, 08/26/2018

Archive powered by MHonArc 2.6.24.

Top of Page