Mercurial > mxe-octave
changeset 2391:fbf67aa01033
update package openal
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 03 Apr 2012 14:59:00 +0200 |
| parents | af2600152295 |
| children | be80d8581762 |
| files | index.html src/openal-1-fixes.patch src/openal-1-luuid-pkg-config.patch src/openal-2-guid-static-link.patch src/openal.mk |
| diffstat | 5 files changed, 31 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Tue Apr 03 14:08:25 2012 +0200 +++ b/index.html Tue Apr 03 14:59:00 2012 +0200 @@ -1574,7 +1574,7 @@ </tr> <tr> <td id="openal-package">openal</td> - <td id="openal-version">1.13</td> + <td id="openal-version">1.14</td> <td id="openal-website"><a href="http://kcat.strangesoft.net/openal.html">openal</a></td> </tr> <tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openal-1-fixes.patch Tue Apr 03 14:59:00 2012 +0200 @@ -0,0 +1,29 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From b5c7c4853307964f0b8e11e2c9edb5bf0f8511f7 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 3 Apr 2012 14:36:58 +0200 +Subject: [PATCH] add static private dependencies to pkg-config for cmake + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef3d08d..88de1e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -543,6 +543,7 @@ IF(DSOUND) + SET(BACKENDS "${BACKENDS} DirectSound \(linked\),") + SET(EXTRA_LIBS dsound ${EXTRA_LIBS}) + ENDIF() ++ SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid -lole32") + ENDIF() + ENDIF() + ENDIF() +-- +1.7.9.2 +
--- a/src/openal-1-luuid-pkg-config.patch Tue Apr 03 14:08:25 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: - - -diff -ur openal-soft-1.13.orig/CMakeLists.txt openal-soft-1.13/CMakeLists.txt ---- openal-soft-1.13.orig/CMakeLists.txt 2011-02-16 07:05:40.000000000 +1100 -+++ openal-soft-1.13/CMakeLists.txt 2011-03-02 15:40:02.000000000 +1100 -@@ -393,6 +393,7 @@ - SET(BACKENDS "${BACKENDS} DirectSound \(linked\),") - SET(EXTRA_LIBS dsound ${EXTRA_LIBS}) - ENDIF() -+ SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid") - ENDIF() - ENDIF() - ENDIF()
--- a/src/openal-2-guid-static-link.patch Tue Apr 03 14:08:25 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: - - ---- openal-soft-1.13.orig/Alc/dsound.c 2011-02-08 01:44:06.000000000 -0500 -+++ openal-soft-1.13/Alc/dsound.c 2011-03-02 22:57:58.000000000 -0500 -@@ -21,7 +21,6 @@ - #include "config.h" - - #define _WIN32_WINNT 0x0500 --#define INITGUID - #include <stdlib.h> - #include <stdio.h> - #include <memory.h> -@@ -45,8 +44,8 @@ - #define DSSPEAKER_7POINT1 7 - #endif - --DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); --DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010,{0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -+const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - - static void *ds_handle; - static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);
--- a/src/openal.mk Tue Apr 03 14:08:25 2012 +0200 +++ b/src/openal.mk Tue Apr 03 14:59:00 2012 +0200 @@ -3,7 +3,7 @@ PKG := openal $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 0e2449375a12cee65a9cea354533dcaabf9d5068 +$(PKG)_CHECKSUM := e6d69db13ec15465b83a45ef89978e8a0f55beca $(PKG)_SUBDIR := openal-soft-$($(PKG)_VERSION) $(PKG)_FILE := openal-soft-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://kcat.strangesoft.net/openal-releases/$($(PKG)_FILE)