From 8ef67c393b8e661b4e00475ee604d04885b7dfd7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Nov 2018 15:26:44 +0400
Subject: [PATCH] Fix build after openal-soft update.

Regression was introduced in 91c85ec86b.
---
 Telegram/gyp/telegram_win.gypi | 1 -
 docs/building-cmake.md         | 4 ++++
 docs/building-msvc.md          | 8 ++++----
 docs/building-xcode-old.md     | 6 ++++--
 docs/building-xcode.md         | 2 +-
 snap/snapcraft.yaml            | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Telegram/gyp/telegram_win.gypi b/Telegram/gyp/telegram_win.gypi
index e943853271..2c606f313e 100644
--- a/Telegram/gyp/telegram_win.gypi
+++ b/Telegram/gyp/telegram_win.gypi
@@ -16,7 +16,6 @@
       '-lUxTheme',
       '-lDbgHelp',
       '-lOpenAL32',
-      '-lcommon',
       '-lopus',
       'windows/common',
       'windows/handler/exception_handler',
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 82e431f9b7..01a9198ff2 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -91,7 +91,11 @@ Go to ***BuildPath*** and run
     cd openal-soft
     git checkout openal-soft-1.19.1
     cd build
+    if [ `uname -p` == "i686" ]; then
+    cmake -D LIBTYPE:STRING=STATIC -D ALSOFT_UTILS:BOOL=OFF ..
+    else
     cmake -D LIBTYPE:STRING=STATIC ..
+    fi
     make $MAKE_THREADS_CNT
     sudo make install
     cd ../..
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 4bd957fa3b..128a9ad439 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -87,13 +87,13 @@ Open **x86 Native Tools Command Prompt for VS 2017.bat**, go to ***BuildPath***
     msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
     cd ..\..\..\..
 
-    git clone git://repo.or.cz/openal-soft.git
+    git clone https://github.com/john-preston/openal-soft.git
     cd openal-soft
-    git checkout openal-soft-1.19.1
+    git checkout fix_macro
     cd build
     cmake -G "Visual Studio 15 2017" -D LIBTYPE:STRING=STATIC -D FORCE_STATIC_VCRT:STRING=ON ..
-    msbuild OpenAL32.vcxproj /property:Configuration=Debug
-    msbuild OpenAL32.vcxproj /property:Configuration=Release
+    msbuild OpenAL.vcxproj /property:Configuration=Debug
+    msbuild OpenAL.vcxproj /property:Configuration=Release
     cd ..\..
 
     git clone https://github.com/google/breakpad
diff --git a/docs/building-xcode-old.md b/docs/building-xcode-old.md
index 186bef2a31..730e977964 100644
--- a/docs/building-xcode-old.md
+++ b/docs/building-xcode-old.md
@@ -102,8 +102,10 @@ Go to ***BuildPath*** and run
     cd ..
 
     git clone git://repo.or.cz/openal-soft.git
-    cd openal-soft/build
-    cmake -DLIBTYPE:STRING=STATIC -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_INSTALL_PREFIX:STRING=/usr/local/macold ..
+    cd openal-soft
+    git checkout openal-soft-1.19.1
+    cd build
+    LDFLAGS='-isysroot /' cmake -DLIBTYPE:STRING=STATIC -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_INSTALL_PREFIX:STRING=/usr/local/macold ..
     make -j4
     sudo make install
     cd ../..
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index e24ef3ed3b..6976640311 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -90,7 +90,7 @@ Go to ***BuildPath*** and run
     cd openal-soft
     git checkout openal-soft-1.19.1
     cd build
-    cmake -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8 ..
+    LDFLAGS='-isysroot /' cmake -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8 ..
     make -j4
     sudo make install
     cd ../..
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 68baa2aebd..106f1ba2a8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -284,7 +284,7 @@ parts:
   openal:
     source: https://github.com/kcat/openal-soft.git
     source-depth: 1
-    source-branch: v1.19
+    source-tag: openal-soft-1.19.1
     plugin: cmake
     build-packages:
       - oss4-dev