Skip to Content.
Sympa Menu

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

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 (e07948521659a8658d219c4c420ab8b60d346760)
  • Date: Sun, 28 Sep 2008 18:41:33 -0500

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

audio-drivers/libffado/DEPENDS | 5 +---
audio-drivers/libffado/HISTORY | 8 ++++++
audio-drivers/libffado/PRE_BUILD | 7 +-----
audio-drivers/libffado/libffado-env-vars.patch | 29
+++++++++++++++++++++++++
audio-drivers/libffado/libffado-pic.patch | 9 -------
5 files changed, 41 insertions(+), 17 deletions(-)

New commits:
commit 4afa43f69986bd8c85d7b05661d87ff5b738d22c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libffado: depends scons, use our CFLAGS & Co.

diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS
index 2700b5c..5a91ec2 100755
--- a/audio-drivers/libffado/DEPENDS
+++ b/audio-drivers/libffado/DEPENDS
@@ -1,3 +1,4 @@
+depends scons &&
if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
depends libatomic_ops
fi &&
@@ -10,9 +11,7 @@ depends dbus &&
depends g++ &&
depends glib2 &&
depends libsigc++3 &&
-# could be optional for mixer GUI
-depends qt4 &&
-depends pyqt4 &&
+optional_depends PYQT "" "" "for mixer GUI" &&
depends dbus-python &&
depends sip

diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 800a349..9e1de47 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,11 @@
+2008-09-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: needs scons
+ * PRE_BUILD, libffado-env-vars.patch, libffado-pic.patch:
+ Just use our environment variables for build (esp. PIC & Co).
+
+2008-09-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: optionally depend on some PYQT, not hard on pyqt4
+
2008-09-19 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, DEPENDS, libffado-atomic_ops.patch:
attempt to make it work on alpha using libatomic_ops
diff --git a/audio-drivers/libffado/PRE_BUILD
b/audio-drivers/libffado/PRE_BUILD
index 6ed6709..fe2fab5 100755
--- a/audio-drivers/libffado/PRE_BUILD
+++ b/audio-drivers/libffado/PRE_BUILD
@@ -1,10 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-echo "CFLAGS: $CFLAGS" &&
-if echo "$CFLAGS" | grep -q PIC; then
- message "${MESSAGE_COLOR}Patching build to make PIC work...$DEFAULT_COLOR"
&&
- patch -p0 < "$SCRIPT_DIRECTORY/libffado-pic.patch"
-fi &&
+message "${MESSAGE_COLOR}Patching build use our flags...$DEFAULT_COLOR" &&
+patch -p0 < "$SCRIPT_DIRECTORY/libffado-env-vars.patch" &&
if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
message "${MESSAGE_COLOR}Aptching for portable atomic
operations...$DEFAULT_COLOR" &&
patch -p0 < "$SCRIPT_DIRECTORY/libffado-atomic_ops.patch"
diff --git a/audio-drivers/libffado/libffado-env-vars.patch
b/audio-drivers/libffado/libffado-env-vars.patch
new file mode 100644
index 0000000..0650f41
--- /dev/null
+++ b/audio-drivers/libffado/libffado-env-vars.patch
@@ -0,0 +1,29 @@
+Index: SConstruct
+===================================================================
+--- SConstruct (Revision 1352)
++++ SConstruct (Arbeitskopie)
+@@ -535,6 +535,24 @@
+ #
+ env['top_srcdir'] = env.Dir( "." ).abspath
+
++# Be environmentally friendly...
++import os
++import SCons.Util
++
++if os.environ.has_key('CC'):
++ env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++
+ #
+ # Start building
+ #
diff --git a/audio-drivers/libffado/libffado-pic.patch
b/audio-drivers/libffado/libffado-pic.patch
deleted file mode 100644
index 0751582..0000000
--- a/audio-drivers/libffado/libffado-pic.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- external/libconfig/SConscript.orig 2008-09-13 19:12:01.808337148 +0200
-+++ external/libconfig/SConscript 2008-09-13 19:12:56.428690589 +0200
-@@ -36,4 +36,6 @@
- if env.has_key('DEBUG') and env['DEBUG']:
- env.AppendUnique( CCFLAGS=["-DDEBUG","-g"] )
-
-+env.AppendUnique( CCFLAGS=["-fPIC"] )
-+
- libconfig = env.StaticLibrary('libconfigpp', sources)



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e07948521659a8658d219c4c420ab8b60d346760), Thomas Orgis, 09/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page