Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8)
  • Date: Wed, 14 Nov 2007 14:21:51 -0600

GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

audio-libs/openal/BUILD | 6 ++++--
audio-libs/openal/DEPENDS | 2 +-
audio-libs/openal/DETAILS | 8 ++++----
audio-libs/openal/HISTORY | 7 +++++++
audio-libs/openal/PRE_BUILD | 17 ++++++++++++-----
audio-libs/openal/gcc42.patch | 21 +++++++++++++++++++++
utils/hal-info/CONFIGURE | 3 ---
utils/hal-info/DEPENDS | 12 ++++++++++++
utils/hal-info/HISTORY | 5 ++---
utils/hal/DEPENDS | 6 +++++-
utils/hal/HISTORY | 5 +++++
11 files changed, 73 insertions(+), 19 deletions(-)

New commits:
commit 4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openal: fix runtime gcc 4.2 brokeness
fix source* for scm version (switch to svn)
(cherry picked from commit ffff4bd3b39a0cdcbc7497d1cb068fda98861f23)

commit 98da6c90c8736bcfa93e6523e77450d501cea7f2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal: added a force_depends on glibc, needs newer kernel headers than those
that came with glibc 2.4 #14080
(cherry picked from commit ea55a114457eebe25080f8e3709effc50b47f55e)

commit 051b4083843f37fcd9387df57d4226e00a1de1aa
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal-info: force_depends on older hal versions, needs 0.5.10+ #14079
other part of the bug
(cherry picked from commit 2fef37cc35fd8a2d15b80037cc9ddd303c5f102d)

commit df2ba28b3ea8df035cba91d92eb4103480af1f41
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "hal-info: correction for enable/disable WLAN killswitch support :
removed DEPENDS to avoid a circular dependency, added a config_query_option
in CONFIGURE instead"

This reverts commit 76222f7353a77cefa5c524948310a028c4431efb.
(cherry picked from commit 49b18996c7d413013bf6a328b07def5a9198444e)

commit 9112ab2bb3aa1c6872736de872b1f96f8d25d332
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal: removed hal-info #14079 (circular dependency and wrong)
(cherry picked from commit 11385724c82e11b7886133d3e8662bfe2780203c)

