summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2011-03-01 13:32:35 (GMT)
committerTony Theodore <tonyt@logyst.com>2011-03-01 13:32:35 (GMT)
commit181b32ccdff2f1843616a8c71530c9e3b13f0a78 (patch)
tree536132175e45de72897ce122aa02a34de939b002 /src
parent3bb2b8fcae61a07ccfe21f8e8cdd665e66ab7ead (diff)
downloadmxe-181b32ccdff2f1843616a8c71530c9e3b13f0a78.zip
mxe-181b32ccdff2f1843616a8c71530c9e3b13f0a78.tar.gz
mxe-181b32ccdff2f1843616a8c71530c9e3b13f0a78.tar.bz2
update package openal
Diffstat (limited to 'src')
-rw-r--r--src/openal-1-libtype-static.patch75
-rw-r--r--src/openal-2-gcc-destructor-win32.patch51
-rw-r--r--src/openal-3-pkgconfig-winmm.patch17
-rw-r--r--src/openal.mk4
4 files changed, 2 insertions, 145 deletions
diff --git a/src/openal-1-libtype-static.patch b/src/openal-1-libtype-static.patch
deleted file mode 100644
index c1fca5c..0000000
--- a/src/openal-1-libtype-static.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://opensource.creative.com/pipermail/openal-devel/2010-November/005759.html
-
-diff -r 37cec05f2c93 CMakeLists.txt
---- a/CMakeLists.txt Sun Nov 28 20:53:45 2010 +0100
-+++ b/CMakeLists.txt Sun Nov 28 22:12:22 2010 +0100
-@@ -428,6 +428,14 @@
- SET(includedir "\${prefix}/include")
- SET(PACKAGE_VERSION "${LIB_VERSION}")
-
-+# Library type (static/shared)
-+IF(NOT LIBTYPE)
-+ SET(LIBTYPE SHARED)
-+ENDIF()
-+IF(LIBTYPE STREQUAL "STATIC")
-+ SET(PKG_CONFIG_CFLAGS -DAL_LIBTYPE_STATIC ${PKG_CONFIG_CFLAGS})
-+ENDIF()
-+
- # End configuration
- CONFIGURE_FILE(
- "${OpenAL_SOURCE_DIR}/config.h.in"
-@@ -438,9 +446,6 @@
- @ONLY)
-
- # Build a library
--IF(NOT LIBTYPE)
-- SET(LIBTYPE SHARED)
--ENDIF()
- ADD_LIBRARY(${LIBNAME} ${LIBTYPE} ${OPENAL_OBJS} ${ALC_OBJS})
- SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES DEFINE_SYMBOL AL_BUILD_LIBRARY
- COMPILE_FLAGS -DAL_ALEXT_PROTOTYPES
-@@ -477,6 +482,7 @@
-
- IF(EXAMPLES)
- ADD_EXECUTABLE(openal-info examples/openal-info.c)
-+ ADD_DEFINITIONS(${PKG_CONFIG_CFLAGS})
- TARGET_LINK_LIBRARIES(openal-info ${LIBNAME})
- INSTALL(TARGETS openal-info
- RUNTIME DESTINATION bin
-diff -r 37cec05f2c93 include/AL/al.h
---- a/include/AL/al.h Sun Nov 28 20:53:45 2010 +0100
-+++ b/include/AL/al.h Sun Nov 28 22:12:22 2010 +0100
-@@ -5,7 +5,7 @@
- extern "C" {
- #endif
-
--#if defined(_WIN32) && !defined(_XBOX)
-+#if defined(_WIN32) && !defined(_XBOX) && !defined(AL_LIBTYPE_STATIC)
- #if defined(AL_BUILD_LIBRARY)
- #define AL_API __declspec(dllexport)
- #else
-diff -r 37cec05f2c93 include/AL/alc.h
---- a/include/AL/alc.h Sun Nov 28 20:53:45 2010 +0100
-+++ b/include/AL/alc.h Sun Nov 28 22:12:22 2010 +0100
-@@ -5,7 +5,7 @@
- extern "C" {
- #endif
-
--#if defined(_WIN32) && !defined(_XBOX)
-+#if defined(_WIN32) && !defined(_XBOX) && !defined(AL_LIBTYPE_STATIC)
- #if defined(AL_BUILD_LIBRARY)
- #define ALC_API __declspec(dllexport)
- #else
-diff -r 37cec05f2c93 openal.pc.in
---- a/openal.pc.in Sun Nov 28 20:53:45 2010 +0100
-+++ b/openal.pc.in Sun Nov 28 22:12:22 2010 +0100
-@@ -8,4 +8,4 @@
- Requires: @PKG_CONFIG_REQUIRES@
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@
diff --git a/src/openal-2-gcc-destructor-win32.patch b/src/openal-2-gcc-destructor-win32.patch
deleted file mode 100644
index d2a51a2..0000000
--- a/src/openal-2-gcc-destructor-win32.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://opensource.creative.com/pipermail/openal-devel/2010-November/005759.html
-
-diff -r 37cec05f2c93 Alc/ALc.c
---- a/Alc/ALc.c Sun Nov 28 20:53:45 2010 +0100
-+++ b/Alc/ALc.c Sun Nov 28 21:19:52 2010 +0100
-@@ -239,7 +239,10 @@
-
- ///////////////////////////////////////////////////////
- // ALC Related helper functions
--#ifdef _WIN32
-+#if defined(HAVE_GCC_DESTRUCTOR)
-+static void alc_init(void) __attribute__((constructor));
-+static void alc_deinit(void) __attribute__((destructor));
-+#elif defined(_WIN32)
- static void alc_init(void);
- static void alc_deinit(void);
-
-@@ -261,11 +264,6 @@
- }
- return TRUE;
- }
--#else
--#ifdef HAVE_GCC_DESTRUCTOR
--static void alc_init(void) __attribute__((constructor));
--static void alc_deinit(void) __attribute__((destructor));
--#endif
- #endif
-
- static void alc_init(void)
-diff -r 37cec05f2c93 CMakeLists.txt
---- a/CMakeLists.txt Sun Nov 28 20:53:45 2010 +0100
-+++ b/CMakeLists.txt Sun Nov 28 21:19:52 2010 +0100
-@@ -123,11 +123,11 @@
- "Flags used by the compiler during debug builds."
- FORCE)
-
-+ CHECK_C_SOURCE_COMPILES("int foo() __attribute__((destructor));
-+ int main() {return 0;}" HAVE_GCC_DESTRUCTOR)
-+
- # Set visibility options if available
- IF(NOT WIN32)
-- CHECK_C_SOURCE_COMPILES("int foo() __attribute__((destructor));
-- int main() {return 0;}" HAVE_GCC_DESTRUCTOR)
--
- CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_SWITCH)
- IF(HAVE_VISIBILITY_SWITCH)
- CHECK_C_SOURCE_COMPILES("int foo() __attribute__((visibility(\"default\")));
diff --git a/src/openal-3-pkgconfig-winmm.patch b/src/openal-3-pkgconfig-winmm.patch
deleted file mode 100644
index 87c3552..0000000
--- a/src/openal-3-pkgconfig-winmm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://opensource.creative.com/pipermail/openal-devel/2010-November/005759.html
-
-diff -r 37cec05f2c93 CMakeLists.txt
---- a/CMakeLists.txt Sun Nov 28 20:53:45 2010 +0100
-+++ b/CMakeLists.txt Sun Nov 28 21:24:44 2010 +0100
-@@ -376,6 +376,7 @@
- SET(BACKENDS "${BACKENDS} WinMM,")
-
- SET(EXTRA_LIBS winmm ${EXTRA_LIBS})
-+ SET(PKG_CONFIG_LIBS ${PKG_CONFIG_LIBS} -lwinmm)
- ENDIF()
- ENDIF()
- ENDIF()
diff --git a/src/openal.mk b/src/openal.mk
index 922b33d..860b59a 100644
--- a/src/openal.mk
+++ b/src/openal.mk
@@ -4,8 +4,8 @@
# openal
PKG := openal
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.854
-$(PKG)_CHECKSUM := 537dc5fad32d227bb5e861506018b46a21e47f26
+$(PKG)_VERSION := 1.13
+$(PKG)_CHECKSUM := 0e2449375a12cee65a9cea354533dcaabf9d5068
$(PKG)_SUBDIR := openal-soft-$($(PKG)_VERSION)
$(PKG)_FILE := openal-soft-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://kcat.strangesoft.net/openal.html