Skip to Content.
Sympa Menu

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

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 (59fdb7f991d5043b4944fdb5fcecaf67993a4183)
  • Date: Thu, 25 Feb 2010 09:52:54 -0600

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

audio-creation/audacity/BUILD | 11 +------
audio-creation/audacity/DETAILS | 7 ++---
audio-creation/audacity/HISTORY | 5 +++
audio-creation/audacity/PRE_BUILD | 3 --
audio-creation/audacity/audacity-1.3.8-gsocket-conflict.patch | 14
----------
5 files changed, 10 insertions(+), 30 deletions(-)

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

audio-creation/audacity: version 1.3.11, changed BUILD so it uses
default_build

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 14eab5c..25511c3 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -10,13 +10,6 @@ OPTS="$AUDACITY_LADSPA $OPTS" &&
OPTS="$AUDACITY_PORTMIXER $OPTS" &&
OPTS="$AUDACITY_PORTAUDIO $OPTS" &&
OPTS="$AUDACITY_NYQUIST $OPTS"
+OPTS="--with-lib-preferences=system $OPTS" &&

-./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --with-lib-preference=system \
- $OPTS &&
-
-make
+default_build
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 07db2e1..f506bfb 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -12,11 +12,11 @@ if [ "$AUDACITY_REL" == "cvs" ]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
if [ "$AUDACITY_REL" == "beta" ]; then
- VERSION=1.3.9
-
SOURCE_HASH=sha512:a30a7b6e9cb362b92e32fb848e5088237738376261bb1019c5e895a3e51ebfcce2d5396edc48f3d6acb030d8823ca661481c1f8313f84946b4606ea9280466af
+ VERSION=1.3.11
+
SOURCE_HASH=sha512:ef8f32b7bdbb27f841815cae2e157610cdc1ef572594e559f6803159b2e1d862462f20bd719155fbf44d722a88a0890e3942f3723931de5eb1acb3363626581d
SOURCE=$SPELL-minsrc-$VERSION.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION-beta
else
VERSION=1.2.6
SOURCE=${SPELL}-src-${VERSION}.tar.gz
@@ -43,4 +43,3 @@ part of a sound. It also has a built-in amplitude envelope
editor, a
customizable spectrogram mode and a frequency analysis window for audio
analysis applications.
EOF
-
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index bf8c6b5..62017fb 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,8 @@
+2010-02-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.11 (beta)
+ * PRE_BUILD, audacity-1.3.8-gsocket-conflict.patch: removed
+ * BUILD: use default_build
+
2009-10-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.9 (beta)
* PRE_BUILD, audacity-1.3.8-gsocket-conflict.patch: added patch from
diff --git a/audio-creation/audacity/PRE_BUILD
b/audio-creation/audacity/PRE_BUILD
deleted file mode 100755
index ed21350..0000000
--- a/audio-creation/audacity/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/audacity-1.3.8-gsocket-conflict.patch
diff --git a/audio-creation/audacity/audacity-1.3.8-gsocket-conflict.patch
b/audio-creation/audacity/audacity-1.3.8-gsocket-conflict.patch
deleted file mode 100644
index 1b296cf..0000000
--- a/audio-creation/audacity/audacity-1.3.8-gsocket-conflict.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp
audacity-src-1.3.8/src/AudacityApp.cpp
---- audacity-src-1.3.8-orig/src/AudacityApp.cpp 2009-07-16
05:27:35.000000000 +0200
-+++ audacity-src-1.3.8/src/AudacityApp.cpp 2009-07-20 23:45:41.000000000
+0200
-@@ -331,7 +331,9 @@
-
///////////////////////////////////////////////////////////////////////////////
-
- #include <dlfcn.h>
--#include <gtk/gtk.h>
-+/*#include <gtk/gtk.h>*/
-+#include <glib/gtypes.h>
-+#include <glib-object.h>
-
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (59fdb7f991d5043b4944fdb5fcecaf67993a4183), Florian Franzmann, 02/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page