From 1db2f349b41ff5c225642d79fec916bfeac224fa Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 3 Apr 2012 14:59:00 +0200
Subject: update package openal

---
 index.html                          |  2 +-
 src/openal-1-fixes.patch            | 29 +++++++++++++++++++++++++++++
 src/openal-1-luuid-pkg-config.patch | 17 -----------------
 src/openal-2-guid-static-link.patch | 27 ---------------------------
 src/openal.mk                       |  2 +-
 5 files changed, 31 insertions(+), 46 deletions(-)
 create mode 100644 src/openal-1-fixes.patch
 delete mode 100644 src/openal-1-luuid-pkg-config.patch
 delete mode 100644 src/openal-2-guid-static-link.patch

diff --git a/index.html b/index.html
index 7a18953..a1af319 100644
--- a/index.html
+++ b/index.html
@@ -1574,7 +1574,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     </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>
diff --git a/src/openal-1-fixes.patch b/src/openal-1-fixes.patch
new file mode 100644
index 0000000..93b2ab8
--- /dev/null
+++ b/src/openal-1-fixes.patch
@@ -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
+
diff --git a/src/openal-1-luuid-pkg-config.patch b/src/openal-1-luuid-pkg-config.patch
deleted file mode 100644
index e444abc..0000000
--- a/src/openal-1-luuid-pkg-config.patch
+++ /dev/null
@@ -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()
diff --git a/src/openal-2-guid-static-link.patch b/src/openal-2-guid-static-link.patch
deleted file mode 100644
index daf4470..0000000
--- a/src/openal-2-guid-static-link.patch
+++ /dev/null
@@ -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);
diff --git a/src/openal.mk b/src/openal.mk
index ea7e90e..7e1deb2 100644
--- a/src/openal.mk
+++ b/src/openal.mk
@@ -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)
-- 
cgit v0.12