Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 ChangeLog                     |    4 ++++
 FUNCTIONS                     |    8 ++++++++
 audio-players/musique/BUILD   |    2 +-
 audio-players/musique/DEPENDS |    5 ++---
 audio-players/musique/DETAILS |   12 ++++++------
 audio-players/musique/HISTORY |    5 +++++
 rust-crates/FUNCTIONS         |    4 ++--
 7 files changed, 28 insertions(+), 12 deletions(-)

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

    rust-crates/FUNCTIONS - tweak

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

    FUNCTIONS - add qt6_build

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

    musique: => 1.12

diff --git a/ChangeLog b/ChangeLog
index 7dcbfe9..b00743c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-12-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * FUNCTIONS: add qt6_build
+       * rust-crates/FUNCTIONS: allow specifying OPTS
+
 2023-12-11 Pavel Vinogradov <public AT sourcemage.org>
        * vulkan/vulkan-utility-libraries: new spell, Utility libraries for 
Vulkan
          developers
diff --git a/FUNCTIONS b/FUNCTIONS
index a7dabf6..3bfb6e0 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -13,6 +13,14 @@ qt5_build() {
   make
 }
 
+qt6_build() {
+  export PATH+=":$QT6DIR/bin/"
+# qmake uses its own flag settings
+  qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS" 
QMAKE_CXXFLAGS="$CXXFLAGS"\
+    PREFIX=${1-$QT6DIR} LIBDIR=$QT6DIR/lib *.pro &&
+  make
+}
+
 function qt5_cmake_build() {
   cmake_build
 }
diff --git a/audio-players/musique/BUILD b/audio-players/musique/BUILD
index eec3de4..8c136a1 100755
--- a/audio-players/musique/BUILD
+++ b/audio-players/musique/BUILD
@@ -1 +1 @@
-qt4_build
+qt6_build
diff --git a/audio-players/musique/DEPENDS b/audio-players/musique/DEPENDS
index 93d7f58..2237ebd 100755
--- a/audio-players/musique/DEPENDS
+++ b/audio-players/musique/DEPENDS
@@ -1,5 +1,4 @@
 depends -sub CXX gcc &&
-depends -sub SQLITE qt4 &&
-depends sqlite          &&
-depends phonon          &&
+depends qt6base  &&
+depends mpv      &&
 depends -sub MP4 taglib
diff --git a/audio-players/musique/DETAILS b/audio-players/musique/DETAILS
index 0e689a2..52639bf 100755
--- a/audio-players/musique/DETAILS
+++ b/audio-players/musique/DETAILS
@@ -1,10 +1,10 @@
            SPELL=musique
-         VERSION=1.1
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:f8958eafb4840e366b97d4dfd03ca49f766c41c193f8575ec7950f6b30dcb792ca5c22b48ca3366b930a54914f3f465d15e7127a8b4db4c1d1bf5a7e7c6264ac
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
-        WEB_SITE="http://flavio.tordini.org/musique";
+         VERSION=1.12
+     
SOURCE_HASH=sha512:27606732f5b1d84a9ee12a1f35c3acf690cec46c6e3f5a43e9b05efc6ab924fbecd4f69c6edd214115f8034c411bdc06b59beeedaa8f140e76f0432167b1a0aa
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   
SOURCE_URL[0]=https://github.com/flaviotordini/musique/releases/download/$VERSION/$SOURCE
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="https://flavio.tordini.org/musique";
       LICENSE[0]=GPL
          ENTERED=20120303
            SHORT="a music player with a clean and innovative interface"
diff --git a/audio-players/musique/HISTORY b/audio-players/musique/HISTORY
index b15ce52..fabbc54 100644
--- a/audio-players/musique/HISTORY
+++ b/audio-players/musique/HISTORY
@@ -1,3 +1,8 @@
+2023-12-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.12
+         update url
+       * DEPENDS BUILD: use qt6, mpv
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: depends -sub CXX gcc (half-automated)
 
diff --git a/rust-crates/FUNCTIONS b/rust-crates/FUNCTIONS
index b593044..94e2896 100755
--- a/rust-crates/FUNCTIONS
+++ b/rust-crates/FUNCTIONS
@@ -2,7 +2,7 @@
 ## Section-default build script.
 #-------------------------------------------------------------------------
 function default_build_cargo() {
-  env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build --release
+  env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build --release $OPTS
 }
 
 #-------------------------------------------------------------------------
@@ -10,7 +10,7 @@ function default_build_cargo() {
 #-------------------------------------------------------------------------
 function default_install_cargo() {
   env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" \
-    cargo install --path "$SOURCE_DIRECTORY" --root "${INSTALL_ROOT}/usr" 
--locked $@ &&
+    cargo install --path "$SOURCE_DIRECTORY" --root "${INSTALL_ROOT}/usr" 
--locked $@ $OPTS&&
   rm -f "$INSTALL_ROOT/usr/.crates.toml" &&
   rm -f "$INSTALL_ROOT/usr/.crates2.json"
 }