diff --git a/audio-libs/openal/BUILD b/audio-libs/openal/BUILD
index cae4399..15203e4 100755
--- a/audio-libs/openal/BUILD
+++ b/audio-libs/openal/BUILD
@@ -1,4 +1,6 @@
-if [[ $OPENAL_VERSION != release ]]; then
-cd linux
+if [[ $OPENAL_VERSION == snapshot ]]; then
+ cd linux
+elif [[ $OPENAL_VERSION == scm ]]; then
+ cd OpenAL-Sample
fi &&
default_build
diff --git a/audio-libs/openal/DEPENDS b/audio-libs/openal/DEPENDS
index e1fb913..4fcdce1 100755
--- a/audio-libs/openal/DEPENDS
+++ b/audio-libs/openal/DEPENDS
@@ -1,5 +1,5 @@
if [[ "$OPENAL_VERSION" == "scm" ]] ; then
-depends CVS
+ depends subversion
fi &&
depends autoconf &&
depends automake &&
diff --git a/audio-libs/openal/DETAILS b/audio-libs/openal/DETAILS
index 0a3d385..812f7be 100755
--- a/audio-libs/openal/DETAILS
+++ b/audio-libs/openal/DETAILS
@@ -5,9 +5,9 @@ if [[ "$OPENAL_VERSION" == "scm" ]] ; then
else
VERSION=scm
fi
- SOURCE=${SPELL}_cvs-src.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_cvs-src
-
SOURCE_URL[0]=cvs://:pserver:guest:guest AT opensource.creative.com:/usr/local/cvs-repository:openal
+ SOURCE=${SPELL}_svn-src.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_svn-src
+ SOURCE_URL[0]=svn_http://www.openal.org/repos/openal/trunk:openal
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
elif [[ "$OPENAL_VERSION" == "release" ]]; then
@@ -23,7 +23,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/mirror/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
- PATCHLEVEL=1
+ PATCHLEVEL=2
WEB_SITE=http://www.openal.org/
LICENSE[0]=LGPL
ENTERED=20030508
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index 69c9594..8591900 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,10 @@
+2007-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, gcc42.patch: fix gcc 4.2 problem
+ * BUILD, PRE_BUILD: cd to the correct dir
+ * DEPENDS: cvs -> subversion
+ * DETAILS: fixed SOURCE*, they moved to svn
+ PATCHLEVEL++
+
2007-04-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PREPARE: pick 3 different versions
* BUILD: support for 3 versions
diff --git a/audio-libs/openal/PRE_BUILD b/audio-libs/openal/PRE_BUILD
index bda55a1..2534b6b 100755
--- a/audio-libs/openal/PRE_BUILD
+++ b/audio-libs/openal/PRE_BUILD
@@ -1,7 +1,14 @@
default_pre_build &&
-if [[ $OPENAL_VERSION != release ]] ; then
-cd ${SOURCE_DIRECTORY} &&
-rm -rf `find -type d -name CVS` &&
-cd linux &&
-NOCONFIGURE=Y ./autogen.sh
+cd $SOURCE_DIRECTORY &&
+if [[ $OPENAL_VERSION == snapshot ]]; then
+ rm -rf `find -type d -name CVS` &&
+ cd linux &&
+ NOCONFIGURE=Y ./autogen.sh
+elif [[ $OPENAL_VERSION == scm ]]; then
+ rm -rf `find -type d -name .svn` &&
+ cd OpenAL-Sample &&
+ NOCONFIGURE=Y ./autogen.sh
+fi &&
+if [[ $OPENAL_VERSION != scm ]]; then
+ patch -p1 < $SPELL_DIRECTORY/gcc42.patch
fi
diff --git a/audio-libs/openal/gcc42.patch b/audio-libs/openal/gcc42.patch
new file mode 100644
index 0000000..b921e8c
--- /dev/null
+++ b/audio-libs/openal/gcc42.patch
@@ -0,0 +1,21 @@
+diff -Naur openal-0.0.8-orig/common/include/AL/alc.h
openal-0.0.8/common/include/AL/alc.h
+--- openal-0.0.8-orig/common/include/AL/alc.h 2006-02-11 03:36:55.000000000
-0600
++++ openal-0.0.8/common/include/AL/alc.h 2007-02-13 14:33:57.000000000
-0600
+@@ -187,7 +187,7 @@
+
+ ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context
);
+
+-ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( ALCvoid );
++ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void );
+
+ ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext
*context );
+
+@@ -248,7 +248,7 @@
+ typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext
*context );
+ typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext
*context );
+ typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext
*context );
+-typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
++typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
+ typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext
*context );
+ typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar
*devicename );
+ typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device
);
diff --git a/utils/hal-info/CONFIGURE b/utils/hal-info/CONFIGURE
index ea8647d..f961414 100755
--- a/utils/hal-info/CONFIGURE
+++ b/utils/hal-info/CONFIGURE
@@ -1,5 +1,2 @@
config_query_option HALINFO "include recall data?" n "--enable-recall" ""
config_query_option HALINFO "include video suspend data?" n "--enable-video"
""
-config_query_option HALINFO "enable WLAN killswitch support?" y \
- "--enable-killswitch-ipw-wlan" \
- "--disable-killswitch-ipw-wlan"
diff --git a/utils/hal-info/DEPENDS b/utils/hal-info/DEPENDS
new file mode 100755
index 0000000..f374ba5
--- /dev/null
+++ b/utils/hal-info/DEPENDS
@@ -0,0 +1,12 @@
+optional_depends hal \
+ "--enable-killswitch-ipw-wlan" \
+ "--disable-killswitch-ipw-wlan" \
+ "for WLAN killswitch support" &&
+
+if is_depends_enabled $SPELL hal; then
+ local hal_ver=$(installed_version hal) &&
+ case $hal_ver in
+ 0.5.[02-9]|0.5.[0-9].*|0.[24]*) force_depends hal ;;
+ *) true ;;
+ esac
+fi
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index c63b486..859c95c 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,6 +1,5 @@
-2007-10-31 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DEPENDS: removed, to avoid a circular dependency
- * CONFIGURE: instead of DEPENDS, added an option to enable WLAN
killswitch support
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: force_depends on older hal versions, needs 0.5.10+ #14079

2007-10-30 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added, optionally depends on hal for WLAN killswitch
support
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 7b55f5d..ad31911 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,12 +8,16 @@ depends python &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
-depends hal-info &&
depends dbus-python &&

# bug #13500
sub_depends udev VOLUME_ID &&

+depends glibc &&
+if [[ $(installed_version glibc | sed -n 's/^\(.\)\.\(.\).*/\1\2/p') -lt 26
]]; then
+ force_depends glibc
+fi &&
+
#optional_depends consolekit \
# "--enable-console-kit" \
# "--disable-console-kit" \
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 272cea3..39bf607 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,8 @@
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: removed hal-info #14079 (circular dependency and wrong)
+ added a force_depends on glibc, needs newer kernel headers than
those
+ that came with glibc 2.4 #14080
+
2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.10
new url



  • [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page