Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (9ae3ac84b2cb8d059feac0e38b6f71925ae9dc81)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (9ae3ac84b2cb8d059feac0e38b6f71925ae9dc81)
  • Date: Fri, 13 May 2011 18:15:09 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde4/kdegames4/DEPENDS | 6 +++++-
kde4/kdegames4/HISTORY | 4 ++++
x11-libs/wine/DETAILS | 2 +-
x11-libs/wine/HISTORY | 3 +++
4 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 9ae3ac84b2cb8d059feac0e38b6f71925ae9dc81
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdegames4: Disable OpenAL support in Granatier if not using openal-soft
or if requested to not use OpenAL in favour of Phonon

$ gaze from /usr/include/AL/altypes.h
openal-20050601:/usr/include/AL/altypes.h

$ gaze version openal{,-soft}
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test audio-libs openal 20050601 20050601
test audio-libs openal-soft 1.13 -

[ 10%] Built target granatier_automoc
[ 10%] Building CXX object
granatier/src/CMakeFiles/granatier.dir/TagaroAudio/au
dioscene.o
In file included from /usr/include/AL/al.h:23,
from
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/openalru
ntime_p.h:25,
from
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audiosce
ne.cpp:20:
/usr/include/AL/altypes.h:461:6: warning: "AL_PURE_API" is not defined
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp: In
constructor 'Tagaro::OpenALRuntime::OpenALRuntime()':
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp:63:
error: invalid conversion from 'const char*' to 'const ALubyte*'
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp:63:
error: initializing argument 1 of 'ALCdevice* alcOpenDevice(const
ALubyte*)'
make[2]: ***
[granatier/src/CMakeFiles/granatier.dir/TagaroAudio/audioscene.o] Error
1
make[1]: *** [granatier/src/CMakeFiles/granatier.dir/all] Error 2
make: *** [all] Error 2

commit bbef44810aa9f158c61c9b0b951f2d8c317db1ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated latest devel to 1.3.20

diff --git a/kde4/kdegames4/DEPENDS b/kde4/kdegames4/DEPENDS
index 874876f..5d6bbf9 100755
--- a/kde4/kdegames4/DEPENDS
+++ b/kde4/kdegames4/DEPENDS
@@ -3,4 +3,8 @@ sub_depends qt4 'OPENGL' &&
# granatier can use either gluon or phonon
#optional_depends gluon-lib '' '' 'better sound for granatier' &&
optional_depends qca2 '' '' 'Cryptographic support' &&
-optional_depends ggz-client-libs '' '' 'register KDE games with GGZ games'
games
+optional_depends ggz-client-libs '' '' 'register KDE games with GGZ games'
games &&
+optional_depends openal-soft \
+ '-DWITH_OpenAL=ON' \
+ '-DWITH_OpenAL=OFF' \
+ 'for OpenAL sound output in Granatier (instead of Phonon)'
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index ed1528a..da7c286 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,7 @@
+2011-05-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Disable OpenAL support in Granatier if not using
openal-soft
+ or if requested to not use OpenAL in favour of Phonon
+
2011-05-06 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.6.3

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index d663578..fc32287 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.19
+ VERSION=1.3.20
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 5bb03a0..fd82de0 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated latest devel to 1.3.20
+
2011-05-02 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on gnutls
Add flags for freetype



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (9ae3ac84b2cb8d059feac0e38b6f71925ae9dc81), Eric Sandall, 05/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page