Hello community,
here is the log from the commit of package vegastrike for openSUSE:Factory checked in at 2013-02-15 18:52:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vegastrike (Old)
and /work/SRC/openSUSE:Factory/.vegastrike.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vegastrike", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/vegastrike/vegastrike.changes 2013-01-08 09:14:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.vegastrike.new/vegastrike.changes 2013-02-15 18:52:44.000000000 +0100
@@ -1,0 +2,13 @@
+Fri Feb 15 09:45:06 UTC 2013 - pgajdos@suse.com
+
+- build also with libpng16
+ * libpng16.patch
+
+-------------------------------------------------------------------
+Thu Jan 31 22:59:57 UTC 2013 - klaussfreire@gmail.com
+
+- Add patch vegastrike-src-0.5.1.r1-r13498-al_fix.patch
+ Fixes build when openal is missing (SLE 11 exposed it)
+- Explicitly require openal (SLE 11 fix)
+
+-------------------------------------------------------------------
New:
----
vegastrike-src-0.5.1.r1-libpng16.patch
vegastrike-src-0.5.1.r1-r13498-al_fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vegastrike.spec ++++++
--- /var/tmp/diff_new_pack.HreNeU/_old 2013-02-15 18:52:45.000000000 +0100
+++ /var/tmp/diff_new_pack.HreNeU/_new 2013-02-15 18:52:45.000000000 +0100
@@ -35,6 +35,10 @@
Patch2: vegastrike-src-0.5.1.r1-license.patch
# PATCH-FIX-UPSTREAM vegastrike-src-0.5.1.r1-gcc47_compat.patch -- GCC 4.7 compatibility fixes, already upstreamed, not yet in tarball
Patch3: vegastrike-src-0.5.1.r1-gcc47_compat.patch
+# PATCH-FIX-UPSTREAM vegastrike-src-0.5.1.r1-r13498-al_fix.patch -- fix build without openAL (SLE)
+Patch4: vegastrike-src-0.5.1.r1-r13498-al_fix.patch
+# PATCH-FIX-UPSTREAM vegastrike-src-0.5.1.r1-libpng16.patch -- fix build with libpng16 pgajdos@suse.com; klaussfreire@gmail.com notified
+Patch5: vegastrike-src-0.5.1.r1-libpng16.patch
BuildRequires: SDL_mixer-devel
BuildRequires: boost-devel
BuildRequires: freealut-devel
@@ -50,6 +54,7 @@
BuildRequires: fdupes
BuildRequires: libexpat-devel
BuildRequires: xorg-x11-libXmu-devel
+BuildRequires: pkgconfig(openal)
%if 0%{?suse_version} > 1210
BuildRequires: pkgconfig(glu)
%endif
@@ -90,6 +95,8 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%patch4 -p0
+%patch5 -p0
iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
touch -r README README.tmp
mv README.tmp README
++++++ vegastrike-src-0.5.1.r1-libpng16.patch ++++++
Index: objconv/basemaker/base_maker_texture.cpp
===================================================================
--- objconv/basemaker/base_maker_texture.cpp
+++ objconv/basemaker/base_maker_texture.cpp
@@ -1,6 +1,7 @@
#include "hashtable.h"
#include "base_maker_texture.h"
#include
+#include
#include
#ifdef _WIN32
#define XMD_H
++++++ vegastrike-src-0.5.1.r1-r13498-al_fix.patch ++++++
Index: src/aldrv/al_globals.h
===================================================================
--- src/aldrv/al_globals.h (revision 13497)
+++ src/aldrv/al_globals.h (revision 13499)
@@ -3,15 +3,55 @@
/* #undef SOUND_DEBUG */
+#include <string>
+#include <vector>
+
#ifdef HAVE_AL
#ifdef __APPLE__
#include
#else
#include
#endif
-#include <string>
-#include <vector>
+#endif
+struct AUDSoundProperties
+{
+ // Keep here all that is AL-independent
+
+ bool success;
+
+ //Hashing.
+ //Set even if AUDLoadSoundFile fails so that a hash entry can be written.
+ bool shared;
+ std::string hashname;
+
+ void *wave;
+
+ // From here on, AL-dependent stuff
+
+#ifdef HAVE_AL
+ //OpenAL properties.
+ ALenum format;
+ ALsizei size;
+ ALsizei freq;
+ ALboolean looping; //can be set by caller.
+#endif
+
+ AUDSoundProperties()
+ {
+ shared = false;
+ success = false;
+ wave = NULL;
+#ifdef HAVE_AL
+ looping = false;
+ size = 0;
+ freq = 22050;
+#endif
+ }
+};
+
+#ifdef HAVE_AL
+
class Vector;
struct OurSound
@@ -41,47 +81,22 @@
extern std::vector< ALuint > buffers;
extern std::vector< OurSound >sounds;
extern Hashtable< std::string, ALuint, 127 >soundHash;
-float AUDDistanceSquared( const int sound );
typedef ALboolean (mp3Loader)( ALuint, ALvoid*, ALint );
extern mp3Loader *alutLoadMP3p;
extern unsigned int maxallowedsingle;
extern unsigned int maxallowedtotal;
extern bool usedoppler;
extern bool usepositional;
+
+#endif
+
+float AUDDistanceSquared( const int sound );
char AUDQueryAudability( const int sound, const Vector &pos, const Vector &vel, const float gain );
void AUDAddWatchedPlayed( const int sound, const Vector &pos );
-
-struct AUDSoundProperties
-{
- //Hashing.
- //Set even if AUDLoadSoundFile fails so that a hash entry can be written.
- bool shared;
- std::string hashname;
-
- //OpenAL properties.
- ALenum format;
- ALsizei size;
- ALsizei freq;
- void *wave;
- ALboolean looping; //can be set by caller.
-
- bool success;
- AUDSoundProperties()
- {
- wave = NULL;
- looping = false;
- shared = false;
- success = false;
- size = 0;
- freq = 22050;
- }
-};
-
bool AUDLoadSoundFile( const char *s, struct AUDSoundProperties *info, bool use_fileptr = false );
//It is up to the caller to free(info.wave) after using!!!
int AUDBufferSound( const struct AUDSoundProperties *info, bool music );
#endif
-#endif
Index: src/aldrv/al_sound.cpp
===================================================================
--- src/aldrv/al_sound.cpp (revision 13497)
+++ src/aldrv/al_sound.cpp (revision 13499)
@@ -411,6 +411,8 @@
VSFileSystem::vs_dprintf(3, "Loading sound file %s\n", s);
info->success = false;
+
+#ifdef HAVE_AL
vector< char >dat;
if (use_fileptr) {
FILE *f = fopen( s, "rb" );
@@ -472,17 +474,22 @@
info->success = true;
return true;
+#else
+ return false;
+#endif
}
int AUDBufferSound( const struct AUDSoundProperties *info, bool music )
{
+#ifdef HAVE_AL
ALuint wavbuf = 0;
-#ifdef HAVE_AL
alGenBuffers( 1, &wavbuf );
if (!wavbuf) printf( "OpenAL Error in alGenBuffers: %d\n", alGetError() );
alBufferData( wavbuf, info->format, info->wave, info->size, info->freq );
+ return LoadSound( wavbuf, info->looping, music );
+#else
+ return -1;
#endif
- return LoadSound( wavbuf, info->looping, music );
}
#ifdef HAVE_AL
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org