Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (8300586078c5911243d2ad0d2b5cb0f1e86423b2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (8300586078c5911243d2ad0d2b5cb0f1e86423b2)
  • Date: Thu, 24 Apr 2008 18:16:23 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

audio-drivers/alsa-driver/BUILD | 19 +++++++++++--------
audio-drivers/alsa-driver/DETAILS | 11 ++++++++---
audio-drivers/alsa-driver/HISTORY | 3 +++
audio-drivers/alsa-driver/PREPARE | 4 +++-
libs/confuse/HISTORY | 3 +++
libs/confuse/PRE_BUILD | 9 +++++++++
6 files changed, 37 insertions(+), 12 deletions(-)

New commits:
commit 8300586078c5911243d2ad0d2b5cb0f1e86423b2
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

audio-drivers/alsa-driver: modified to query/build from scm snapshots

commit e409bd4358d4e04ed74610608c6e8581be1eebb5
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

libs/confuse: removed -Wall from PRE_BUILD (breaks compilation with
gcc-4.3)

diff --git a/audio-drivers/alsa-driver/BUILD b/audio-drivers/alsa-driver/BUILD
index f98ba6e..f667099 100755
--- a/audio-drivers/alsa-driver/BUILD
+++ b/audio-drivers/alsa-driver/BUILD
@@ -1,18 +1,21 @@
# Clean out the old alsa drivers. FIXME: Bad location for 2.6!
-rm -f ${INSTALL_ROOT}/lib/modules/`get_kernel_version`/misc/snd* &&
+rm -f ${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/misc/snd* &&

if [[ $(get_sorcery_kernel_config CONFIG_SOUND) == m ||
`grep -c CONFIG_SOUND=m ${CONFIG_CACHE}/kernel.config` == 1 ]]
then
modprobe -q soundcore
-fi &&
+fi &&

-sedit "s:/usr/bin/awk:${TRACK_ROOT}/bin/awk:" utils/convert_isapnp_ids &&
-sedit "s: install-scripts : :" Makefile &&
-sedit "s:root.root:root.audio:" snddevices &&
+sedit "s:/usr/bin/awk:${TRACK_ROOT}/bin/awk:" utils/convert_isapnp_ids &&
+sedit "s: install-scripts : :" Makefile &&

-OPTS="--with-isapnp=yes --with-sequencer=yes --with-oss=yes
--with-debug=none \
- --with-moddir=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/misc
\
- --with-cards=${CARDS} ${OPTS}"
&&
+if [[ $ALSA_SNAPS != y ]]; then
+ sedit "s:root.root:root.audio:" snddevices
+fi &&
+
+OPTS="--with-isapnp=yes --with-sequencer=yes --with-oss=yes
--with-debug=none \
+ --with-moddir=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/misc
\
+ --with-cards=${CARDS} ${OPTS}"
&&

default_build
diff --git a/audio-drivers/alsa-driver/DETAILS
b/audio-drivers/alsa-driver/DETAILS
index 010f9d5..13efb23 100755
--- a/audio-drivers/alsa-driver/DETAILS
+++ b/audio-drivers/alsa-driver/DETAILS
@@ -1,10 +1,15 @@
SPELL=alsa-driver
+if [[ ${ALSA_SNAPS} == y ]]; then
+ VERSION=hg$(date +"%Y%m%d")
+ SOURCE_URL[0]=ftp://ftp.suse.com/pub/projects/alsa/snapshot/driver/$SOURCE
+ SOURCE_IGNORE=volatile
+else
VERSION=1.0.16
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/driver/$SOURCE
-#
SOURCE_HASH=sha512:c51a66e6985e6f3546452bc297175d7802733ed9cc6f5a66df749d5d3930c071b8fc559e3417d2b16b9535598514e962b757398328bbc01615ef98a486dd16da
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+fi
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://www.alsa-project.org/
KEYWORDS="drivers audio"
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index 42ab2ec..2ef595a 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,6 @@
+2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS, BUILD, PREPARE: modified to query/build from scm snapshots
+
2008-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* POST_REMOVE: always succeed #14280

diff --git a/audio-drivers/alsa-driver/PREPARE
b/audio-drivers/alsa-driver/PREPARE
index 46b9e8a..1ea3f42 100755
--- a/audio-drivers/alsa-driver/PREPARE
+++ b/audio-drivers/alsa-driver/PREPARE
@@ -8,4 +8,6 @@ $(get_sorcery_kernel_config CONFIG_SOUND) != m &&
then
message "${SPELL_COLOR} You *must* configure your kernel with CONFIG_SOUND
on${DEFAULT_COLOR}" &&
return 1
-fi
+fi &&
+
+config_query ALSA_SNAPS "Would you like to compile from snapshots? (may not
build)" n
diff --git a/libs/confuse/HISTORY b/libs/confuse/HISTORY
index ec8e4d5..51db073 100644
--- a/libs/confuse/HISTORY
+++ b/libs/confuse/HISTORY
@@ -1,3 +1,6 @@
+2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_BUILD: removed -Wall (breaks compilation with gcc-4.3)
+
2008-01-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: fixed SOURCE_URL[0], updated spell to 2.6, removed
UPDATED, cleaned up
diff --git a/libs/confuse/PRE_BUILD b/libs/confuse/PRE_BUILD
new file mode 100755
index 0000000..9c0757f
--- /dev/null
+++ b/libs/confuse/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit "s:-Wall::g" src/Makefile.am &&
+sedit "s:-Wall::g" src/Makefile.in &&
+sedit "s:-Wall::g" doc/Makefile.am &&
+sedit "s:-Wall::g" doc/Makefile.in &&
+sedit "s:-Wall::g" tests/Makefile.am &&
+sedit "s:-Wall::g" tests/Makefile.in



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (8300586078c5911243d2ad0d2b5cb0f1e86423b2), Elisamuel Resto, 04/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page