From db48e1d4545fd46fdc1e834607730668de1a036c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:25:40 +0000
Subject: import brltty-4.5-15.el7


---

diff --git a/SOURCES/brltty-4.5-ocaml-4.04-fix.patch b/SOURCES/brltty-4.5-ocaml-4.04-fix.patch
new file mode 100644
index 0000000..ed897e8
--- /dev/null
+++ b/SOURCES/brltty-4.5-ocaml-4.04-fix.patch
@@ -0,0 +1,35 @@
+diff --git a/Bindings/OCaml/brlapi_stubs.c b/Bindings/OCaml/brlapi_stubs.c
+index 1e66f9e..aabdc14 100644
+--- a/Bindings/OCaml/brlapi_stubs.c
++++ b/Bindings/OCaml/brlapi_stubs.c
+@@ -145,12 +145,14 @@ CAMLprim value brlapiml_errorCode_of_error(value camlError)
+ static void raise_brlapi_error(void)
+ {
+   static value *exception = NULL;
++  CAMLparam0();
+   CAMLlocal1(res);
+   if (exception==NULL) exception = caml_named_value("Brlapi_error");
+   res = caml_alloc(2,0);
+   Store_field(res, 0, *exception);
+   Store_field(res, 1, constrCamlError(&brlapi_error));
+   caml_raise(res);
++  CAMLreturn0;
+ }
+ 
+ /* Function : raise_brlapi_exception */
+@@ -159,6 +161,7 @@ static void BRLAPI_STDCALL raise_brlapi_exception(int err, brlapi_packetType_t t
+ {
+   static value *exception = NULL;
+   int i;
++  CAMLparam0();
+   CAMLlocal2(str, res);
+   str = caml_alloc_string(size);
+   for (i=0; i<size; i++) Byte(str, i) = ((char *) packet)[i];
+@@ -169,6 +172,7 @@ static void BRLAPI_STDCALL raise_brlapi_exception(int err, brlapi_packetType_t t
+   Store_field(res, 2, caml_copy_int32(type));
+   Store_field(res, 3, str);
+   caml_raise(res);
++  CAMLreturn0;
+ }
+ 
+ /* function packDots */
diff --git a/SPECS/brltty.spec b/SPECS/brltty.spec
index 4721f21..acec7df 100644
--- a/SPECS/brltty.spec
+++ b/SPECS/brltty.spec
@@ -19,7 +19,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -30,6 +30,8 @@ Patch3: brltty-4.5-man-fix.patch
 Patch4: brltty-loadLibrary.patch
 Patch5: brltty-4.5-xw-fonts-fix.patch
 Patch6: brltty-4.5-relro-full.patch
+# merged upstream
+Patch7: brltty-4.5-ocaml-4.04-fix.patch
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel
 BuildRequires: at-spi-devel, at-spi2-core-devel, systemd
@@ -195,6 +197,7 @@ This package provides the OCaml binding for BrlAPI.
 %patch4 -p1 -b .loadLibrary
 %patch5 -p1 -b .xw-fonts-fix
 %patch6 -p1 -b .relro-full
+%patch7 -p1 -b .ocaml-4.04-fix
 
 %if 0%{?with_python3}
 # Make a copy of the source tree for building the Python 3 module
@@ -217,6 +220,9 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 configure_opts=" \
   --disable-stripping \
   --without-curses \
+%if ! 0%{?with_ocaml}
+  --disable-ocaml-bindings \
+%endif
 %if %{with_speech_dispatcher}
   --with-speechd=%{_prefix} \
 %endif
@@ -383,6 +389,17 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config
 %endif
 
 %changelog
+* Thu Apr 20 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-15
+- Fixed build in case ocaml is preinstalled in the build root and
+  support shouldn't be built
+  Resolves: rhbz#1443907
+
+* Tue Mar 21 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-14
+- Rebuilt for new architectures
+  Resolves: rhbz#1379884
+- Added fix to support compilation with ocaml-4.04.0
+  Resolves: rhbz#1393750
+
 * Fri May  6 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-13
 - Made brltty-config executable, currently useless, but FHS compliant
   Resolves: rhbz#1332981