[SCM] Packaging for openal-soft branch, master, updated. debian/1.4.272-2-6-g6c097b9
Andres Mejia
mcitadel at gmail.com
Mon May 4 21:57:40 UTC 2009
The following commit has been merged in the master branch:
commit 6c097b98bd03d4625c726455f991b98037970239
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat May 2 22:52:41 2009 -0400
* New upstream release. (Closes: #506493)
* Removed deinit-move.patch and no-init-force.patch, they're applied upstream.
* Performed quilt refresh on remaining patch.
* Updated watch file.
* Bumped Standards-Version to 3.8.1.
* Address lintian info message 'binary-control-field-duplicates-source field
section in package libopenal1'.
* Address lintian info message 'copyright-with-old-dh-make-debian-copyright'.
* Address lintian warning 'wrong-section-according-to-package-name
libopenal1-dbg => debug'.
* Update version in openal.pc.
* Update version in openal-config.
diff --git a/debian/changelog b/debian/changelog
index c603f22..95ebdc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,23 @@
-openal-soft (1:1.7.411) UNRELEASED; urgency=low
+openal-soft (1:1.7.411-1) UNRELEASED; urgency=low
[ Paul Wise ]
* Drop bogus libopenal0/libopenal0a Replaces (Closes: #519995)
[ Andres Mejia ]
* New upstream release. (Closes: #506493)
-
- -- Andres Mejia <mcitadel at gmail.com> Sat, 02 May 2009 21:50:03 -0400
+ * Removed deinit-move.patch and no-init-force.patch, they're applied upstream.
+ * Performed quilt refresh on remaining patch.
+ * Updated watch file.
+ * Bumped Standards-Version to 3.8.1.
+ * Address lintian info message 'binary-control-field-duplicates-source field
+ "section" in package libopenal1'.
+ * Address lintian info message 'copyright-with-old-dh-make-debian-copyright'.
+ * Address lintian warning 'wrong-section-according-to-package-name
+ libopenal1-dbg => debug'.
+ * Update version in openal.pc.
+ * Update version in openal-config.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 02 May 2009 22:35:45 -0400
openal-soft (1:1.4.272-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e4d5b68..ce929f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>, Andres Mejia <mcitadel at gmail.com>, Reinhard Tartler <siretart at tauware.de>, Thierry Reding <thierry at doppeltgemoppelt.de>, Cyril Brulebois <kibi at debian.org>, Gonéri Le Bouder <goneri at rulezlan.org>
Build-Depends: debhelper (>= 5), quilt, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], cmake
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-games/openal-soft.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/openal-soft.git
@@ -38,7 +38,6 @@ Description: Software implementation of the OpenAL API (development files)
This package contains the OpenAL Soft header files and static libraries.
Package: libopenal1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Description: Software implementation of the OpenAL API (libraries)
@@ -65,7 +64,7 @@ Description: Software implementation of the OpenAL API (libraries)
This package installs the OpenAL Soft library.
Package: libopenal1-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
Depends: libopenal1 (= ${binary:Version})
diff --git a/debian/copyright b/debian/copyright
index 2a5f4aa..b26a150 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Thu, 27 Mar 2008 16:05:18 +0100.
OpenAL Soft was downloaded from <http://kcat.strangesoft.net/openal.html>
-OpenAL Soft is copyright (C) 1999-2008 by the OpenAL team
+OpenAL Soft is Copyright © 1999-2008 by the OpenAL team
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -22,7 +22,7 @@ OpenAL Soft is copyright (C) 1999-2008 by the OpenAL team
Alc/bs2b.c and OpenAL32/Include/bs2b.h:
-These files are Copyright (C) 2005 by Boris Mikhaylov
+These files are Copyright © 2005 by Boris Mikhaylov
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -44,6 +44,6 @@ These files are Copyright (C) 2005 by Boris Mikhaylov
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-The Debian packaging is (C) 2008, Bruno "Fuddl" Kleinert <fuddl at tauware.de> and
+The Debian packaging is © 2008, Bruno "Fuddl" Kleinert <fuddl at tauware.de> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/openal-config b/debian/openal-config
index 792963f..1bf43c6 100644
--- a/debian/openal-config
+++ b/debian/openal-config
@@ -5,7 +5,7 @@ exec_prefix="${prefix}"
bindir="${exec_prefix}/bin"
includedir="${prefix}/include"
libdir="${exec_prefix}/lib"
-PACKAGE_VERSION="1.3.253"
+PACKAGE_VERSION="1.7.411"
# PTHREAD_CFLAGS=""
# PTHREAD_LIBS="-lpthread"
diff --git a/debian/openal.pc b/debian/openal.pc
index ddf41ab..5219068 100644
--- a/debian/openal.pc
+++ b/debian/openal.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: OpenAL
Description: OpenAL is a cross-platform 3D audio API.
-Version: 1.3.253
+Version: 1.7.411
Libs: -L${libdir} -lopenal
Cflags: -I${includedir}
diff --git a/debian/patches/deinit-move.patch b/debian/patches/deinit-move.patch
deleted file mode 100644
index d9db10b..0000000
--- a/debian/patches/deinit-move.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-commit e66bb09156bb69725f91b249a6cdf0082f7fad74
-Author: Chris Robinson <chris.kcat at gmail.com>
-Date: Thu Jul 17 18:38:07 2008 -0700
-
- Move (de)initialization into ALc.c and remove unneeded file
-
-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"
- #include "alSource.h"
-+#include "alBuffer.h"
- #include "alExtension.h"
- #include "alAuxEffectSlot.h"
- #include "bs2b.h"
-@@ -182,6 +183,8 @@ static ALCint alcEFXMinorVersion = 0;
- static ALCdevice *g_pDeviceList = NULL;
- static ALCuint g_ulDeviceCount = 0;
-
-+static CRITICAL_SECTION g_csMutex;
-+
- // Context List
- static ALCcontext *g_pContextList = NULL;
- static ALCuint g_ulContextCount = 0;
-@@ -194,6 +197,49 @@ static ALCenum g_eLastContextError = ALC
-
- ///////////////////////////////////////////////////////
- // ALC Related helper functions
-+#ifdef _WIN32
-+BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved)
-+{
-+ (void)lpReserved;
-+
-+ // Perform actions based on the reason for calling.
-+ switch(ul_reason_for_call)
-+ {
-+ case DLL_PROCESS_ATTACH:
-+ DisableThreadLibraryCalls(hModule);
-+ break;
-+
-+ case DLL_PROCESS_DETACH:
-+ ReleaseALC();
-+ ReleaseALBuffers();
-+ ReleaseALEffects();
-+ ReleaseALFilters();
-+ FreeALConfig();
-+ ALTHUNK_EXIT();
-+ DeleteCriticalSection(&g_csMutex);
-+ break;
-+ }
-+ return TRUE;
-+}
-+#else
-+#ifdef HAVE_GCC_DESTRUCTOR
-+static void my_deinit() __attribute__((destructor));
-+static void my_deinit()
-+{
-+ static ALenum once = AL_FALSE;
-+ if(once) return;
-+ once = AL_TRUE;
-+
-+ ReleaseALC();
-+ ReleaseALBuffers();
-+ ReleaseALEffects();
-+ ReleaseALFilters();
-+ FreeALConfig();
-+ ALTHUNK_EXIT();
-+ DeleteCriticalSection(&g_csMutex);
-+}
-+#endif
-+#endif
-
- static void InitAL(void)
- {
-@@ -205,7 +251,7 @@ static void InitAL(void)
-
- done = 1;
-
-- InitializeCriticalSection(&_alMutex);
-+ InitializeCriticalSection(&g_csMutex);
- ALTHUNK_INIT();
- ReadALConfig();
-
-@@ -335,7 +381,7 @@ ALCvoid SetALCError(ALenum errorCode)
- ALCvoid SuspendContext(ALCcontext *pContext)
- {
- (void)pContext;
-- EnterCriticalSection(&_alMutex);
-+ EnterCriticalSection(&g_csMutex);
- }
-
-
-@@ -347,7 +393,7 @@ ALCvoid SuspendContext(ALCcontext *pCont
- ALCvoid ProcessContext(ALCcontext *pContext)
- {
- (void)pContext;
-- LeaveCriticalSection(&_alMutex);
-+ LeaveCriticalSection(&g_csMutex);
- }
-
-
-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
-- OpenAL32/OpenAL32.c
- )
- SET(ALC_OBJS Alc/ALc.c
- Alc/ALu.c
-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
-
--extern CRITICAL_SECTION _alMutex;
--
- extern char _alDebug[256];
-
- #define AL_PRINT(...) do { \
-Index: VCS/OpenAL32/OpenAL32.c
-===================================================================
---- VCS.orig/OpenAL32/OpenAL32.c
-+++ /dev/null
-@@ -1,74 +0,0 @@
--/**
-- * OpenAL cross platform audio library
-- * Copyright (C) 1999-2007 by authors.
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-- * Boston, MA 02111-1307, USA.
-- * Or go to http://www.gnu.org/copyleft/lgpl.html
-- */
--
--#include "config.h"
--
--#include "alMain.h"
--#include "alBuffer.h"
--#include "alFilter.h"
--#include "alEffect.h"
--#include "alAuxEffectSlot.h"
--#include "alThunk.h"
--
--CRITICAL_SECTION _alMutex;
--
--#ifdef _WIN32
--BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved)
--{
-- (void)lpReserved;
--
-- // Perform actions based on the reason for calling.
-- switch(ul_reason_for_call)
-- {
-- case DLL_PROCESS_ATTACH:
-- DisableThreadLibraryCalls(hModule);
-- break;
--
-- case DLL_PROCESS_DETACH:
-- ReleaseALC();
-- ReleaseALBuffers();
-- ReleaseALEffects();
-- ReleaseALFilters();
-- FreeALConfig();
-- ALTHUNK_EXIT();
-- DeleteCriticalSection(&_alMutex);
-- break;
-- }
-- return TRUE;
--}
--#else
--#ifdef HAVE_GCC_DESTRUCTOR
--static void my_deinit() __attribute__((destructor));
--static void my_deinit()
--{
-- static ALenum once = AL_FALSE;
-- if(once) return;
-- once = AL_TRUE;
--
-- ReleaseALC();
-- ReleaseALBuffers();
-- ReleaseALEffects();
-- ReleaseALFilters();
-- FreeALConfig();
-- ALTHUNK_EXIT();
-- DeleteCriticalSection(&_alMutex);
--}
--#endif
--#endif
diff --git a/debian/patches/no-init-force.patch b/debian/patches/no-init-force.patch
deleted file mode 100644
index 7fd848d..0000000
--- a/debian/patches/no-init-force.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit eba60c30c5e1676786b33be38c3845d850e96bcb
-Author: Chris Robinson <chris.kcat at gmail.com>
-Date: Thu Jul 17 18:45:21 2008 -0700
-
- Don't force initialization when shutting down
- Thanks to Michael Simms
-
-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;
-
-+static ALboolean init_done = AL_FALSE;
-+
- ///////////////////////////////////////////////////////
-
-
-@@ -210,6 +212,8 @@ BOOL APIENTRY DllMain(HANDLE hModule,DWO
- break;
-
- case DLL_PROCESS_DETACH:
-+ if(!init_done)
-+ break;
- ReleaseALC();
- ReleaseALBuffers();
- ReleaseALEffects();
-@@ -227,7 +231,7 @@ static void my_deinit() __attribute__((d
- static void my_deinit()
- {
- static ALenum once = AL_FALSE;
-- if(once) return;
-+ if(once || !init_done) return;
- once = AL_TRUE;
-
- ReleaseALC();
-@@ -243,13 +247,12 @@ static void my_deinit()
-
- static void InitAL(void)
- {
-- static int done = 0;
-- if(!done)
-+ if(!init_done)
- {
- int i;
- const char *devs, *str;
-
-- done = 1;
-+ init_done = AL_TRUE;
-
- InitializeCriticalSection(&g_csMutex);
- ALTHUNK_INIT();
-@@ -1294,8 +1297,6 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDe
-
- ALCvoid ReleaseALC(ALCvoid)
- {
-- InitAL();
--
- #ifdef _DEBUG
- if(g_ulContextCount > 0)
- AL_PRINT("exit() %u device(s) and %u context(s) NOT deleted\n", g_ulDeviceCount, g_ulContextCount);
diff --git a/debian/patches/series b/debian/patches/series
index fe461f9..2d40801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
static_lib.patch
-deinit-move.patch
-no-init-force.patch
diff --git a/debian/patches/static_lib.patch b/debian/patches/static_lib.patch
index 11621d7..1d845a0 100644
--- a/debian/patches/static_lib.patch
+++ b/debian/patches/static_lib.patch
@@ -1,20 +1,18 @@
Support building of static libraries
=====================================================================
-Index: VCS/CMakeLists.txt
-===================================================================
---- VCS.orig/CMakeLists.txt
-+++ VCS/CMakeLists.txt
-@@ -26,6 +26,9 @@ OPTION(WERROR "Treat compile warnings a
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,9 @@
- OPTION(EXAMPLES "Build example programs" ON)
+ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+# Add option to build static libraries
+OPTION(BUILD_STATIC "build static library too" OFF)
+
- SET(LIB_MAJOR_VERSION "1")
- SET(LIB_MINOR_VERSION "4")
-@@ -306,6 +309,21 @@ ENDIF()
+ OPTION(ALSA "Check for ALSA backend" ON)
+ OPTION(OSS "Check for OSS backend" ON)
+@@ -375,6 +378,21 @@
TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
diff --git a/debian/watch b/debian/watch
index ee10c9f..4ef6c14 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,4 +3,4 @@ version=3
http://kcat.strangesoft.net/openal-releases/ \
openal-soft-(.*)\.tar\.bz2 \
- 1.3.253
+ 1.7.411
--
Packaging for openal-soft
More information about the Pkg-games-commits
mailing list