Skip to Content.
Sympa Menu

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

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 (52b5883bd806482c5ffb6bce68ef8c1ba70e4669)
  • Date: Sat, 3 Mar 2012 11:48:07 -0600

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

ChangeLog | 3 +++
audio-libs/taglib/BUILD | 2 +-
audio-libs/taglib/CONFIGURE | 4 ++--
audio-libs/taglib/HISTORY | 4 ++++
audio-libs/taglib/PRE_SUB_DEPENDS | 6 ++++++
audio-libs/taglib/SUB_DEPENDS | 5 +++++
audio-players/minitunes/BUILD | 3 +--
audio-players/minitunes/DEPENDS | 3 +--
audio-players/minitunes/DETAILS | 20 +++++++-------------
audio-players/minitunes/DOWNLOAD | 1 +
audio-players/minitunes/HISTORY | 5 +++++
audio-players/minitunes/INSTALL | 1 +
audio-players/minitunes/PRE_BUILD | 5 +----
audio-players/minitunes/TRIGGERS | 1 +
audio-players/musique/BUILD | 1 +
audio-players/musique/DEPENDS | 4 ++++
audio-players/musique/DETAILS | 23 +++++++++++++++++++++++
audio-players/musique/HISTORY | 3 +++
18 files changed, 70 insertions(+), 24 deletions(-)

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

audio-players/minitunes: renamed to audio-players/musique

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

audio-libs/taglib: added sub dependencies for asf and mp4

diff --git a/ChangeLog b/ChangeLog
index 5c482a6..d2092c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * audio-players/minitunes: deprecated, renamed to
audio-players/musique
+
2012-03-03 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/alembic: new spell, database migration tool

diff --git a/audio-libs/taglib/BUILD b/audio-libs/taglib/BUILD
index 72f41e7..8d4d263 100755
--- a/audio-libs/taglib/BUILD
+++ b/audio-libs/taglib/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS $TAGLIB_OPTS" &&
+OPTS="$OPTS $TAGLIB_ASF $TAGLIB_MP4" &&
cmake_build
diff --git a/audio-libs/taglib/CONFIGURE b/audio-libs/taglib/CONFIGURE
index 0b3a098..45f4f00 100755
--- a/audio-libs/taglib/CONFIGURE
+++ b/audio-libs/taglib/CONFIGURE
@@ -1,2 +1,2 @@
-config_query_option TAGLIB_OPTS 'Enable ASF support?' n '-DWITH_ASF=ON'
'-DWITH_ASF=OFF' &&
-config_query_option TAGLIB_OPTS 'Enable MP4 support?' n '-DWITH_MP4=ON'
'-DWITH_MP4=OFF'
+config_query_option TAGLIB_ASF 'Enable ASF support?' n '-DWITH_ASF=ON'
'-DWITH_ASF=OFF' &&
+config_query_option TAGLIB_MP4 'Enable MP4 support?' n '-DWITH_MP4=ON'
'-DWITH_MP4=OFF'
diff --git a/audio-libs/taglib/HISTORY b/audio-libs/taglib/HISTORY
index b7b798a..755b4e4 100644
--- a/audio-libs/taglib/HISTORY
+++ b/audio-libs/taglib/HISTORY
@@ -1,3 +1,7 @@
+2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS: added sub
dependencies
+ for asf and mp4
+
2011-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: WEB_SITE and SOURCE_URL[0] updated, ktown -> developer

