r6813 - in packages/branches/chromium/chromium-openal-soft/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Sun Apr 27 04:56:57 UTC 2008
Author: ceros-guest
Date: 2008-04-27 04:56:55 +0000 (Sun, 27 Apr 2008)
New Revision: 6813
Removed:
packages/branches/chromium/chromium-openal-soft/debian/patches/15_soundfix.dpatch
packages/branches/chromium/chromium-openal-soft/debian/patches/25_gcc4.dpatch
Modified:
packages/branches/chromium/chromium-openal-soft/debian/changelog
packages/branches/chromium/chromium-openal-soft/debian/patches/30_new_openAL.dpatch
packages/branches/chromium/chromium-openal-soft/debian/patches/series
packages/branches/chromium/chromium-openal-soft/debian/rules
Log:
Fix packaging with new OpenAL Soft library.
Modified: packages/branches/chromium/chromium-openal-soft/debian/changelog
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/changelog 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/changelog 2008-04-27 04:56:55 UTC (rev 6813)
@@ -38,6 +38,8 @@
[ Andres Mejia ]
* Fix build with OpenAL Soft library.
+ * Add rules to patch/unpatch package in debian/rules.
+ * Combine soundfix and gcc4 patch into new_openAL patch.
-- Jon Dowland <jon at alcopop.org> Thu, 12 Jul 2007 11:26:12 +0100
Deleted: packages/branches/chromium/chromium-openal-soft/debian/patches/15_soundfix.dpatch
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/patches/15_soundfix.dpatch 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/patches/15_soundfix.dpatch 2008-04-27 04:56:55 UTC (rev 6813)
@@ -1,14 +0,0 @@
-15_soundfix.dpatch
-Mike Furr <mfurr at debian.org>
-Set a default OpenAL distance model??
-http://bugs.debian.org/215037
---- ./src/AudioOpenAL.cpp 2001-05-20 21:48:16.000000000 -0400
-+++ /tmp/dpep-work.DHdnn0/chromium-0.9.12/src/AudioOpenAL.cpp 2005-08-07 18:35:00.980472404 -0400
-@@ -124,6 +124,7 @@
- audioScale[0] = 0.5;
- audioScale[1] = 0.3;
- audioScale[2] = 0.3;
-+ alDistanceModel(AL_NONE);
- }
-
- if(config->swapStereo())
Deleted: packages/branches/chromium/chromium-openal-soft/debian/patches/25_gcc4.dpatch
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/patches/25_gcc4.dpatch 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/patches/25_gcc4.dpatch 2008-04-27 04:56:55 UTC (rev 6813)
@@ -1,48 +0,0 @@
-25_gcc4.dpatch
-Mike Furr <mfurr at debian.org>
-Removed some unneeded casts for g++ 4
---- ./src/AudioOpenAL.cpp 2005-08-07 18:55:15.030494242 -0400
-+++ /tmp/dpep-work.e6tZc1/chromium-0.9.12/src/AudioOpenAL.cpp 2005-08-07 18:59:26.975561484 -0400
-@@ -311,7 +311,7 @@
-
- //-- check AttenuationScale extension
- alAttenuationScale = (void (*)(ALfloat param))
-- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
-+ alGetProcAddress("alAttenuationScale_LOKI");
- if(alAttenuationScale == NULL)
- fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
- else
-@@ -319,9 +319,9 @@
-
- //-- check Audio Channel extension
- alcGetAudioChannel = (float (*)(ALuint channel))
-- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
-+ alGetProcAddress("alcGetAudioChannel_LOKI");
- alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
-- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
-+ alGetProcAddress("alcSetAudioChannel_LOKI");
- #ifdef CD_VOLUME
- if(alcGetAudioChannel)
- origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
-@@ -329,10 +329,10 @@
-
- //-- check MP3 extension
- alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
-- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
-+ alGetProcAddress("alutLoadMP3_LOKI");
- //-- check Ogg/Vorbis extension
- alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
-- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
-+ alGetProcAddress("alutLoadVorbis_LOKI");
-
- #endif //_WIN32
- }
-@@ -469,7 +469,7 @@
- void AudioOpenAL::loadSounds()
- {
- int i;
-- ALsizei size, freq, bits;
-+ ALsizei size, freq;
- ALenum format;
- ALvoid *data;
-
Modified: packages/branches/chromium/chromium-openal-soft/debian/patches/30_new_openAL.dpatch
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/patches/30_new_openAL.dpatch 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/patches/30_new_openAL.dpatch 2008-04-27 04:56:55 UTC (rev 6813)
@@ -1,10 +1,18 @@
30_new_openAL.dpatch
Mike Furr <mfurr at debian.org>
Update some code to new OpenAL API
---- chromium-0.9.12.orig/src/AudioOpenAL.cpp 2007-04-06 22:26:45.000000000 +0200
-+++ chromium-0.9.12/src/AudioOpenAL.cpp 2007-04-06 22:26:45.000000000 +0200
-@@ -52,8 +52,8 @@
+--- chromium-0.9.12.orig/src/AudioOpenAL.cpp.bak 2008-04-27 00:39:56.000000000 -0400
++++ chromium-0.9.12/src/AudioOpenAL.cpp 2008-04-27 00:40:51.000000000 -0400
+@@ -38,6 +38,7 @@
+ #include "define.h"
+ #include "Global.h"
+
++/*
+ #ifdef OLD_OPENAL
+ #ifdef USE_SDL
//try to use OpenAL alc[GS]etAudioChannel extensions in linux...
+@@ -52,11 +53,12 @@
+ //try to use OpenAL alc[GS]etAudioChannel extensions in linux...
#ifdef __linux__
#define CD_VOLUME 1
-// #include <AL/alext.h>
@@ -14,15 +22,65 @@
#endif //__linux__
#endif //USE_SDL
#endif
-@@ -472,6 +472,7 @@
- ALsizei size, freq;
++*/
+
+ #ifdef __linux__
+ #define USE_PLAYLIST 1
+@@ -124,6 +126,7 @@
+ audioScale[0] = 0.5;
+ audioScale[1] = 0.3;
+ audioScale[2] = 0.3;
++ alDistanceModel(AL_NONE);
+ }
+
+ if(config->swapStereo())
+@@ -310,7 +313,7 @@
+
+ //-- check AttenuationScale extension
+ alAttenuationScale = (void (*)(ALfloat param))
+- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
++ alGetProcAddress("alAttenuationScale_LOKI");
+ if(alAttenuationScale == NULL)
+ fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
+ else
+@@ -318,9 +321,9 @@
+
+ //-- check Audio Channel extension
+ alcGetAudioChannel = (float (*)(ALuint channel))
+- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
++ alGetProcAddress("alcGetAudioChannel_LOKI");
+ alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
+- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
++ alGetProcAddress("alcSetAudioChannel_LOKI");
+ #ifdef CD_VOLUME
+ if(alcGetAudioChannel)
+ origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
+@@ -328,10 +331,10 @@
+
+ //-- check MP3 extension
+ alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
+- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
++ alGetProcAddress("alutLoadMP3_LOKI");
+ //-- check Ogg/Vorbis extension
+ alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
+- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
++ alGetProcAddress("alutLoadVorbis_LOKI");
+
+ #endif //_WIN32
+ }
+@@ -468,9 +471,10 @@
+ void AudioOpenAL::loadSounds()
+ {
+ int i;
+- ALsizei size, freq, bits;
++ ALsizei size, freq;
ALenum format;
ALvoid *data;
+ ALboolean loop;
for(i = 0; i < NumSoundTypes; i++)
{
-@@ -482,9 +483,9 @@
+@@ -481,9 +485,9 @@
else
{
#ifndef _WIN32
@@ -34,7 +92,7 @@
#else //_WIN32
char nameBuffer[256];
sprintf(nameBuffer, "%s", dataLoc(fileNames[i]));
-@@ -844,14 +845,16 @@
+@@ -843,14 +847,16 @@
return false;
#else //USE_PLAYLIST
bool retVal;
Modified: packages/branches/chromium/chromium-openal-soft/debian/patches/series
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/patches/series 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/patches/series 2008-04-27 04:56:55 UTC (rev 6813)
@@ -1,8 +1,6 @@
05_wall_flag.diff
10_buildfixes.dpatch
-15_soundfix.dpatch
20_badcode.dpatch
-25_gcc4.dpatch
26_gcc4.3.patch -p0
30_new_openAL.dpatch
35_powerup_crash.diff
Modified: packages/branches/chromium/chromium-openal-soft/debian/rules
===================================================================
--- packages/branches/chromium/chromium-openal-soft/debian/rules 2008-04-27 03:59:25 UTC (rev 6812)
+++ packages/branches/chromium/chromium-openal-soft/debian/rules 2008-04-27 04:56:55 UTC (rev 6813)
@@ -5,27 +5,37 @@
PACKAGE=chromium
-configure: configure-stamp
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch patch-stamp
+
+configure: patch configure-stamp
configure-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
./configure --disable-setup
touch configure-stamp
-build: configure-stamp build-stamp
+build: configure build-stamp
build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
+unpatch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -f patch-stamp
+
install: build
dh_testdir
dh_testroot
@@ -55,4 +65,4 @@
dh_builddeb
binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary install
+.PHONY: build clean binary-arch binary-indep binary install
More information about the Pkg-games-commits
mailing list