teiresias 14/08/23 14:37:41
Added: brltty-5.1-respect-AR.patch brltty-5.1-udev.patch
brltty-5.1-fix-ldflags.patch
Log:
New upstream version.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
0x6521e06d)
Revision Changes Path
1.1 app-accessibility/brltty/files/brltty-5.1-respect-AR.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-respect-AR.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-respect-AR.patch?rev=1.1&content-type=text/plain
Index: brltty-5.1-respect-AR.patch
===================================================================
diff -Naur brltty-4.5/Programs/Makefile.in brltty-4.5-new/Programs/Makefile.in
--- brltty-4.5/Programs/Makefile.in 2013-03-27 15:51:35.000000000 -0700
+++ brltty-4.5-new/Programs/Makefile.in 2013-09-19 14:57:56.268106076 -0700
@@ -387,7 +387,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
$(API_ARC): $(API_OBJS)
- ar rc $@ $(API_OBJS)
+ $(AR) rc $@ $(API_OBJS)
$(RANLIB) $@
brlapi_client.$O:
1.1 app-accessibility/brltty/files/brltty-5.1-udev.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-udev.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-udev.patch?rev=1.1&content-type=text/plain
Index: brltty-5.1-udev.patch
===================================================================
diff -Naur brltty-5.0/Autostart/Udev/udev.rules
brltty-5.0.new/Autostart/Udev/udev.rules
--- brltty-5.0/Autostart/Udev/udev.rules 2014-01-27 10:39:20.000000000
-0800
+++ brltty-5.0.new/Autostart/Udev/udev.rules 2014-02-09 04:24:08.146802299
-0800
@@ -174,20 +174,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 [all models]
# 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: 1C71:C005
# HumanWare [all models]
1.1 app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch?rev=1.1&content-type=text/plain
Index: brltty-5.1-fix-ldflags.patch
===================================================================
--- 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
