Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 ChangeLog                       |    3 +++
 devel/qbs/DETAILS               |    4 ++--
 devel/qbs/HISTORY               |    3 +++
 graphics-libs/opencv3/DETAILS   |    4 +++-
 graphics-libs/opencv3/HISTORY   |    3 +++
 graphics-libs/opencv3/PREPARE   |    5 -----
 graphics-libs/opencv3/PRE_BUILD |    6 ++++--
 qt5-cmake/drumstick/CONFIGURE   |    1 +
 qt5-cmake/drumstick/DEPENDS     |    5 +++++
 qt5-cmake/drumstick/DETAILS     |   18 ++++++++++++++++++
 qt5-cmake/drumstick/HISTORY     |    3 +++
 qt5-cmake/drumstick/PRE_BUILD   |    3 +++
 12 files changed, 48 insertions(+), 10 deletions(-)

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

    opencv3 - support opencv_contrib

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

    drumstick-1.0.1

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

    qbs: => 1.4.3

diff --git a/ChangeLog b/ChangeLog
index fb23cb9..9641cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-11-07  Treeve Jelbert <treeve AT sourcemage.org>
+       * qt5-cmake/drumstick: added, qt5 MIDI libraries & player
+
 2015-10-30  Treeve Jelbert <treeve AT sourcemage.org>
        * libs/flatbuffers: efficient cross platform serialization library
 
diff --git a/devel/qbs/DETAILS b/devel/qbs/DETAILS
index 0847df3..f107e88 100755
--- a/devel/qbs/DETAILS
+++ b/devel/qbs/DETAILS
@@ -1,7 +1,7 @@
 QT_URL=http://download.qt.io/official_releases/
            SPELL=qbs
-         VERSION=1.4.2
-     
SOURCE_HASH=sha512:dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
+         VERSION=1.4.3
+     
SOURCE_HASH=sha512:b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a
           SOURCE=qbs-src-$VERSION.tar.gz
       SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
diff --git a/devel/qbs/HISTORY b/devel/qbs/HISTORY
index f4e70ca..7495a99 100644
--- a/devel/qbs/HISTORY
+++ b/devel/qbs/HISTORY
@@ -1,3 +1,6 @@
+2015-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.4.3
+
 2015-10-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.4.2
        * PRE_BUILD: added
diff --git a/graphics-libs/opencv3/DETAILS b/graphics-libs/opencv3/DETAILS
index 5702363..72f154d 100755
--- a/graphics-libs/opencv3/DETAILS
+++ b/graphics-libs/opencv3/DETAILS
@@ -5,7 +5,9 @@
 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
-
+    
SOURCE2_HASH=sha512:f220d469adc900147c3f6edf4ee16c8153b42c34bed69dd45d827efee1021903e1aecf74dee64d4b437998a61437b861e19ddb8f8d54902e1565e72d38aef50c
+         SOURCE2=opencv_contrib-$VERSION.tar.gz
+  
SOURCE2_URL[0]=https://github.com/Itseez/opencv_contrib/archive/$VERSION.tar.gz
 fi
            TMPFS=off
         WEB_SITE=http://opencv.org
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index 74535d3..c588b6c 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,6 @@
+2015-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS PREPARE PRE_BUILD: support opencv_contrib
+
 2015-09-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3,0.0
 
diff --git a/graphics-libs/opencv3/PREPARE b/graphics-libs/opencv3/PREPARE
index 89d1bec..b9ca51d 100755
--- a/graphics-libs/opencv3/PREPARE
+++ b/graphics-libs/opencv3/PREPARE
@@ -1,7 +1,2 @@
 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
index 9743fcf..776b92e 100755
--- a/graphics-libs/opencv3/PRE_BUILD
+++ b/graphics-libs/opencv3/PRE_BUILD
@@ -1,9 +1,11 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
 if ! list_find "$CV_CONTRIB" none ;then
+ cd $BUILD_DIRECTORY  &&
+ unpack_file 2 &&
+ cd $SOURCE_DIRECTORY &&
  mkdir contrib &&
  cd contrib    &&
  for FF in $CV_CONTRIB;do
-   ln -sf $BUILD_DIRECTORY/opencv_contrib/modules/$FF
+   ln -sf $BUILD_DIRECTORY/opencv_contrib-$VERSION/modules/$FF
  done
 fi
diff --git a/qt5-cmake/drumstick/CONFIGURE b/qt5-cmake/drumstick/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/qt5-cmake/drumstick/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/drumstick/DEPENDS b/qt5-cmake/drumstick/DEPENDS
new file mode 100755
index 0000000..fedf7f7
--- /dev/null
+++ b/qt5-cmake/drumstick/DEPENDS
@@ -0,0 +1,5 @@
+source $GRIMOIRE/QT5_DEPENDS &&
+depends alsa-lib &&
+depends shared-mime-info &&
+optional_depends fluidsynth '' '' 'real-time software synthesizer' &&
+optional_depends doxygen '' '' 'build documentation'
diff --git a/qt5-cmake/drumstick/DETAILS b/qt5-cmake/drumstick/DETAILS
new file mode 100755
index 0000000..498107b
--- /dev/null
+++ b/qt5-cmake/drumstick/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=drumstick
+         VERSION=1.0.1
+     
SOURCE_HASH=sha512:d1d3fd3d4d460d8c53dbd73dd449bd049f6baac653b6eaac8800d7a615881e5ef29877c82fb5e162f2612c004e2c70236206476ff4fe505fd20497f737ac1ab0
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://sourceforge.net/projects/drumstick/files/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=http://sourceforge.net/p/drumstick
+      LICENSE[0]=GPL
+         ENTERED=
+        KEYWORDS="qt5 multimedia"
+           SHORT=
+cat << EOF
+Drumstick is a set of MIDI libraries using C++/Qt5 idioms and style. 
Includes 
+a C++ wrapper around the ALSA library sequencer interface: ALSA sequencer 
+provides software support for MIDI technology on Linux. A complementary 
+library provides classes for processing SMF (Standard MIDI files: 
.MID/.KAR), 
+Cakewalk (.WRK), and Overture (.OVE) file formats
+EOF
diff --git a/qt5-cmake/drumstick/HISTORY b/qt5-cmake/drumstick/HISTORY
new file mode 100644
index 0000000..295bb02
--- /dev/null
+++ b/qt5-cmake/drumstick/HISTORY
@@ -0,0 +1,3 @@
+2015-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.1
+         spell created
diff --git a/qt5-cmake/drumstick/PRE_BUILD b/qt5-cmake/drumstick/PRE_BUILD
new file mode 100755
index 0000000..a829301
--- /dev/null
+++ b/qt5-cmake/drumstick/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D;/LIB_SUFFIX/s/64//' CMakeLists.txt