# ChangeLog for app-accessibility/brltty
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.156 2014/11/27 10:15:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.157 2014/12/04 23:03:28 teiresias Exp $
+
+*brltty-5.2 (04 Dec 2014)
+
+ 04 Dec 2014; Christopher Brannon <teiresias@gentoo.org> +brltty-5.2.ebuild,
+ +files/brltty-5.2-fix-ldflags.patch, +files/brltty-5.2-respect-AR.patch,
+ +files/brltty-5.2-udev.patch:
+ New upstream version.
27 Nov 2014; Pacho Ramos <pacho@gentoo.org> brltty-5.0-r3.ebuild,
brltty-5.1.ebuild:
AUX brltty-5.1-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
AUX brltty-5.1-respect-AR.patch 403 SHA256 01786fd2e922f4595a59753a9e5fc7c0c8bfb24310337726ce82947c65cd2046 SHA512 1d531a7cd28b84dba92144cd4405b955ef0bf3cebef6a12bbcebee8f32f38c32c49c27143591176ea913aecf2398e75bb71c600fe51283fc51cfe1339d3b88d9 WHIRLPOOL 16da2ce9cbdeca7623f7e3146b71c0bb8959ced3c26abf71e2f845b93aacafc8b4d73e91d749b7aa8c6e42f36b383d7d671f50b7dfe07256adcf7c822407600d
AUX brltty-5.1-udev.patch 1215 SHA256 4f2deb06ad102126c3ad624aab09baf052fa2627c49340924688c9b5965f0721 SHA512 436ee879c1948eb6418fcb4d69431dae9640e4b1905971657143646de438541ed0bacca1d7b5b154e235b6e73915fbab843edd8c5dc8881965958fc4aac637e8 WHIRLPOOL 6f11252da78130050b4335e8aa8c8b9a597a4728684f50759d97003a98e3592e9f14cb9d28e087a7353ce5e585ef2b7846a826acf660042c5a73155f98d6181b
+AUX brltty-5.2-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
+AUX brltty-5.2-respect-AR.patch 433 SHA256 9ccf9500cd65d994eebf60181c307240e59e150cf2095d7b1a3f11f9e92afcf1 SHA512 ce778cded4ee6f9ac45faedd3727c58746e780cff944d2c39ff71f792905c7f214b104641aef72a233d07df74a92cc2a596ac6bac1b76873d82d2c1383e994e9 WHIRLPOOL c5426441bd5dae68d65651e96cb83c7d3f34238d36ed5c21dbb97b81b864040376294e3ab289ef53aa75c92dc6685b96ee748d619baabf4ce504bd22ca3fe9c8
+AUX brltty-5.2-udev.patch 1208 SHA256 8aea1d60da2d7323b9d4a4c11cabe8bdcf4a34a03942361b1c105505682764c7 SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd WHIRLPOOL dd3bf4a95339de3f42a5a151a7bc57bed2ab159070664512bb5682494012cb899351baf8c20e02d474614e2b25efbb877ea4304a15d9365bd3795c65c7826454
AUX brltty.rc 356 SHA256 24950c773d16156fed8f71be72abefa77a4c45d930e2ea53b6371a0e659644f8 SHA512 4e4b363aa297f94c2078744417e630d13d5796ed55f24929e39f43108cce91c7dd49622d24d28fd91d3642371370feb9a62256d773ec052617bd4f015be81af2 WHIRLPOOL 26e7c5344218c79e4cbddbb0fd82a6589116fe43afe4439881c7f3d4dcafcf60f447cab8e5574d5f3aab83bbc85522f3b25f28497c1ad8a136b4b32abe9673d6
AUX brltty.tmpfiles.conf 31 SHA256 45c13fe100502b1896bd758f6c59a46fa2250ce093ad719f41854911349a0a71 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 WHIRLPOOL eb4e009f97fe75ac90c15a222ec4b85bc7888adf09e6e0ac699718376debd9907156838ff61ee9efa35a0df94419456864659c8c66f128af10e0ec7b447b2087
DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
DIST brltty-5.0.tar.xz 2213768 SHA256 e3613fa2e8c3450d7e7bee7107235344c474dc310af5adcc19761f361e8c8b92 SHA512 2a66f2fcf0ada9a499450e14c11efe2cffd1e9b465755aab60093f383c596d4f4f3be0651e6559df143fc1547a5d5be24caf485596cb8ad691b029de110f8dcc WHIRLPOOL 3f36f036f5eb6479e9c42cc79eead215d7133cfb6d2c4de3e4eaa6f776299d021c7830e32c914b7cb7686bd4d31902c0762d309702ef686ab7b37aff6ee4161a
DIST brltty-5.1.tar.xz 2226516 SHA256 d3482b44d431e4c352eed5116bde45af913b26d186c67835dcd70d05c2da27cd SHA512 0302b8b7a2e90365b165e0db96119b63c422d2fe02e77eaa520107715119509e2d47fd0557e037e99146adddc3efb2d334d6f5b7d7ed4195f8c00f5b47d8f3e1 WHIRLPOOL 1e3f4e4e3cf7a7c47db36f7c92ace015b0fc93eb22b7e26ae433e7c722da554cc161de315d6c62b17c5e10807c420bab57e0a208cadb9a0ae57fae16f59094c9
+DIST brltty-5.2.tar.xz 2532684 SHA256 f1293940317a675d0eaeaf3f363bbfe4bfaa5225c2116123a61ce2d3c71943f7 SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f WHIRLPOOL 33fcf326be381309f2baa3f59807145a0ca3a614f32b0b27e4b76af1c1f46f6459f7be1d629002538588ce71ab017b52bfc642fc06aa2c3f883aba272e61f20e
EBUILD brltty-4.5-r3.ebuild 4414 SHA256 ca6a86a5ba9689093cb0fae2cdf6c080bc942e75ff2a3a469237e174680a5d83 SHA512 2d3a17f27e33c40ce8ba4ce74795ca82ed71d4229dd40b0efa564a89831a3e5e8da6bfb2343bac97123f6339d747d65a188eadf4dc2b34ec7f6a9f275780fb7f WHIRLPOOL a4bb274038287100f4bfe22c43de7885d6661ab1ba58727f11a66030021d686998dba8ec56a09de2d890a8f2585286a3210de2c5f91922f7a936c0bee21ece7d
EBUILD brltty-5.0-r2.ebuild 4457 SHA256 5762e928bb2d1bc57b3cb2beeaa0d499a24d2414b6cb2aa4228188928a7f17c3 SHA512 44d3fd3c169104f7f8a0a3bde011ec9592c86f30ff784d9aae3f084070fe39b0403ac532dae623e997ac5d7fb2f9ba02ffdd8c208b05948b4342f8c305699cfc WHIRLPOOL 07fe45b13c9d132ccbd3dae12e6237cc1d709d4ec52fee8f4261403f1ac45c8b8dbb5d92b7fc16c7a0ac3ba1b0010ce814240dfa49539793b2d9c781ae3ded5f
EBUILD brltty-5.0-r3.ebuild 5011 SHA256 3f5ccf799b102a5944d433108d2d0839b42d93628ab9eb7d93a0a26fbd00e0e9 SHA512 f2ff0b9367f5fb1642085c5b01edc900bba179a85ffc3b9112d56102d36ae8930fc78922037eaafe38daa64fe42efc41b93e177df5df4267092b7b2850ec3bf1 WHIRLPOOL e90c5c9f394b07316cbe4ea45f4eb71909c851ab745d42d5f4a3d2b04c58b72d4b3ab0c028e03ee90a8f9ca00b1fbe7a1cf32867b29ee90c3d8ca971127f1c4e
EBUILD brltty-5.1.ebuild 5068 SHA256 45f582211329aef178ae196ed13c59a7a4510bd600ca17930f8ddc9b8deccee9 SHA512 afba2870b2be80fc97b757e4ec1fe619a56135c61bb3c42879a573b4c10fd92c1b0e2263c2bd796abca971312876438c3754b0e76b65511809f21119ea7b79ec WHIRLPOOL 75936256311145154e9029a25e22bd18c90aa1340493d68b2c5d125a0861707ec4d87317f2462a62ecc4eb03d7301ff1830bda83d39b5991c8a0b7f32393e4ff
-MISC ChangeLog 20845 SHA256 607ca9af98a29ad78626749b4ee57c975611d95fda74ef26dcfa2787e1040800 SHA512 0d55f531597ac7b5bba446612d8776ac90fedd94ab0f355de15ce3b2383bb489b6e0321863ffc43324f8a3eba05545b8ab5bc1833db0e1d3090de0f55a038441 WHIRLPOOL 92b5aba034d7b684ee4d767404ef07178f48cbd06938bfaac75afc1c256223efa6d3ab4898f467d8fff83911342bf1f0c5299a3e55e2d381fb96a0e6133f601d
+EBUILD brltty-5.2.ebuild 5072 SHA256 432f1807c29d95e1aa6d752691242bb095c877c23c6d48f5e35f587da7191f00 SHA512 ce7e9b749d402eb7bedec6595deccdd12fc447e00b39e7517da01fdc886189ca59f6efddf694d8b7e1baaa6acd4c372e6bebba023561b4c5bc4baf070d42fbae WHIRLPOOL 465f0df3426440472c5b94e87283b5913c89ef4baab8fca196662bac3010ea2cd1e951a37c4669fa0fbba931dabb3baec755b43c3308efa1f210e841b6bec032
+MISC ChangeLog 21086 SHA256 01ae2a39959e7fdc9f4323168ee2ec3fd56e243938d12360dbd139484ff38f52 SHA512 40e63de0ced0cdb640e6888cfc438b43ec5b1912a87c15e202399b99b369e0bf09d2c200c8ffbd5dc60ed42efdc20b35419b485c067c33279ee8af69c81ec6e9 WHIRLPOOL a8b41028543331b2c1e031b7d4d233b1a65c24c8e9896245bf8754fd4989dfd17c9ef966a6d49907f6c2d03eee3b8035755f16a52c55f4cae7c64e4ef8bcb1eb
MISC metadata.xml 1918 SHA256 5cdd92581b4e46c8dc3c468f51bf04dd5456dbddc1f4f88fef47879953f35d88 SHA512 0dd12af812f22da964152898a256c957e2074d1ae9eb2f8dd471f8f3cfb0016439271636759b622756d67f0eadfc5f062556ff5f85be4445c03dc5fe097814e4 WHIRLPOOL 1c232cc5d306a62507be40fd18552a284e87ae2a10e920d4cc3886ea59e4bc075a0ce9636eb15f6d59fb07bfc29cf5b503b87b8425a275b079d4e91ffdf2ec78
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlR2+bAACgkQCaWpQKGI+9QBSQCffyCxlQHuafE+AZrg2GvNgrLR
-BUIAnjIQ3TaG+jwddwcjq/Dh/ORbI1fL
-=4N4l
+iQEcBAEBCAAGBQJUgOhBAAoJEH8qFnJlIeBtYzMH/0H0FBgCeczK0TPb91pO4IST
+Cyg8Y62HH41V4DhSN5SDnxDkBBuy1kltedCvQYaUE/MztMkSOLtNUQ6tYBJBaWyg
+0S4DQnwGSJfUdkHE6xB/rSnWYvny4uVapmQ4QSu1wh0aJFBPRbo9n6XGnHkG9TVB
+3E/ibcJHliz+56m9S66TmVrFTOfONzoZBygP6xWgIr7BBn4TWrIodliAh8lduIGO
++bJRPyvQ+95NicvGw70yvM+KAoQq+cHBbTHONlLi6hh3Q+71bdlevVyGtZe0oUVJ
+G+DguX949OEikwrK8NKumgUUe3r6AUiEowIB2mknOZDQS0gT9f1lM4j8Z+c0SpE=
+=ElHe
-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.2.ebuild,v 1.1 2014/12/04 23:03:28 teiresias Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+ autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="http://brltty.com/"
+SRC_URI="http://brltty.com/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+ java +midi ncurses nls ocaml +pcm python usb +speech
+ tcl X"
+REQUIRED_USE="doc? ( api )
+ java? ( api )
+ ocaml? ( api )
+ python? ( api )
+ tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+ gpm? ( >=sys-libs/gpm-1.20 )
+ iconv? ( virtual/libiconv )
+ icu? ( dev-libs/icu:= )
+ python? ( ${PYTHON_DEPS} )
+ ncurses? ( sys-libs/ncurses )
+ nls? ( virtual/libintl )
+ tcl? ( >=dev-lang/tcl-8.4.15 )
+ usb? ( virtual/libusb:0 )
+ X? ( x11-libs/libXaw )"
+DEPEND="virtual/pkgconfig
+ java? ( >=virtual/jdk-1.4 )
+ python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+ ${COMMON_DEP}"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+ ${COMMON_DEP}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
+ "${FILESDIR}"/${P}-udev.patch \
+ "${FILESDIR}"/${P}-respect-AR.patch
+
+ java-pkg-opt-2_src_prepare
+
+ # The code runs `pkg-config` directly instead of locating a suitable
+ # pkg-config wrapper (or respecting $PKG_CONFIG).
+ sed -i \
+ -e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+ aclocal.m4 configure.ac || die
+
+ # We run eautoconf instead of using eautoreconf because brltty uses
+ # a custom build system that uses autoconf without the rest of the
+ # autotools.
+ eautoconf
+ python_copy_sources
+}
+
+src_configure() {
+ tc-export AR LD PKG_CONFIG
+ # override prefix in order to install into /
+ # braille terminal needs to be available as soon in the boot process as
+ # possible
+ # Also override localstatedir so that the lib/brltty directory is installed
+ # correctly.
+ # Disable stripping since we do that ourselves.
+ local myconf=(
+ --prefix=/
+ --localedir=/usr/share/locale
+ --includedir=/usr/include
+ --localstatedir=/var
+ --disable-stripping
+ --with-install-root="${D}"
+ --with-writable-directory="/run/brltty"
+ $(use_enable api)
+ $(use_with beeper beep-package)
+ $(use_enable contracted-braille)
+ $(use_with fm fm-package)
+ $(use_enable gpm)
+ $(use_enable iconv)
+ $(use_enable icu)
+ $(use_enable java java-bindings)
+ $(use_with midi midi-package)
+ $(use_enable nls i18n)
+ $(use_enable ocaml ocaml-bindings)
+ $(use_with pcm pcm-package)
+ $(use_enable speech speech-support)
+ $(use_enable tcl tcl-bindings)
+ $(use_enable X x)
+ $(use_with bluetooth bluetooth-package)
+ $(use_with ncurses curses)
+ $(use_with usb usb-package) )
+
+ econf "${myconf[@]}"
+
+ if use python; then
+ myconf+=( $(use_enable python python-bindings ) )
+
+ python_configure() {
+ econf "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+ fi
+}
+
+src_compile() {
+ local JAVAC_CONF=""
+ local OUR_JNI_FLAGS=""
+ if use java; then
+ OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+ JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
+ fi
+
+ emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
+
+ if use python; then
+ python_build() {
+ cd "Bindings/Python" || die
+ emake
+ }
+ python_foreach_impl run_in_build_dir python_build
+ fi
+}
+
+src_install() {
+ if use ocaml; then
+ findlib_src_preinst
+ fi
+
+ emake OCAML_LDCONF= install
+
+ if use python; then
+ python_install() {
+ cd "Bindings/Python" || die
+ emake install
+ }
+ python_foreach_impl run_in_build_dir python_install
+ fi
+
+ if use java; then
+ # make install puts the _java.so there, and no it's not $(get_libdir)
+ rm -rf "${D}/usr/lib/java"
+ java-pkg_doso Bindings/Java/libbrlapi_java.so
+ java-pkg_dojar Bindings/Java/brlapi.jar
+ fi
+
+ insinto /etc
+ doins Documents/brltty.conf
+ udev_newrules Autostart/Udev/udev.rules 70-brltty.rules
+ newinitd "${FILESDIR}"/brltty.rc brltty
+ systemd_dounit Autostart/Systemd/brltty.service
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+ libdir="$(get_libdir)"
+ mkdir -p "${D}"/usr/${libdir}/
+ mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+ gen_usr_ldscript libbrlapi.so
+
+ cd Documents
+ mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
+ mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
+ mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+ dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
+ dohtml -r Manual-BRLTTY
+ if use doc; then
+ dohtml -r Manual-BrlAPI
+ dodoc BrlAPI-*.txt
+ fi
+
+ keepdir /var/lib/brlapi
+ rmdir "${D}/run/brltty"
+ rmdir "${D}/run"
+}
+
+pkg_postinst() {
+ elog
+ elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+ elog
+ elog To make brltty start on boot, type this command as root:
+ elog
+ elog rc-update add brltty boot
+}
--- /dev/null
+--- a/configure.ac
++++ b/configure.ac
+@@ -377,7 +377,7 @@
+ case "${host_os}"
+ in
+ linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
+- brltty_mkmod_ld_make="-shared"
++ brltty_mkmod_ld_make="-shared ${LDFLAGS}"
+ ;;
+ solaris*)
+ brltty_mkmod_ld_make="-G"
+@@ -404,7 +404,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+- brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
++ brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
+ else
+ brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
+ fi])
+@@ -414,7 +414,7 @@
+ case "${host_os}"
+ in
+ linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*)
+- brltty_mklib_ld_make="-shared"
++ brltty_mklib_ld_make="-shared ${LDFLAGS}"
+ brltty_mklib_ld_options="-soname"
+ ;;
+ solaris*)
+@@ -449,7 +449,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+- brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
++ brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ else
+ brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
+ fi])
+--- a/Bindings/OCaml/Makefile.in
++++ b/Bindings/OCaml/Makefile.in
+@@ -55,13 +55,13 @@
+ all : $(OCAML_FILES)
+
+ $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
+- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
++ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+
+ $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
+ $(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
+
+ $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
+- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
++ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+
+ brlapi.cmi: brlapi.mli
+ $(OCAMLC) -o $@ -c brlapi.mli
--- /dev/null
+diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
+--- brltty-5.2/Programs/Makefile.in 2014-11-06 07:28:41.000000000 -0800
++++ brltty-5.2-new/Programs/Makefile.in 2014-11-20 05:41:57.144219093 -0800
+@@ -434,7 +434,7 @@
+ [ ! -f lib.def ] || mv lib.def $(API_DEF)
+
+ $(API_ARC): $(API_CLIENT_OBJECTS)
+- ar rc $@ $(API_CLIENT_OBJECTS)
++ $(AR) rc $@ $(API_CLIENT_OBJECTS)
+ $(RANLIB) $@
+
+ brlapi_client.$O:
--- /dev/null
+diff -Naur brltty-5.2/Autostart/Udev/udev.rules brltty-5.2-new/Autostart/Udev/udev.rules
+--- brltty-5.2/Autostart/Udev/udev.rules 2014-11-06 07:28:41.000000000 -0800
++++ brltty-5.2-new/Autostart/Udev/udev.rules 2014-11-20 05:28:44.404885312 -0800
+@@ -182,20 +182,22 @@
+ # FreedomScientific [Focus Blue]
+ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
+
++# Seika rules are commented out, because they conflict with USB-to-serial
++# converters.
+ # Device: 10C4:EA60
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge / myAVR mySmartUSB light
+ # BrailleMemo [Pocket]
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
+
+ # Device: 10C4:EA80
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge
+ # Seika [Note Taker]
+-ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+
+ # Device: 1148:0301
+ # BrailleMemo [Smart]
projects / gentoo.git / commitdiff