diff --git a/fix_build_with_openAL_1.20.patch b/fix_build_with_openAL_1.20.patch new file mode 100644 index 0000000..94bc65e --- /dev/null +++ b/fix_build_with_openAL_1.20.patch @@ -0,0 +1,33 @@ +commit b608d584d9b6aeae916dec48c2cadf2e631f91b8 +Author: Tobias Kortkamp +Date: Sat Nov 30 17:10:58 2019 +0100 + + Unbreak build with OpenAL 1.20.0 + + In file included from /home/tobias/src/github.com/uTox/uTox/src/av/audio.c:33: + /usr/local/include/AL/alc.h:34:26: error: typedef redefinition with different types + ('struct ALCdevice' vs 'struct ALCdevice_struct') + typedef struct ALCdevice ALCdevice; + ^ + /home/tobias/src/github.com/uTox/uTox/src/av/audio.h:8:33: note: previous definition is here + typedef struct ALCdevice_struct ALCdevice; + ^ + 1 error generated. + +diff --git a/src/av/audio.h b/src/av/audio.h +index 4edb0e45..e6b08550 100644 +--- a/src/av/audio.h ++++ b/src/av/audio.h +@@ -5,7 +5,11 @@ + #include + #include + +-typedef struct ALCdevice_struct ALCdevice; ++#ifdef __APPLE__ ++#include ++#else ++#include ++#endif + + extern bool utox_audio_thread_init; + diff --git a/utox.changes b/utox.changes index 5fa1928..18eaa63 100644 --- a/utox.changes +++ b/utox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 22 09:18:40 UTC 2020 - Andrey Karepin + +- added patch fix_build_with_openAL_1.20.patch to fix build with openAL 1.20 + ------------------------------------------------------------------- Sun Sep 22 07:28:50 UTC 2019 - Andrey Karepin diff --git a/utox.spec b/utox.spec index 981d2a6..940ef1a 100644 --- a/utox.spec +++ b/utox.spec @@ -1,7 +1,7 @@ # # spec file for package utox # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ URL: https://utox.org/ Source: https://github.com/uTox/uTox/releases/download/v%{version}/%{realname}-%{version}-full.tar.gz Source1: https://github.com/uTox/uTox/releases/download/v%{version}/%{realname}-%{version}-full.tar.gz.asc Source2: uTox.keyring +# PATCH-FEATURE-UPSTREAM fix_build_with_openAL_1.20.patch +Patch: fix_build_with_openAL_1.20.patch BuildRequires: c-toxcore-devel BuildRequires: cmake >= 3.2 BuildRequires: dbus-1-devel @@ -52,6 +54,7 @@ Lightweight Tox client. %prep %setup -q -n %{realname} +%patch0 -p1 %build %cmake \