Skip to Content.
Sympa Menu

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

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 (d9f537e242f59df1ae9cc4b20c89a200c04671b1)
  • Date: Fri, 1 Jan 2016 17:46:50 +0000

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

CMAKE_CONFIGURE | 2 ++
ChangeLog | 3 +++
FUNCTIONS | 16 +++++++++++++++-
KDE4_FUNCTIONS | 6 +++---
KDE5_DEPENDS | 3 +++
KDE5_FUNCTIONS | 6 +++---
audio-libs/taglib/DEPENDS | 6 +++++-
audio-libs/taglib/DETAILS | 4 ++--
audio-libs/taglib/HISTORY | 4 ++++
devel/cmake/DEPENDS | 3 ++-
devel/cmake/HISTORY | 3 +++
disk/partclone/DETAILS | 6 +++---
disk/partclone/HISTORY | 3 +++
graphics-libs/opencv/HISTORY | 3 +++
graphics-libs/opencv/INSTALL | 1 +
graphics-libs/opencv3/HISTORY | 3 +++
graphics-libs/opencv3/INSTALL | 1 +
libs/flatbuffers/HISTORY | 3 +++
libs/flatbuffers/INSTALL | 1 +
qt5-cmake/FUNCTIONS | 6 ++++++
science-libs/vtk/HISTORY | 3 +++
science-libs/vtk/INSTALL | 1 +
22 files changed, 73 insertions(+), 14 deletions(-)

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

taglib: => 1.10

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

opencv3 - use cmake_install

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

opencv - use cmake_install

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

vtk - use cmake_install

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

flatbuffers - use cmake_install

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

support ninja-build-system in cmake build;
this is enabled for all kde and qt5-cmake spells
to use it, source CMAKE_CONFIGURE in CONFIGURE and use
cmake-{build,install}

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

cmake - suggest ninja-build-system

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

partclone: => 0.2.87

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index 73089ce..5bc94a1 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -2,3 +2,5 @@ config_query_list CM_BUILD_TYPE 'which build type?' Release
Debug RelWithDebIn
#if is_depends_enabled $SPELL extra-cmake-modules;then
config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
#fi
+CMAKE_GEN=${CMAKE_GEN:-Ninja}
+persistent_add CMAKE_GEN
diff --git a/ChangeLog b/ChangeLog
index 4488682..5bc1611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE*, CMAKE* FUNCTIONS: add cmake_install, to support ninja
+
2015-12-28 Thomas Orgis <sobukus AT sourcemage.org>
* perl-cpan/perl-extutils-xspp: ExtUtils::XSpp - XS for C++

