Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (694f56f84d1da450530dabb1157810f69c78fb3c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (694f56f84d1da450530dabb1157810f69c78fb3c)
  • Date: Wed, 5 Sep 2012 16:09:41 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-libs/clalsadrv/BUILD | 3 ++-
audio-libs/clalsadrv/DETAILS | 10 +++++-----
audio-libs/clalsadrv/HISTORY | 4 ++++
audio-libs/clalsadrv/INSTALL | 2 +-
audio-libs/clalsadrv/PRE_BUILD | 4 ----
audio-players/mpg123/DETAILS | 2 +-
audio-players/mpg123/HISTORY | 3 +++
x11-toolkits/qwt5/BUILD | 8 +-------
x11-toolkits/qwt5/CONFLICTS | 3 +++
x11-toolkits/qwt5/DEPENDS | 2 +-
x11-toolkits/qwt5/DETAILS | 4 ++--
x11-toolkits/qwt5/HISTORY | 5 +++++
x11-toolkits/qwt5/PRE_BUILD | 22 +++++++++-------------
13 files changed, 37 insertions(+), 35 deletions(-)

New commits:
commit 694f56f84d1da450530dabb1157810f69c78fb3c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qwt5: update tp 6.0.1

commit 6500ad9434c742aa135e0c5de43eaa3cca96a983
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg132: bump to 1.14.4

commit 1bf8f77eb4ed87a2b3b7793271aba0499cf6fb17
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

clalsadrv: bump to 2.0.0

diff --git a/audio-libs/clalsadrv/BUILD b/audio-libs/clalsadrv/BUILD
index 8f58e6d..7c0fefc 100755
--- a/audio-libs/clalsadrv/BUILD
+++ b/audio-libs/clalsadrv/BUILD
@@ -1 +1,2 @@
-make
+cd libs
+make PREFIX="$INSTALL_ROOT/usr"
diff --git a/audio-libs/clalsadrv/DETAILS b/audio-libs/clalsadrv/DETAILS
index 459d24c..73c43db 100755
--- a/audio-libs/clalsadrv/DETAILS
+++ b/audio-libs/clalsadrv/DETAILS
@@ -1,10 +1,10 @@
SPELL=clalsadrv
- VERSION=1.2.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE
-
SOURCE_HASH=sha512:a1b15551488d0bb597339804b36ed4cbb2459db24a3f71c1a068e3874eba10059668d358d8e0202b2964d3b80ed41d51f6db657614102a9a2b99597a7cd87106
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- WEB_SITE=http://users.skynet.be/solaris/linuxaudio/
+
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/$SOURCE
+
SOURCE_HASH=sha512:6913fefa913ef50a8245541a7a1cafe76d1768bb4fa302d6ac0db86b40cc8b702ae3d257d0998809cc26f116a69db591b73f01a4ca0021bd062189438ca69ab8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://kokkinizita.linuxaudio.org/linuxaudio/
LICENSE[0]=GPL
ENTERED=20060818
KEYWORDS="library audio"
diff --git a/audio-libs/clalsadrv/HISTORY b/audio-libs/clalsadrv/HISTORY
index a13ad64..1fa4e76 100644
--- a/audio-libs/clalsadrv/HISTORY
+++ b/audio-libs/clalsadrv/HISTORY
@@ -1,3 +1,7 @@
+2012-09-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, INSTALL, BUILD: bump to 2.0.0, website update
+ * PRE_BUILD: gone
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-libs/clalsadrv/INSTALL b/audio-libs/clalsadrv/INSTALL
index f1c9903..82b3260 100755
--- a/audio-libs/clalsadrv/INSTALL
+++ b/audio-libs/clalsadrv/INSTALL
@@ -1,2 +1,2 @@
# No lib64 == no suffix.
-make SUFFIX= install
+make SUFFIX= PREFIX="$INSTALL_ROOT/usr" install
diff --git a/audio-libs/clalsadrv/PRE_BUILD b/audio-libs/clalsadrv/PRE_BUILD
deleted file mode 100755
index 120c542..0000000
--- a/audio-libs/clalsadrv/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "s:PREFIX = .*:PREFIX = ${INSTALL_ROOT}/usr:" Makefile
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index fecd0d8..f23b391 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.14.3
+ VERSION=1.14.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 1936bbe..2d9f05d 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2012-07-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.14.4
+
2012-07-04 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to 1.14.3

diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index 068c7d2..7255991 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1,9 +1,3 @@
export QTDIR=${INSTALL_ROOT}/usr &&
-local QMAKE &&
-if spell_ok qt4;then
- QMAKE=${TRACK_ROOT}/usr/bin/qt4/qmake
-else
- QMAKE=${TRACK_ROOT}/usr/bin/qmake
-fi &&
-$QMAKE &&
+$TRACK_ROOT/usr/bin/qt4/qmake &&
make
diff --git a/x11-toolkits/qwt5/CONFLICTS b/x11-toolkits/qwt5/CONFLICTS
new file mode 100755
index 0000000..b69e67d
--- /dev/null
+++ b/x11-toolkits/qwt5/CONFLICTS
@@ -0,0 +1,3 @@
+# Shall not be present during build. Stupid, I know.
+# See:
http://sourceforge.net/tracker/?func=detail&aid=3470306&group_id=13693&atid=113693
+conflicts qwt5
diff --git a/x11-toolkits/qwt5/DEPENDS b/x11-toolkits/qwt5/DEPENDS
index 4cdd0bb..028837c 100755
--- a/x11-toolkits/qwt5/DEPENDS
+++ b/x11-toolkits/qwt5/DEPENDS
@@ -1 +1 @@
-depends QT
+depends qt4
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 792f7b2..706b929 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,9 +1,9 @@
SPELL=qwt5
- VERSION=5.2.0
+ VERSION=6.0.1
SOURCE=qwt-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/qwt/${SOURCE}
-
SOURCE_HASH=sha512:15e1fd4eb5e3f1bd3f91ac1ce26358f69f67a81e5207aca81414d408591c112b7b3071fd58b8f226b495fc9d2cbe1f67c44db631ef0c759b8b6376c80e866562
+
SOURCE_HASH=sha512:36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610
WEB_SITE=http://qwt.sourceforge.net
ENTERED=20061003
LICENSE[0]=http://qwt.sourceforge.net/qwtlicense.html
diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY
index 2fe2fe0..f623d90 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,3 +1,8 @@
+2012-08-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, BUILD, DEPENDS, PRE_BUILD: update to qt4-only 6.0.1 ...
qwt5
+ name is suboptimal now.
+ * CONFLICTS: stupid qmake makes build conflict with installed version
+
2009-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.0

diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD
index e73fe2a..9ac9b76 100755
--- a/x11-toolkits/qwt5/PRE_BUILD
+++ b/x11-toolkits/qwt5/PRE_BUILD
@@ -1,17 +1,13 @@
default_pre_build &&
-sedit "s: INSTALLBASE = /usr/local/qwt-${VERSION}: INSTALLBASE =
$INSTALL_ROOT/usr:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-sedit "s:#CONFIG += QwtSVGItem:CONFIG += QwtSVGItem:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-#sedit "s:#CONFIG += QwtExamples:CONFIG += QwtExamples:" \
-# $SOURCE_DIRECTORY/qwtconfig.pri &&
-sedit "s:doc.path = \$\$INSTALLBASE/doc:doc.path =
\$\$INSTALLBASE/share/doc:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&

-sed -e '/realtime_plot \\/d' \
- -e '/bode \\/d' \
- -e '/svgmap/d' \
- -i $SOURCE_DIRECTORY/examples/examples.pro &&
+# Those messy droppings of this QT4 lib are annoying!
+# Trying to get things into some system-like order.

-sed -i -e '/INSTALLS/ s,doc,,' $SOURCE_DIRECTORY/src/src.pro
+sedit "s: QWT_INSTALL_PREFIX = /usr/local/qwt-\$\$QWT_VERSION:
QWT_INSTALL_PREFIX = $INSTALL_ROOT/usr:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri &&
+
+sedit "s:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/doc:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/share/doc/qwt:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri &&

+sedit "s:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/features:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (694f56f84d1da450530dabb1157810f69c78fb3c), Thomas Orgis, 09/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page