summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2007-11-11 11:41:29 +0000
committerJaka Kranjc2007-11-14 20:21:35 +0000
commit4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8 (patch)
tree2c41851ae154bebd8b415bd267e7580d8b6b7a74
parent98da6c90c8736bcfa93e6523e77450d501cea7f2 (diff)
openal: fix runtime gcc 4.2 brokeness
fix source* for scm version (switch to svn) (cherry picked from commit ffff4bd3b39a0cdcbc7497d1cb068fda98861f23)
-rwxr-xr-xaudio-libs/openal/BUILD6
-rwxr-xr-xaudio-libs/openal/DEPENDS2
-rwxr-xr-xaudio-libs/openal/DETAILS8
-rw-r--r--audio-libs/openal/HISTORY7
-rwxr-xr-xaudio-libs/openal/PRE_BUILD17
-rw-r--r--audio-libs/openal/gcc42.patch21
6 files changed, 49 insertions, 12 deletions
diff --git a/audio-libs/openal/BUILD b/audio-libs/openal/BUILD
index cae4399dd0..15203e4972 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 e1fb913d15..4fcdce1f90 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 0a3d385164..812f7bef6e 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@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 69c95940b8..85919008f5 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,10 @@
+2007-11-11 Jaka Kranjc <lynxlynxlynx@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@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 bda55a1c71..2534b6b57b 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 0000000000..b921e8ca4a
--- /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 );