[SCM] Packaging for openal-soft branch, master, updated. debian/1.3.253-5-9-g1ba30b6
Gerfried Fuchs
rhonda at debian.at
Sat Aug 9 19:48:29 UTC 2008
The following commit has been merged in the master branch:
commit 1ba30b605c90916c186e7b8f1f02078bf14ccc5a
Author: Gerfried Fuchs <rhonda at debian.at>
Date: Sat Aug 9 16:47:22 2008 -0300
quilt refresh patch(es).
diff --git a/debian/changelog b/debian/changelog
index 702ab62..111df82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ openal-soft (1:1.4.272-2) unstable; urgency=low
to fix an (de)initialization issue that produces segfaults when doing
autofoo in some special circumstances.
* Add removal of quilt's .pc directory when cleaning up, too.
+ * quilt refresh patch(es).
- -- Gerfried Fuchs <rhonda at debian.at> Sat, 09 Aug 2008 16:46:11 -0300
+ -- Gerfried Fuchs <rhonda at debian.at> Sat, 09 Aug 2008 16:47:07 -0300
openal-soft (1:1.4.272-1) unstable; urgency=low
diff --git a/debian/patches/deinit-move.patch b/debian/patches/deinit-move.patch
index d3779c0..d9db10b 100644
--- a/debian/patches/deinit-move.patch
+++ b/debian/patches/deinit-move.patch
@@ -4,10 +4,10 @@ Date: Thu Jul 17 18:38:07 2008 -0700
Move (de)initialization into ALc.c and remove unneeded file
-diff --git a/Alc/ALc.c b/Alc/ALc.c
-index cb4c2ce..22334ea 100644
---- a/Alc/ALc.c
-+++ b/Alc/ALc.c
+Index: VCS/Alc/ALc.c
+===================================================================
+--- VCS.orig/Alc/ALc.c
++++ VCS/Alc/ALc.c
@@ -33,6 +33,7 @@
#include "AL/alc.h"
#include "alThunk.h"
@@ -25,7 +25,7 @@ index cb4c2ce..22334ea 100644
// Context List
static ALCcontext *g_pContextList = NULL;
static ALCuint g_ulContextCount = 0;
-@@ -194,6 +197,49 @@ static ALCenum g_eLastContextError = ALC_NO_ERROR;
+@@ -194,6 +197,49 @@ static ALCenum g_eLastContextError = ALC
///////////////////////////////////////////////////////
// ALC Related helper functions
@@ -93,7 +93,7 @@ index cb4c2ce..22334ea 100644
}
-@@ -347,7 +393,7 @@ ALCvoid SuspendContext(ALCcontext *pContext)
+@@ -347,7 +393,7 @@ ALCvoid SuspendContext(ALCcontext *pCont
ALCvoid ProcessContext(ALCcontext *pContext)
{
(void)pContext;
@@ -102,11 +102,11 @@ index cb4c2ce..22334ea 100644
}
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 810f61e..511405e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,6 @@ SET(OPENAL_OBJS OpenAL32/alAuxEffectSlot.c
+Index: VCS/CMakeLists.txt
+===================================================================
+--- VCS.orig/CMakeLists.txt
++++ VCS/CMakeLists.txt
+@@ -206,7 +206,6 @@ SET(OPENAL_OBJS OpenAL32/alAuxEffectSlo
OpenAL32/alSource.c
OpenAL32/alState.c
OpenAL32/alThunk.c
@@ -114,10 +114,10 @@ index 810f61e..511405e 100644
)
SET(ALC_OBJS Alc/ALc.c
Alc/ALu.c
-diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
-index 6bc5fd4..15512e7 100644
---- a/OpenAL32/Include/alMain.h
-+++ b/OpenAL32/Include/alMain.h
+Index: VCS/OpenAL32/Include/alMain.h
+===================================================================
+--- VCS.orig/OpenAL32/Include/alMain.h
++++ VCS/OpenAL32/Include/alMain.h
@@ -103,8 +103,6 @@ static inline void Sleep(ALuint t)
extern "C" {
#endif
@@ -127,10 +127,9 @@ index 6bc5fd4..15512e7 100644
extern char _alDebug[256];
#define AL_PRINT(...) do { \
-diff --git a/OpenAL32/OpenAL32.c b/OpenAL32/OpenAL32.c
-deleted file mode 100644
-index 71ebf0c..0000000
---- a/OpenAL32/OpenAL32.c
+Index: VCS/OpenAL32/OpenAL32.c
+===================================================================
+--- VCS.orig/OpenAL32/OpenAL32.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
diff --git a/debian/patches/no-init-force.patch b/debian/patches/no-init-force.patch
index 66c93dd..7fd848d 100644
--- a/debian/patches/no-init-force.patch
+++ b/debian/patches/no-init-force.patch
@@ -5,10 +5,10 @@ Date: Thu Jul 17 18:45:21 2008 -0700
Don't force initialization when shutting down
Thanks to Michael Simms
-diff --git a/Alc/ALc.c b/Alc/ALc.c
-index 22334ea..2363766 100644
---- a/Alc/ALc.c
-+++ b/Alc/ALc.c
+Index: VCS/Alc/ALc.c
+===================================================================
+--- VCS.orig/Alc/ALc.c
++++ VCS/Alc/ALc.c
@@ -192,6 +192,8 @@ static ALCuint g_ulContextCount = 0;
// Context Error
static ALCenum g_eLastContextError = ALC_NO_ERROR;
@@ -18,7 +18,7 @@ index 22334ea..2363766 100644
///////////////////////////////////////////////////////
-@@ -210,6 +212,8 @@ BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved)
+@@ -210,6 +212,8 @@ BOOL APIENTRY DllMain(HANDLE hModule,DWO
break;
case DLL_PROCESS_DETACH:
@@ -27,7 +27,7 @@ index 22334ea..2363766 100644
ReleaseALC();
ReleaseALBuffers();
ReleaseALEffects();
-@@ -227,7 +231,7 @@ static void my_deinit() __attribute__((destructor));
+@@ -227,7 +231,7 @@ static void my_deinit() __attribute__((d
static void my_deinit()
{
static ALenum once = AL_FALSE;
@@ -52,7 +52,7 @@ index 22334ea..2363766 100644
InitializeCriticalSection(&g_csMutex);
ALTHUNK_INIT();
-@@ -1294,8 +1297,6 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDevice(ALCdevice *pDevice)
+@@ -1294,8 +1297,6 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDe
ALCvoid ReleaseALC(ALCvoid)
{
diff --git a/debian/patches/static_lib.patch b/debian/patches/static_lib.patch
index e7d1e26..11621d7 100644
--- a/debian/patches/static_lib.patch
+++ b/debian/patches/static_lib.patch
@@ -1,21 +1,23 @@
Support building of static libraries
=====================================================================
---- ./CMakeLists.txt.bak 2008-04-23 01:08:34.000000000 -0400
-+++ ./CMakeLists.txt 2008-04-23 01:09:25.000000000 -0400
-@@ -24,6 +24,9 @@
-
- OPTION(WERROR "Treat compile warnings as errors" OFF)
-
+Index: VCS/CMakeLists.txt
+===================================================================
+--- VCS.orig/CMakeLists.txt
++++ VCS/CMakeLists.txt
+@@ -26,6 +26,9 @@ OPTION(WERROR "Treat compile warnings a
+
+ OPTION(EXAMPLES "Build example programs" ON)
+
+# Add option to build static libraries
+OPTION(BUILD_STATIC "build static library too" OFF)
+
-
+
SET(LIB_MAJOR_VERSION "1")
- SET(LIB_MINOR_VERSION "3")
-@@ -307,6 +310,21 @@
-
+ SET(LIB_MINOR_VERSION "4")
+@@ -306,6 +309,21 @@ ENDIF()
+
TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
-
+
+# Build static libraries if specified
+IF(BUILD_STATIC)
+ # we can't create a static library with the same name
--
Packaging for openal-soft
More information about the Pkg-games-commits
mailing list