Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (721949720dc5cde038b370beda79ffb39e6b016b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (721949720dc5cde038b370beda79ffb39e6b016b)
  • Date: Wed, 23 Nov 2016 13:08:48 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-creation/audacity/DEPENDS | 2 +-
graphics-libs/opencv/BUILD | 3 +++
graphics-libs/opencv/DETAILS | 4 ++--
graphics-libs/opencv/HISTORY | 4 ++++
graphics-libs/opencv3/BUILD | 3 +++
graphics-libs/opencv3/HISTORY | 3 +++
6 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 721949720dc5cde038b370beda79ffb39e6b016b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

opencv3: Disable PCH, causes build failures

commit 9f1a80fc8e6865365e3ce644056ff385c41240f3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

opencv: disable PCH, causes build failures

commit 3ab5367e17c39c357c42d11dd5d52cf489455cdb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

opencv 2.4.13

diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 2ae570a..fd7dcff 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,5 +1,5 @@
depends zip &&
-depends wxwidgets &&
+depends WXWIDGET &&
optional_depends lame "--with-lame" \
"--without-lame" \
"for mp3 import/export support" &&
diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
index 4e7d3e5..78c1c20 100755
--- a/graphics-libs/opencv/BUILD
+++ b/graphics-libs/opencv/BUILD
@@ -1,6 +1,9 @@
CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
-DBUILD_TESTS=0" &&
+# PCH fails, at least with, with GCC 6.2
+OPTS+=" -DENABLE_PRECOMPILED_HEADERS=0" &&
+
if is_depends_enabled $SPELL qt4;then
qt4_cmake_build
else
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 11201ef..210c7fe 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
- VERSION=2.4.11
-
SOURCE_HASH=sha512:aba74b47f6009e2db60db2af5cfad323a487029ed8cbf4e42b89babc9006ad1fa4edb53210c1faf7e6e63156e5d75fd0ea3cb5f24fe8af650ed302c6fffef72d
+ 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 2423241..e8ca558 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,7 @@
+2016-11-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.13
+ * BUILD: disabled PCH, causing build failures
+
2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: added, for cmake_install

diff --git a/graphics-libs/opencv3/BUILD b/graphics-libs/opencv3/BUILD
index 3fe0883..8c50449 100755
--- a/graphics-libs/opencv3/BUILD
+++ b/graphics-libs/opencv3/BUILD
@@ -8,6 +8,9 @@ fi &&
OPTS+=" -DOPENCV_MODULES_DISABLED_USER_ST=\"$CV_DISABLE\""
OPTS+=" -DIPPROOT=$SOURCE_DIRECTORY/ippicv_lnx" &&

+# PCH fails, at least with, with GCC 6.2
+OPTS+=" -DENABLE_PRECOMPILED_HEADERS=0" &&
+
if is_depends_enabled $SPELL qtbase;then
qt5_cmake_build
else
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index a9c0acf..c0deff6 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,6 @@
+2016-11-23 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: disabled PCH, causes build failures
+
2016-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3,1.0
update ippicv version



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (721949720dc5cde038b370beda79ffb39e6b016b), Ismael Luceno, 11/23/2016

Archive powered by MHonArc 2.6.24.

Top of Page