diff --git a/audio-libs/taglib/PRE_SUB_DEPENDS
b/audio-libs/taglib/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0e67ca5
--- /dev/null
+++ b/audio-libs/taglib/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ ASF) [[ $TAGLIB_ASF == "-DWITH_ASF=ON" ]] && return 0;;
+ MP4) [[ $TAGLIB_MP4 == "-DWITH_MP4=ON" ]] && return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
diff --git a/audio-libs/taglib/SUB_DEPENDS b/audio-libs/taglib/SUB_DEPENDS
new file mode 100755
index 0000000..e116664
--- /dev/null
+++ b/audio-libs/taglib/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ASF) echo "ASF requested, forcing build." && TAGLIB_ASF="-DWITH_ASF=ON" ;;
+MP4) echo "mp4 requested, forcing build." && TAGLIB_MP4="-DWITH_MP4=ON" ;;
+*) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/audio-players/minitunes/BUILD b/audio-players/minitunes/BUILD
index 3ba0b3a..27ba77d 100755
--- a/audio-players/minitunes/BUILD
+++ b/audio-players/minitunes/BUILD
@@ -1,2 +1 @@
-/usr/bin/qt4/qmake &&
-make
+true
diff --git a/audio-players/minitunes/DEPENDS b/audio-players/minitunes/DEPENDS
index 03c0a24..734469a 100755
--- a/audio-players/minitunes/DEPENDS
+++ b/audio-players/minitunes/DEPENDS
@@ -1,2 +1 @@
-depends qt4 &&
-depends phonon
+depends musique
diff --git a/audio-players/minitunes/DETAILS b/audio-players/minitunes/DETAILS
index 2998a9a..45d5553 100755
--- a/audio-players/minitunes/DETAILS
+++ b/audio-players/minitunes/DETAILS
@@ -1,13 +1,7 @@
- SPELL=minitunes
- VERSION=1.0
- SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=http://flavio.tordini.org/files/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f7c1763035b9193a2c09b357541ca62d81adc61245b35e94c7c3159a914648bd2c6532dfc042363f270e5956b668dfbdd27737d4ef283837a0f3ab5b619ed563
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
- WEB_SITE="http://flavio.tordini.org/minitunes";
- LICENSE[0]=GPL
- ENTERED=20100107
- SHORT="just another music player"
-cat << EOF
-Just another music player.
-EOF
+ SPELL=minitunes
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by musique]
+ EOF
diff --git a/audio-players/minitunes/DOWNLOAD
b/audio-players/minitunes/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/minitunes/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/audio-players/minitunes/HISTORY b/audio-players/minitunes/HISTORY
index fc367d0..6faef78 100644
--- a/audio-players/minitunes/HISTORY
+++ b/audio-players/minitunes/HISTORY
@@ -1,3 +1,8 @@
+2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [renamed to musique]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0

diff --git a/audio-players/minitunes/INSTALL b/audio-players/minitunes/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/minitunes/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-players/minitunes/PRE_BUILD
b/audio-players/minitunes/PRE_BUILD
index aea9672..27ba77d 100755
--- a/audio-players/minitunes/PRE_BUILD
+++ b/audio-players/minitunes/PRE_BUILD
@@ -1,4 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sed -i "s:/usr/local:/usr:" minitunes.pro
+true
diff --git a/audio-players/minitunes/TRIGGERS
b/audio-players/minitunes/TRIGGERS
new file mode 100755
index 0000000..374bd70
--- /dev/null
+++ b/audio-players/minitunes/TRIGGERS
@@ -0,0 +1 @@
+on_cast minitunes dispel_self
diff --git a/audio-players/musique/BUILD b/audio-players/musique/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/audio-players/musique/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/audio-players/musique/DEPENDS b/audio-players/musique/DEPENDS
new file mode 100755
index 0000000..7100ce6
--- /dev/null
+++ b/audio-players/musique/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub SQLITE qt4 &&
+depends sqlite &&
+depends phonon &&
+depends -sub MP4 taglib
diff --git a/audio-players/musique/DETAILS b/audio-players/musique/DETAILS
new file mode 100755
index 0000000..0e689a2
--- /dev/null
+++ b/audio-players/musique/DETAILS
@@ -0,0 +1,23 @@
+ 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";
+ LICENSE[0]=GPL
+ ENTERED=20120303
+ SHORT="a music player with a clean and innovative interface"
+cat << EOF
+Musique is a music player designed by and for people that love music. Musique
+does its best to stay out of the way and keep you focused on the only thing
+that really matters: Music. You need to try it to really get it.
+
+On first run, just point Musique to your music folder and let it scan. This
+will take some time depending on the size of your library, but it's a
+one-time operation.
+
+To set expectations right — Musique is not about podcasts or internet radio;
+it's not about managing mobile devices and it has no integrated music store.
+It's about listening to beautiful music.
+EOF
diff --git a/audio-players/musique/HISTORY b/audio-players/musique/HISTORY
new file mode 100644
index 0000000..77823e2
--- /dev/null
+++ b/audio-players/musique/HISTORY
@@ -0,0 +1,3 @@
+2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (52b5883bd806482c5ffb6bce68ef8c1ba70e4669), Florian Franzmann, 03/03/2012

Archive powered by MHonArc 2.6.24.

Top of Page