[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (3925e783f2272fca9666711facb9d9c14070f5dd)

Juuso Alasuutari scm at mail.sourcemage.org
Sat Aug 19 08:26:56 EDT 2006


GIT changes to master grimoire by Juuso Alasuutari <iuso at sourcemage.org>:

 audio-soft/qjackctl/BUILD       |   15 ++-------------
 audio-soft/qjackctl/CONFIGURE   |    2 ++
 audio-soft/qjackctl/DEPENDS     |    7 +++++--
 audio-soft/qjackctl/DETAILS     |   20 ++++++++------------
 audio-soft/qjackctl/HISTORY     |    9 +++++++++
 audio-soft/qjackctl/qconf.patch |   17 -----------------
 audio-soft/qjackctl/qjpro.patch |   12 ------------
 7 files changed, 26 insertions(+), 56 deletions(-)

New commits:
commit 3925e783f2272fca9666711facb9d9c14070f5dd
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    qjackctl: Converted to build API 2, added new compile options, minor
    fixes.

diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index 4bf377c..135a521 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,13 +1,2 @@
-(
-
-patch -p0<$SCRIPT_DIRECTORY/qconf.patch &&
-patch -p0<$SCRIPT_DIRECTORY/qjpro.patch &&
-
-export QTDIR=/usr &&
-./configure --prefix=/usr \
-	    $OPTS	&&
-
-make &&
-make install
-
-) > $C_FIFO 2>&1
+OPTS="$QJCTL_TRAY $OPTS"  &&
+default_build
diff --git a/audio-soft/qjackctl/CONFIGURE b/audio-soft/qjackctl/CONFIGURE
new file mode 100755
index 0000000..b9b7608
--- /dev/null
+++ b/audio-soft/qjackctl/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option  QJCTL_TRAY  "Enable system tray?"  y  \
+                     ""  "--disable-system-tray"
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 9ac2f02..34dabef 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,2 +1,5 @@
-depends JACK-DRIVER &&
-depends qt-x11
+depends  qt-x11       &&
+depends  JACK-DRIVER  &&
+
+optional_depends  alsa-lib  ""  "--disable-alsa-seq"  \
+                  "for ALSA/MIDI sequencer support"
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 2ffe7fe..fbbba0c 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -2,26 +2,22 @@
          VERSION=0.2.20
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:0169270e95b2e7f643478989452fda87b7940c48dc6f86ef53905a029569bbe92f793e54838789ed3c9956b572218550d65447b649e16f8456c792984be77854
         WEB_SITE=http://qjackctl.sf.net
          ENTERED=20031215
-         UPDATED=20031215
       LICENSE[0]=GPL
-      MAINTAINER=unet at sourcemage.org
         KEYWORDS="jack qt tools audio"
-       BUILD_API=1
-           SHORT="Qjackctl is a simple Qt application to control the JACK sound server daemon"
+           SHORT="A simple Qt application to control the JACK sound server daemon."
 cat << EOF
-Qjackctl is a simple Qt application to control the JACK sound server 
-daemon, specific for the Linux Audio Desktop infrastructure.
+Qjackctl is a simple Qt application to control the JACK sound server daemon, 
+specific for the Linux Audio Desktop infrastructure.
 
 Written in C++ around the Qt3 toolkit for X11, most exclusively using Qt 
 Designer.
 
-Provides a simple GUI dialog for setting several JACK daemon parameters, 
-which are properly saved between sessions, and a way control of the 
-status of the audio server daemon. With time, this primordial interface 
-has become richer by including a enhanced patchbay and connection 
-control features.
+Provides a simple GUI dialog for setting several JACK daemon parameters, which 
+are properly saved between sessions, and a way control of the status of the 
+audio server daemon. With time, this primordial interface has become richer by 
+including a enhanced patchbay and connection control features.
 EOF
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index d191ccc..f752933 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,12 @@
+2006-08-19 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: Removed UPDATED & MAINTAINER & BUILD_API=1, modified 
+	  descriptions.
+	* CONFIGURE: Added. Query about system tray option.
+	* DEPENDS: optional_depends alsa-lib for ALSA/MIDI support.
+	* BUILD: Converted to build API 2, removed obsolete patching and 
+	  QTDIR export.
+	* qconf.patch, qjpro.patch: Deleted.
+
 2006-07-24 Unet <unet at sourcemage.org>
 	* DETAILS: Updated to 0.2.20
 
diff --git a/audio-soft/qjackctl/qconf.patch b/audio-soft/qjackctl/qconf.patch
deleted file mode 100644
index d79060e..0000000
--- a/audio-soft/qjackctl/qconf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-*** configure.old	2003-12-15 15:44:40.000000000 +0100
---- configure	2003-12-15 15:45:11.000000000 +0100
-***************
-*** 1142,1147 ****
-  
-  
-! CFLAGS="$CFLAGS -I$QTDIR/include"
-! CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
-  LIBS="-L$QTDIR/lib -L/usr/X11R6/lib"
-  
---- 1142,1147 ----
-  
-  
-! CFLAGS="$CFLAGS -I$QTDIR/include/qt"
-! CPPFLAGS="$CPPFLAGS -I$QTDIR/include/qt"
-  LIBS="-L$QTDIR/lib -L/usr/X11R6/lib"
-  
diff --git a/audio-soft/qjackctl/qjpro.patch b/audio-soft/qjackctl/qjpro.patch
deleted file mode 100644
index 2899eed..0000000
--- a/audio-soft/qjackctl/qjpro.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** qjackctl.pro.in.old	2003-12-15 16:02:59.000000000 +0100
---- qjackctl.pro.in	2003-12-15 16:03:17.000000000 +0100
-***************
-*** 1,3 ****
-! INCLUDEPATH += ./src
-  
-  SOURCES += src/main.cpp \
---- 1,4 ----
-! INCLUDEPATH += ./src \
-!            /usr/include/qt
-  
-  SOURCES += src/main.cpp \



More information about the SM-Commit mailing list