Fixed build with alsa-1.1.9

Resolves: rhbz#1716389
This commit is contained in:
Jaroslav Škarvada 2019-06-07 17:03:22 +02:00
parent d6448fb8d2
commit 897ad85a69
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,26 @@
diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c
index 10a6afc..c52ee30 100644
--- a/Programs/midi_alsa.c
+++ b/Programs/midi_alsa.c
@@ -18,7 +18,7 @@
#include "prologue.h"
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include "log.h"
#include "parse.h"
diff --git a/Programs/pcm_alsa.c b/Programs/pcm_alsa.c
index e04b1ea..82e12f1 100644
--- a/Programs/pcm_alsa.c
+++ b/Programs/pcm_alsa.c
@@ -19,7 +19,7 @@
#include "prologue.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include "log.h"
#include "timing.h"

View File

@ -33,7 +33,7 @@
Name: brltty Name: brltty
Version: %{pkg_version} Version: %{pkg_version}
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: http://brltty.app/ URL: http://brltty.app/
Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@ -41,6 +41,7 @@ Source1: brltty.service
Patch1: brltty-6.0-loadLibrary.patch Patch1: brltty-6.0-loadLibrary.patch
# libspeechd.h moved in latest speech-dispatch (NOT sent upstream) # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
Patch2: brltty-5.0-libspeechd.patch Patch2: brltty-5.0-libspeechd.patch
Patch3: brltty-6.0-alsa-1.1.9-fix.patch
Summary: Braille display driver for Linux/Unix Summary: Braille display driver for Linux/Unix
BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel
@ -229,6 +230,7 @@ mv %{name}-%{version} python2
pushd python2 pushd python2
%patch1 -p1 -b .loadLibrary %patch1 -p1 -b .loadLibrary
%patch2 -p1 -b .libspeechd %patch2 -p1 -b .libspeechd
%patch3 -p1 -b .alsa-1.1.9-fix
# remove packaged binary file # remove packaged binary file
rm -f Programs/brltty-ktb rm -f Programs/brltty-ktb
@ -526,6 +528,10 @@ fi
%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
%changelog %changelog
* Fri Jun 7 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 6.0-3
- Fixed build with alsa-1.1.9
Resolves: rhbz#1716389
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 6.0-2 * Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 6.0-2
- OCaml 4.08.0 (beta 3) rebuild. - OCaml 4.08.0 (beta 3) rebuild.