Accepting request 778180 from server:messaging
- added patch fix_build_with_openAL_1.20.patch to fix build with openAL 1.20 OBS-URL: https://build.opensuse.org/request/show/778180 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/utox?expand=0&rev=3
This commit is contained in:
commit
61e8d7ca74
33
fix_build_with_openAL_1.20.patch
Normal file
33
fix_build_with_openAL_1.20.patch
Normal file
@ -0,0 +1,33 @@
|
||||
commit b608d584d9b6aeae916dec48c2cadf2e631f91b8
|
||||
Author: Tobias Kortkamp <t@tobik.me>
|
||||
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 <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
-typedef struct ALCdevice_struct ALCdevice;
|
||||
+#ifdef __APPLE__
|
||||
+#include <OpenAL/alc.h>
|
||||
+#else
|
||||
+#include <AL/alc.h>
|
||||
+#endif
|
||||
|
||||
extern bool utox_audio_thread_init;
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 22 09:18:40 UTC 2020 - Andrey Karepin <egdfree@opensuse.org>
|
||||
|
||||
- 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 <egdfree@opensuse.org>
|
||||
|
||||
|
@ -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 \
|
||||
|
Loading…
x
Reference in New Issue
Block a user