diff --git a/FUNCTIONS b/FUNCTIONS
index 5bd70bb..acb43eb 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -543,6 +543,12 @@ cmake_build() {
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
+ if [[ $CMAKE_GEN == Ninja ]];then
+ MAKE=ninja
+ OPTS+=" -G Ninja"
+ else
+ MAKE=make
+ fi &&

if [[ -z $1 ]];then
CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr"
@@ -561,7 +567,15 @@ cmake_build() {
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
$OPTS ../ &&
- make
+ $MAKE
+}
+
+function cmake_install() {
+ if [[ $CMAKE_GEN == Ninja ]];then
+ ninja install
+ else
+ make install
+ fi
}

qt4_cmake_build() {
diff --git a/KDE4_FUNCTIONS b/KDE4_FUNCTIONS
index 8df8f8c..0123407 100755
--- a/KDE4_FUNCTIONS
+++ b/KDE4_FUNCTIONS
@@ -6,9 +6,9 @@ default_build() {
kde4_build
}

-#function default_install() {
-# cmake_install
-#}
+function default_install() {
+ cmake_install
+}

#---------------------------------------------------------------------
function kde4_build() {
diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS
index e3f854c..0576fcc 100755
--- a/KDE5_DEPENDS
+++ b/KDE5_DEPENDS
@@ -1,4 +1,7 @@
depends -sub CXX gcc &&
depends cmake &&
depends extra-cmake-modules &&
+if [[ $CMAKE_GEN == Ninja ]];then
+ depends ninja-build-system
+fi &&
depends qtbase
diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS
index 2e6189a..ba2a763 100755
--- a/KDE5_FUNCTIONS
+++ b/KDE5_FUNCTIONS
@@ -15,9 +15,9 @@ default_build() {
kde5_build
}

-#function default_install() {
-# cmake_install
-#}
+function default_install() {
+ cmake_install
+}


# we need a default_final, default_post_remove
diff --git a/audio-libs/taglib/DEPENDS b/audio-libs/taglib/DEPENDS
index 60dd614..52b0f52 100755
--- a/audio-libs/taglib/DEPENDS
+++ b/audio-libs/taglib/DEPENDS
@@ -1 +1,5 @@
-depends cmake
+depends cmake &&
+depends zlib &&
+optional_depends boost '' '' '' &&
+optional_depends cppunit '' '' 'testing' &&
+optional_depends docygen '' '' 'build documentation'
diff --git a/audio-libs/taglib/DETAILS b/audio-libs/taglib/DETAILS
index 72dca4c..4e32da9 100755
--- a/audio-libs/taglib/DETAILS
+++ b/audio-libs/taglib/DETAILS
@@ -1,6 +1,6 @@
SPELL=taglib
- VERSION=1.9.1
-
SOURCE_HASH=sha512:63a4f06b88b33be716dde3111e62a624995bc020127c9d22f63e918a535ebba858c59308ca4295eeedb29dc72b87d6673db5483f20d9dbf3f56cd93c7ba7ed58
+ VERSION=1.10
+
SOURCE_HASH=sha512:2257918743507fffae01b961c714aa8523d3a8c0c921af699b0160c2414b1c930778f19976965e3197571672120a6040dbb13a83304b70290970660abcf27820
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://taglib.github.io/releases/$SOURCE
diff --git a/audio-libs/taglib/HISTORY b/audio-libs/taglib/HISTORY
index f7c6dd9..efec497 100644
--- a/audio-libs/taglib/HISTORY
+++ b/audio-libs/taglib/HISTORY
@@ -1,3 +1,7 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.10.0
+ * DEPENDS: add boost, zlib, cppunit, doxygen
+
2015-09-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix WEB_SITE

diff --git a/devel/cmake/DEPENDS b/devel/cmake/DEPENDS
index 1359d62..339e5c2 100755
--- a/devel/cmake/DEPENDS
+++ b/devel/cmake/DEPENDS
@@ -9,4 +9,5 @@ optional_depends libidn '' '' 'international domain name
support' &&
optional_depends qt4 \
"--qt-gui" \
"--no-qt-gui" \
- "for cmake-gui"
+ "for cmake-gui" &&
+suggest_depends ninja-build-system '' '' 'faster builds'
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 7cfe069..632df96 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: suggest ninja-build-system
+
2015-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.1

diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 1d6cf7d..cebecba 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,7 +1,7 @@
SPELL=partclone
- VERSION=0.2.86
-
SOURCE_HASH=sha512:f054d0994864a6fd0d3f83ec1f25189b4401aff0a2fb4993824947e708d23eab0804a230786c350414b1fcfa780d67d2416ad2b168c27a470b59a142203c9e5e
- SOURCE=${SPELL}-${VERSION}.tar.gz
+ VERSION=0.2.87
+
SOURCE_HASH=sha512:6e91a5c6925eabccc67aa18ee5aa78e9b3108c0fca1e1d14f2e7aa776fe9d35e46c18ec0098a2447a87a9989bb1ba1d2c8d239abd45f6663caf9504a5c93bc42
+ SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
WEB_SITE=http://partclone.org
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 765fc14..6902cbc 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.87
+
2015-11-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.86

diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 6d7df6c..2423241 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: added, for cmake_install
+
2015-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE: improve
* DEPENDS: disable ffmpeg if gstreamer is used
diff --git a/graphics-libs/opencv/INSTALL b/graphics-libs/opencv/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/graphics-libs/opencv/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index 6008fb9..1758675 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: added, for cmake_install
+
2015-11-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: add SOURCE3 for ippicv download
* PRE_BUILD: extract ippicv
diff --git a/graphics-libs/opencv3/INSTALL b/graphics-libs/opencv3/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/graphics-libs/opencv3/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/libs/flatbuffers/HISTORY b/libs/flatbuffers/HISTORY
index 51d295c..1bf60b4 100644
--- a/libs/flatbuffers/HISTORY
+++ b/libs/flatbuffers/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: added, use cmake_install
+
2015-10-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version v1.2.0

diff --git a/libs/flatbuffers/INSTALL b/libs/flatbuffers/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/libs/flatbuffers/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/qt5-cmake/FUNCTIONS b/qt5-cmake/FUNCTIONS
index bb2ac3e..5458614 100755
--- a/qt5-cmake/FUNCTIONS
+++ b/qt5-cmake/FUNCTIONS
@@ -2,3 +2,9 @@
default_build() {
qt5_cmake_build
}
+
+function default_install() {
+ cmake_install
+}
+
+
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index a4c7842..20f523c 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,6 @@
+2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: added,for cmake_install
+
2015-12-01 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD, DEPENDS: qt5 support

diff --git a/science-libs/vtk/INSTALL b/science-libs/vtk/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/science-libs/vtk/INSTALL
@@ -0,0 +1 @@
+cmake_install



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9f537e242f59df1ae9cc4b20c89a200c04671b1), Treeve Jelbert, 01/01/2016

Archive powered by MHonArc 2.6.24.

Top of Page