diff options
| author | Daniel Molina García <lluvia@singularity.fr> | 2012-05-27 00:37:53 +0200 |
|---|---|---|
| committer | Daniel Molina García <lluvia@singularity.fr> | 2012-05-27 00:37:53 +0200 |
| commit | 669fbc2a8d1763b4919c25957dd0184a195b7826 (patch) | |
| tree | 16d58cc12df01003610a2ac83a66c49a0b2ad44d /extra/openal | |
| parent | a905625b4c8dd3e7558f9c988eeb749bd73279b4 (diff) | |
patching and forzing -rpath as temporal solution for openal
Diffstat (limited to 'extra/openal')
| -rw-r--r-- | extra/openal/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/openal/fpu.patch | 57 |
2 files changed, 72 insertions, 4 deletions
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD index 32c6a90f6..8135a00d2 100644 --- a/extra/openal/PKGBUILD +++ b/extra/openal/PKGBUILD @@ -13,12 +13,23 @@ license=(LGPL) depends=(glibc) makedepends=(alsa-lib sdl pkgconfig cmake libpulse) options=('!libtool') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) -md5sums=('3d8b86c21a2f87a2a5e60f78f3b3f03d') +source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2 + fpu.patch) + +md5sums=('3d8b86c21a2f87a2a5e60f78f3b3f03d' + '902d3f0e6cb16584f2b21d65235c3168') build() { - cd $pkgname-soft-$pkgver/build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. + # patch coming from Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666963 + cd $srcdir/$pkgname-soft-$pkgver + patch -Np1 -i "$srcdir/fpu.patch" + cd $srcdir/$pkgname-soft-$pkgver/build + cmake -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + # The next option was taken following the suggestions in this tutorial (spanish): http://manualinux.heliohost.org/blender.html + # mtjm suggests as an alternative to learn how to use cmake for finding ffmpeg libraries and send it upstream, avoiding then the use of -rpath + -D CMAKE_EXE_LINKER_FLAGS:STRING='-Wl,-rpath,/usr/lib -lavutil'\ + .. make } diff --git a/extra/openal/fpu.patch b/extra/openal/fpu.patch new file mode 100644 index 000000000..9579e30ab --- /dev/null +++ b/extra/openal/fpu.patch @@ -0,0 +1,57 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + openal-soft (1:1.14-1.1) unstable; urgency=low + . + * Non-maintainer upload. +Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- openal-soft-1.14.orig/OpenAL32/Include/alu.h ++++ openal-soft-1.14/OpenAL32/Include/alu.h +@@ -224,6 +224,29 @@ static __inline ALfloat cubic(ALfloat va + return a0*mu*mu2 + a1*mu2 + a2*mu + a3; + } + ++#if defined(_FPU_GETCW) && defined(_FPU_SETCW) ++ #ifndef _FPU_EXTENDED ++ #define _FPU_EXTENDED 0 ++ #endif ++ #ifndef _FPU_DOUBLE ++ #define _FPU_DOUBLE 0 ++ #endif ++ #ifndef _FPU_SINGLE ++ #define _FPU_SINGLE 0 ++ #endif ++ #ifndef _FPU_RC_NEAREST ++ #define _FPU_RC_NEAREST 0 ++ #endif ++ #ifndef _FPU_RC_DOWN ++ #define _FPU_RC_DOWN 0 ++ #endif ++ #ifndef _FPU_RC_UP ++ #define _FPU_RC_UP 0 ++ #endif ++ #ifndef _FPU_RC_ZERO ++ #define _FPU_RC_ZERO 0 ++ #endif ++#endif + + static __inline int SetMixerFPUMode(void) + { |