brltty package update
Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>master
basebuilder_pel7ppc64lebuilder0
parent
e0ddc9d8de
commit
9ce9dd6b3b
|
|
@ -0,0 +1,642 @@
|
|||
diff -up brltty-4.5/Documents/brltty.1.in.orig brltty-4.5/Documents/brltty.1.in
|
||||
--- brltty-4.5/Documents/brltty.1.in.orig 2013-03-28 01:24:27.000000000 +0100
|
||||
+++ brltty-4.5/Documents/brltty.1.in 2013-07-15 17:26:50.610416942 +0200
|
||||
@@ -41,8 +41,8 @@ Boot Parameters
|
||||
.IP 3. 4
|
||||
Environment Variables
|
||||
(if the
|
||||
-.B -E
|
||||
-.RB "(" "--environment-variables" ")"
|
||||
+.B \-E
|
||||
+.RB "(" "\-\-environment\-variables" ")"
|
||||
option is in effect)
|
||||
.IP 4. 4
|
||||
The Configuration File
|
||||
@@ -56,7 +56,7 @@ the rightmost specification takes preced
|
||||
.PP
|
||||
The following options are supported:
|
||||
.TP
|
||||
-\fB-a \fItable\fR (\fB--attributes-table=\fR)
|
||||
+\fB\-a \fItable\fR (\fB\-\-attributes\-table=\fR)
|
||||
The path to the attributes table.
|
||||
Relative paths are anchored at
|
||||
.BR "@TABLES_DIRECTORY@" "."
|
||||
@@ -66,12 +66,12 @@ extension is optional.
|
||||
The built-in default is
|
||||
.BR "attributes.atb" "."
|
||||
.TP
|
||||
-\fB-b \fIdriver\fB,\fR...|\fBauto\fR (\fB--braille-driver=\fR)
|
||||
+\fB\-b \fIdriver\fB,\fR...|\fBauto\fR (\fB\-\-braille\-driver=\fR)
|
||||
The driver for the braille display
|
||||
(see Driver Specification).
|
||||
The built-in default is \fBauto\fR.
|
||||
.TP
|
||||
-\fB-c \fItable\fR (\fB--contraction-table=\fR)
|
||||
+\fB\-c \fItable\fR (\fB\-\-contraction\-table=\fR)
|
||||
The path to the contraction table.
|
||||
Relative paths are anchored at
|
||||
.BR "@TABLES_DIRECTORY@" "."
|
||||
@@ -79,7 +79,7 @@ The
|
||||
.B ".ctb"
|
||||
extension is optional.
|
||||
.TP
|
||||
-\fB-d \fIdevice\fB,\fR... (\fB--braille-device=\fR)
|
||||
+\fB\-d \fIdevice\fB,\fR... (\fB\-\-braille\-device=\fR)
|
||||
The device to which the braille display is connected.
|
||||
The built-in default is \fB@braille_device@\fR.
|
||||
.RS
|
||||
@@ -131,23 +131,23 @@ or do set it but not to a unique value.
|
||||
A comma-delimited list of braille devices may be specified.
|
||||
If this is done then autodetection is performed on each listed device in sequence.
|
||||
This feature is particularly useful if you have
|
||||
-a braille display with more than one interrface,
|
||||
+a braille display with more than one interface,
|
||||
e.g. both a serial and a USB port.
|
||||
.RE
|
||||
.TP
|
||||
-\fB-e\fR (\fB--standard-error\fR)
|
||||
+\fB\-e\fR (\fB\-\-standard\-error\fR)
|
||||
Write logs to standard error rather than to the system log (useful for debugging).
|
||||
.TP
|
||||
-\fB-f \fIfile\fR (\fB--configuration-file=\fR)
|
||||
+\fB\-f \fIfile\fR (\fB\-\-configuration\-file=\fR)
|
||||
The path to the configuration file.
|
||||
Relative paths are anchored at the current working directory.
|
||||
-The built-in default is
|
||||
+The built\-in default is
|
||||
.BR "@CONFIGURATION_DIRECTORY@/@CONFIGURATION_FILE@" "."
|
||||
.TP
|
||||
-\fB-h\fR (\fB--help\fR)
|
||||
+\fB\-h\fR (\fB\-\-help\fR)
|
||||
Print a command line usage summary and then exit.
|
||||
.TP
|
||||
-\fB-i \fIname\fR (\fB--speech-input=\fR)
|
||||
+\fB\-i \fIname\fR (\fB\-\-speech\-input=\fR)
|
||||
The file system object
|
||||
(FIFO, named pipe, named socket, etc)
|
||||
which gives other applications access to
|
||||
@@ -158,7 +158,10 @@ Relative paths are anchored at the curre
|
||||
The built-in default is
|
||||
that the file system object is not created.
|
||||
.TP
|
||||
-\fB-l \fIlevel\fR (\fB--log-level=\fR)
|
||||
+\fB\-k \fIfile\fR (\fB\-\-key\-table=\fR)
|
||||
+Path to key table file.
|
||||
+.TP
|
||||
+\fB\-l \fIlevel\fR (\fB\-\-log\-level=\fR)
|
||||
The minimum severity level for messages written to the log.
|
||||
Any of the following numbers,
|
||||
or any abbreviation of their corresponding names,
|
||||
@@ -193,7 +196,7 @@ may be specified:
|
||||
The built-in default is
|
||||
.BR "notice" "."
|
||||
.TP
|
||||
-\fB-m \fIdevice\fR (\fB--midi-device=\fR)
|
||||
+\fB\-m \fIdevice\fR (\fB\-\-midi\-device=\fR)
|
||||
The device to use for the Musical Instrument Digital Interface.
|
||||
For ALSA it's \fIclient\fB:\fIport\fR,
|
||||
where each may be either a number or a case-sensitive substring of its name.
|
||||
@@ -206,10 +209,10 @@ the first available MIDI output port
|
||||
.B /dev/sequencer
|
||||
.RE
|
||||
.TP
|
||||
-\fB-n\fR (\fB--no-daemon\fR)
|
||||
+\fB\-n\fR (\fB\-\-no\-daemon\fR)
|
||||
Remain in the foreground (useful for debugging).
|
||||
.TP
|
||||
-\fB-p \fIdevice\fR (\fB--pcm-device=\fR)
|
||||
+\fB\-p \fIdevice\fR (\fB\-\-pcm\-device=\fR)
|
||||
The device to use for digital audio.
|
||||
For ALSA it's \fIname\fR[\fB:\fIargument\fB,\fR...].
|
||||
For other interfaces it's the full path to an appropriate system device.
|
||||
@@ -231,34 +234,34 @@ the preferred PCM output device
|
||||
.B /dev/audio
|
||||
.RE
|
||||
.TP
|
||||
-\fB-q\fR (\fB--quiet\fR)
|
||||
+\fB\-q\fR (\fB\-\-quiet\fR)
|
||||
Suppress the start-up messages.
|
||||
This is done by reducing the default log level
|
||||
(see the
|
||||
-.B -l
|
||||
-.RB "(" "--log-level=" ")"
|
||||
+.B \-l
|
||||
+.RB "(" "\-\-log\-level=" ")"
|
||||
option)
|
||||
to
|
||||
.B warning
|
||||
.RB "(" "information"
|
||||
if either
|
||||
-.B -v
|
||||
-.RB "(" "--verify" ")"
|
||||
+.B \-v
|
||||
+.RB "(" "\-\-verify" ")"
|
||||
or
|
||||
-.B -V
|
||||
-.RB "(" "--version" ")"
|
||||
+.B \-V
|
||||
+.RB "(" "\-\-version" ")"
|
||||
is also specified).
|
||||
.TP
|
||||
-\fB-r\fR (\fB--release-device\fR)
|
||||
+\fB\-r\fR (\fB\-\-release\-device\fR)
|
||||
Release the device to which the braille display is connected
|
||||
when the current screen or window can't be read.
|
||||
.TP
|
||||
-\fB-s \fIdriver\fB,\fR...|\fBauto\fR (\fB--speech-driver=\fR)
|
||||
+\fB\-s \fIdriver\fB,\fR...|\fBauto\fR (\fB\-\-speech\-driver=\fR)
|
||||
The driver for the speech synthesizer
|
||||
(see Driver Specification).
|
||||
The built-in default is \fBauto\fR.
|
||||
.TP
|
||||
-\fB-t \fItable\fR (\fB--text-table=\fR)
|
||||
+\fB\-t \fItable\fR (\fB\-\-text\-table=\fR)
|
||||
The path to the text table.
|
||||
Relative paths are anchored at
|
||||
.BR "@TABLES_DIRECTORY@" "."
|
||||
@@ -269,7 +272,7 @@ The built-in default is
|
||||
.B "nabcc.ttb"
|
||||
(the North American Braille Computer Code).
|
||||
.TP
|
||||
-\fB-v\fR (\fB--verify\fR)
|
||||
+\fB\-v\fR (\fB\-\-verify\fR)
|
||||
Print the start-up messages and then exit.
|
||||
This always includes the versions of
|
||||
.B brltty
|
||||
@@ -277,8 +280,8 @@ itself,
|
||||
the server side of its application programming interface,
|
||||
and each of the selected braille and speech drivers.
|
||||
If the
|
||||
-.B -q
|
||||
-.RB "(" "--quiet" ")"
|
||||
+.B \-q
|
||||
+.RB "(" "\-\-quiet" ")"
|
||||
option isn't also specified
|
||||
then it also includes the values of the options after all sources have been considered.
|
||||
If more than one braille driver and/or more than one braille device
|
||||
@@ -286,17 +289,17 @@ has been specified then braille display
|
||||
If more than one speech driver
|
||||
has been specified then speech synthesizer autodetection is performed.
|
||||
.TP
|
||||
-\fB-x \fIdriver\fR (\fB--screen-driver=\fR)
|
||||
+\fB\-x \fIdriver\fR (\fB\-\-screen\-driver=\fR)
|
||||
The screen driver.
|
||||
The built-in default is operating system appropriate.
|
||||
.TP
|
||||
-\fB-A \fIname\fB=\fIvalue\fB,\fR... (\fB--api-parameters=\fR)
|
||||
+\fB\-A \fIname\fB=\fIvalue\fB,\fR... (\fB\-\-api\-parameters=\fR)
|
||||
Parameters for the application programming interface.
|
||||
If the same parameter is specified more than once
|
||||
then the rightmost specification is used.
|
||||
Parameter names may be abbreviated.
|
||||
.TP
|
||||
-\fB-B \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR... (\fB--braille-parameters=\fR)
|
||||
+\fB\-B \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR... (\fB\-\-braille\-parameters=\fR)
|
||||
Parameters for the braille display driver.
|
||||
If the same parameter is specified more than once
|
||||
then the rightmost specification is used.
|
||||
@@ -304,17 +307,23 @@ Parameter names may be abbreviated.
|
||||
If a parameter assignment is qualified with a driver identification code
|
||||
then it's only processed if that braille display driver is being used.
|
||||
.TP
|
||||
-\fB-E\fR (\fB--environment-variables\fR)
|
||||
+\fB\-D\fR (\fB\-\-drivers\-directory=\fR)
|
||||
+Path to directory for loading drivers.
|
||||
+.TP
|
||||
+\fB\-E\fR (\fB\-\-environment\-variables\fR)
|
||||
Recognize environment variables.
|
||||
.TP
|
||||
-\fB-F \fIfile\fR (\fB--preferences-file=\fR)
|
||||
+\fB\-F \fIfile\fR (\fB\-\-preferences\-file=\fR)
|
||||
The path to the preferences file.
|
||||
Relative paths are anchored at
|
||||
.BR "@STATE_DIRECTORY@" "."
|
||||
The built-in default is
|
||||
.BR "@PREFERENCES_FILE@" "."
|
||||
.TP
|
||||
-\fB-I\fR (\fB--install-service\fR)
|
||||
+\fB\-H\fR (\fB\-\-full\-help\fR)
|
||||
+Print a usage summary (all options), and then exit.
|
||||
+.TP
|
||||
+\fB\-I\fR (\fB\-\-install\-service\fR)
|
||||
(Windows only)
|
||||
Install
|
||||
.B brltty
|
||||
@@ -325,21 +334,24 @@ and so that applications can know that a
|
||||
.B BrlAPI
|
||||
server is running.
|
||||
.TP
|
||||
-\fB-L \fIfile\fR (\fB--log-file=\fR)
|
||||
+\fB\-K \fIarg\fR (\fB\-\-keyboard\-properties=\fR)
|
||||
+Properties of the keyboard.
|
||||
+.TP
|
||||
+\fB\-L \fIfile\fR (\fB\-\-log\-file=\fR)
|
||||
The file to which log messages are written.
|
||||
Relative paths are anchored at the current working directory.
|
||||
The default is to send log messages to the system log.
|
||||
.TP
|
||||
-\fB-M \fIcsecs\fR (\fB--message-delay=\fR)
|
||||
+\fB\-M \fIcsecs\fR (\fB\-\-message\-delay=\fR)
|
||||
The message hold time in hundredths of a second.
|
||||
The built-in default is
|
||||
.B 400
|
||||
(4 seconds).
|
||||
.TP
|
||||
-\fB-N\fR (\fB--no-api\fR)
|
||||
+\fB\-N\fR (\fB\-\-no\-api\fR)
|
||||
Don't start the application programming interface.
|
||||
.TP
|
||||
-\fB-P \fIfile\fR (\fB--pid-file=\fR)
|
||||
+\fB\-P \fIfile\fR (\fB\-\-pid\-file=\fR)
|
||||
The full path to the process identifier file.
|
||||
If this option is supplied,
|
||||
.B brltty
|
||||
@@ -348,7 +360,7 @@ The file is removed when
|
||||
.B brltty
|
||||
terminates.
|
||||
.TP
|
||||
-\fB-R\fR (\fB--remove-service\fR)
|
||||
+\fB\-R\fR (\fB\-\-remove\-service\fR)
|
||||
(Windows only)
|
||||
Remove the
|
||||
.B BrlAPI
|
||||
@@ -359,7 +371,7 @@ and so that applications can know that n
|
||||
.B BrlAPI
|
||||
server is running.
|
||||
.TP
|
||||
-\fB-S \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR... (\fB--speech-parameters=\fR)
|
||||
+\fB\-S \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR... (\fB\-\-speech\-parameters=\fR)
|
||||
Parameters for the speech synthesizer driver.
|
||||
If the same parameter is specified more than once
|
||||
then the rightmost specification is used.
|
||||
@@ -367,13 +379,16 @@ Parameter names may be abbreviated.
|
||||
If a parameter assignment is qualified with a driver identification code
|
||||
then it's only processed if that speech synthesizer driver is being used.
|
||||
.TP
|
||||
-\fB-U \fIcsecs\fR (\fB--update-interval=\fR)
|
||||
+\fB\-T \fIdirectory\fR (\fB\-\-tables\-directory=\fR)
|
||||
+Path to directory for text and attributes tables.
|
||||
+.TP
|
||||
+\fB\-U \fIcsecs\fR (\fB\-\-update\-interval=\fR)
|
||||
The braille window update interval in hundredths of a second.
|
||||
The built-in default is
|
||||
.B 4
|
||||
(25 times per second).
|
||||
.TP
|
||||
-\fB-V\fR (\fB--version\fR)
|
||||
+\fB\-V\fR (\fB\-\-version\fR)
|
||||
Print the versions of
|
||||
.B brltty
|
||||
itself,
|
||||
@@ -381,119 +396,122 @@ the server side of its application progr
|
||||
and those drivers which were configured in at build-time,
|
||||
and then exit.
|
||||
If the
|
||||
-.B -q
|
||||
-.RB "(" "--quiet" ")"
|
||||
+.B \-q
|
||||
+.RB "(" "\-\-quiet" ")"
|
||||
option isn't also specified
|
||||
then also print copyright information.
|
||||
.TP
|
||||
-\fB-X \fIname\fB=\fIvalue\fB,\fR... (\fB--screen-parameters=\fR)
|
||||
+\fB\-W \fIdirectory\fR (\fB\-\-writable\-directory=\fR)
|
||||
+Path to directory which can be written to.
|
||||
+.TP
|
||||
+\fB\-X \fIname\fB=\fIvalue\fB,\fR... (\fB\-\-screen\-parameters=\fR)
|
||||
Parameters for the screen driver.
|
||||
If the same parameter is specified more than once
|
||||
then the rightmost specification is used.
|
||||
Parameter names may be abbreviated.
|
||||
.SS "Environment Variables"
|
||||
The following environment variables are recognized if the
|
||||
-.B -E
|
||||
-.RB "(" "--environment-variables" ")"
|
||||
+.B \-E
|
||||
+.RB "(" "\-\-environment\-variables" ")"
|
||||
option is specified:
|
||||
.TP
|
||||
\fBBRLTTY_API_PARAMETERS=\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the application programming interface.
|
||||
See the
|
||||
-.B -A
|
||||
-.RB "(" "--api-parameters=" ")"
|
||||
+.B \-A
|
||||
+.RB "(" "\-\-api\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_ATTRIBUTES_TABLE=\fItable\fR
|
||||
The attributes table.
|
||||
See the
|
||||
-.B -a
|
||||
-.RB "(" "--attributes-table=" ")"
|
||||
+.B \-a
|
||||
+.RB "(" "\-\-attributes\-table=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_BRAILLE_DEVICE=\fIdevice\fB,\fR...
|
||||
The device to which the braille display is connected.
|
||||
See the
|
||||
-.B -d
|
||||
-.RB "(" "--braille-device=" ")"
|
||||
+.B \-d
|
||||
+.RB "(" "\-\-braille\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_BRAILLE_DRIVER=\fIdriver\fB,\fR...|\fBauto\fR
|
||||
The driver for the braille display.
|
||||
See the
|
||||
-.B -b
|
||||
-.RB "(" "--braille-driver=" ")"
|
||||
+.B \-b
|
||||
+.RB "(" "\-\-braille\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_BRAILLE_PARAMETERS=\fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the braille display driver.
|
||||
See the
|
||||
-.B -B
|
||||
-.RB "(" "--braille-parameters=" ")"
|
||||
+.B \-B
|
||||
+.RB "(" "\-\-braille\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_CONFIGURATION_FILE=\fIfile\fR
|
||||
The configuration file.
|
||||
See the
|
||||
-.B -f
|
||||
-.RB "(" "--configuration-file=" ")"
|
||||
+.B \-f
|
||||
+.RB "(" "\-\-configuration\-file=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_CONTRACTION_TABLE=\fItable\fR
|
||||
The contraction table.
|
||||
See the
|
||||
-.B -c
|
||||
-.RB "(" "--contraction-table=" ")"
|
||||
+.B \-c
|
||||
+.RB "(" "\-\-contraction\-table=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_MIDI_DEVICE=\fIdevice\fR
|
||||
The device to use for the Musical Instrument Digital Interface.
|
||||
See the
|
||||
-.B -m
|
||||
-.RB "(" "--midi-device=" ")"
|
||||
+.B \-m
|
||||
+.RB "(" "\-\-midi\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_PCM_DEVICE=\fIdevice\fR
|
||||
The device to use for digital audio.
|
||||
See the
|
||||
-.B -p
|
||||
-.RB "(" "--pcm-device=" ")"
|
||||
+.B \-p
|
||||
+.RB "(" "\-\-pcm\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_PREFERENCES_FILE=\fIfile\fR
|
||||
The preferences file.
|
||||
See the
|
||||
-.B -F
|
||||
-.RB "(" "--preferences-file=" ")"
|
||||
+.B \-F
|
||||
+.RB "(" "\-\-preferences\-file=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_RELEASE_DEVICE=on\fR|\fBoff\fR
|
||||
Release the device to which the braille display is connected
|
||||
when the current screen or window can't be read.
|
||||
See the
|
||||
-.B -r
|
||||
-.RB "(" "--release-device" ")"
|
||||
+.B \-r
|
||||
+.RB "(" "\-\-release\-device" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_SCREEN_DRIVER=\fIdriver\fR
|
||||
The screen driver.
|
||||
See the
|
||||
-.B -x
|
||||
-.RB "(" "--screen-driver=" ")"
|
||||
+.B \-x
|
||||
+.RB "(" "\-\-screen\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_SCREEN_PARAMETERS=\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the screen driver.
|
||||
See the
|
||||
-.B -X
|
||||
-.RB "(" "--screen-parameters=" ")"
|
||||
+.B \-X
|
||||
+.RB "(" "\-\-screen\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_SPEECH_DRIVER=\fIdriver\fB,\fR...|\fBauto\fR
|
||||
The driver for the speech synthesizer.
|
||||
See the
|
||||
-.B -s
|
||||
-.RB "(" "--speech-driver=" ")"
|
||||
+.B \-s
|
||||
+.RB "(" "\-\-speech\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_SPEECH_INPUT=\fIname\fR
|
||||
@@ -501,22 +519,22 @@ The file system object which gives other
|
||||
.BR brltty 's
|
||||
speech driver for text-to-speech conversion.
|
||||
See the
|
||||
-.B -i
|
||||
-.RB "(" "--speech-input=" ")"
|
||||
+.B \-i
|
||||
+.RB "(" "\-\-speech\-input=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_SPEECH_PARAMETERS=\fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the speech synthesizer driver.
|
||||
See the
|
||||
-.B -S
|
||||
-.RB "(" "--speech-parameters=" ")"
|
||||
+.B \-S
|
||||
+.RB "(" "\-\-speech\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
\fBBRLTTY_TEXT_TABLE=\fItable\fR
|
||||
The text table.
|
||||
See the
|
||||
-.B -t
|
||||
-.RB "(" "--text-table=" ")"
|
||||
+.B \-t
|
||||
+.RB "(" "\-\-text\-table=" ")"
|
||||
option for details.
|
||||
.SS "The Configuration File"
|
||||
Blank lines are ignored.
|
||||
@@ -527,118 +545,118 @@ all characters from it to the end of tha
|
||||
.PP
|
||||
The following configuration directives are supported:
|
||||
.TP
|
||||
-\fBapi-parameters \fIname\fB=\fIvalue\fB,\fR...
|
||||
+\fBapi\-parameters \fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the application programming interface.
|
||||
See the
|
||||
-.B -A
|
||||
-.RB "(" "--api-parameters=" ")"
|
||||
+.B \-A
|
||||
+.RB "(" "\-\-api\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBattributes-table \fItable\fR
|
||||
+\fBattributes\-table \fItable\fR
|
||||
The attributes table.
|
||||
See the
|
||||
-.B -a
|
||||
-.RB "(" "--attributes-table=" ")"
|
||||
+.B \-a
|
||||
+.RB "(" "\-\-attributes\-table=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBbraille-device \fIdevice\fB,\fR...
|
||||
+\fBbraille\-device \fIdevice\fB,\fR...
|
||||
The device to which the braille display is connected.
|
||||
See the
|
||||
-.B -d
|
||||
-.RB "(" "--braille-device=" ")"
|
||||
+.B \-d
|
||||
+.RB "(" "\-\-braille\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBbraille-driver \fIdriver\fB,\fR...|\fBauto\fR
|
||||
+\fBbraille\-driver \fIdriver\fB,\fR...|\fBauto\fR
|
||||
The driver for the braille display.
|
||||
See the
|
||||
-.B -b
|
||||
-.RB "(" "--braille-driver=" ")"
|
||||
+.B \-b
|
||||
+.RB "(" "\-\-braille\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBbraille-parameters \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
+\fBbraille\-parameters \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the braille display driver.
|
||||
See the
|
||||
-.B -B
|
||||
-.RB "(" "--braille-parameters=" ")"
|
||||
+.B \-B
|
||||
+.RB "(" "\-\-braille\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBcontraction-table \fItable\fR
|
||||
+\fBcontraction\-table \fItable\fR
|
||||
The contraction table.
|
||||
See the
|
||||
-.B -c
|
||||
-.RB "(" "--contraction-table=" ")"
|
||||
+.B \-c
|
||||
+.RB "(" "\-\-contraction\-table=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBmidi-device \fIdevice\fR
|
||||
+\fBmidi\-device \fIdevice\fR
|
||||
The device to use for the Musical Instrument Digital Interface.
|
||||
See the
|
||||
-.B -m
|
||||
-.RB "(" "--midi-device=" ")"
|
||||
+.B \-m
|
||||
+.RB "(" "\-\-midi\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBpcm-device \fIdevice\fR
|
||||
+\fBpcm\-device \fIdevice\fR
|
||||
The device to use for digital audio.
|
||||
See the
|
||||
-.B -p
|
||||
-.RB "(" "--pcm-device=" ")"
|
||||
+.B \-p
|
||||
+.RB "(" "\-\-pcm\-device=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
The preferences file.
|
||||
See the
|
||||
-.B -F
|
||||
-.RB "(" "--preferences-file=" ")"
|
||||
+.B \-F
|
||||
+.RB "(" "\-\-preferences\-file=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBrelease-device on\fR|\fBoff\fR
|
||||
+\fBrelease\-device on\fR|\fBoff\fR
|
||||
Release the device to which the braille display is connected
|
||||
when the current screen or window can't be read.
|
||||
See the
|
||||
-.B -r
|
||||
-.RB "(" "--release-device" ")"
|
||||
+.B \-r
|
||||
+.RB "(" "\-\-release\-device" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBscreen-driver \fIdriver\fR
|
||||
+\fBscreen\-driver \fIdriver\fR
|
||||
The screen driver.
|
||||
See the
|
||||
-.B -x
|
||||
-.RB "(" "--screen-driver=" ")"
|
||||
+.B \-x
|
||||
+.RB "(" "\-\-screen\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBscreen-parameters \fIname\fB=\fIvalue\fB,\fR...
|
||||
+\fBscreen\-parameters \fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the screen driver.
|
||||
See the
|
||||
-.B -X
|
||||
-.RB "(" "--screen-parameters=" ")"
|
||||
+.B \-X
|
||||
+.RB "(" "\-\-screen\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBspeech-driver \fIdriver\fB,\fR...|\fBauto\fR
|
||||
+\fBspeech\-driver \fIdriver\fB,\fR...|\fBauto\fR
|
||||
The driver for the speech synthesizer.
|
||||
See the
|
||||
-.B -s
|
||||
-.RB "(" "--speech-driver=" ")"
|
||||
+.B \-s
|
||||
+.RB "(" "\-\-speech\-driver=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBspeech-input \name\fR
|
||||
+\fBspeech\-input \name\fR
|
||||
The file system object which gives other applications access to
|
||||
.BR brltty 's
|
||||
-speech driver for text-to-speech conversion.
|
||||
+speech driver for text\-to\-speech conversion.
|
||||
See the
|
||||
-.B -i
|
||||
-.RB "(" "--speech-input=" ")"
|
||||
+.B \-i
|
||||
+.RB "(" "\-\-speech\-input=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBspeech-parameters \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
+\fBspeech\-parameters \fR[\fIdriver\fB:\fR]\fIname\fB=\fIvalue\fB,\fR...
|
||||
Parameters for the speech synthesizer driver.
|
||||
See the
|
||||
-.B -S
|
||||
-.RB "(" "--speech-parameters=" ")"
|
||||
+.B \-S
|
||||
+.RB "(" "\-\-speech\-parameters=" ")"
|
||||
option for details.
|
||||
.TP
|
||||
-\fBtext-table \fItable\fR
|
||||
+\fBtext\-table \fItable\fR
|
||||
The text table.
|
||||
See the
|
||||
-.B -t
|
||||
-.RB "(" "--text-table=" ")"
|
||||
+.B \-t
|
||||
+.RB "(" "\-\-text\-table=" ")"
|
||||
option for details.
|
||||
.SS "Driver Specification"
|
||||
A braille display or speech synthesizer driver
|
||||
|
|
@ -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 */
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Programs/Makefile.in b/Programs/Makefile.in
|
||||
index 33d8c8a..622f206 100644
|
||||
--- a/Programs/Makefile.in
|
||||
+++ b/Programs/Makefile.in
|
||||
@@ -475,7 +475,7 @@ BRLTTY_OBJECTS = main.$O $(CORE_OBJECTS)
|
||||
BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(ICU_LIBRARIES) $(LDLIBS)
|
||||
|
||||
brltty$X: $(BRLTTY_OBJECTS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES)
|
||||
+ $(CC) $(LDFLAGS) -pie -Wl,-z,relro,-z,now -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES)
|
||||
|
||||
main.$O:
|
||||
$(CC) $(CFLAGS) -c $(SRC_DIR)/main.c
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c
|
||||
index 26ca705..ccabdcd 100644
|
||||
--- a/Drivers/Braille/XWindow/braille.c
|
||||
+++ b/Drivers/Braille/XWindow/braille.c
|
||||
@@ -211,7 +211,7 @@ typedef enum {
|
||||
static int cols,lines;
|
||||
static int input;
|
||||
static char *model = "simple";
|
||||
-static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1";
|
||||
+static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-*-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1";
|
||||
static int xtArgc = 1;
|
||||
static char *xtDefArgv[]= { "brltty", NULL };
|
||||
static char **xtArgv = xtDefArgv;
|
||||
@@ -944,7 +944,6 @@ static int generateToplevel(void)
|
||||
#ifdef USE_XAW
|
||||
XtNshowGrip,False,
|
||||
XtNinternational, True,
|
||||
- XNFontSet, fontset,
|
||||
#else /* USE_XAW */
|
||||
XmNpaneMaximum,20,
|
||||
XmNpaneMinimum,20,
|
||||
@@ -952,10 +951,11 @@ static int generateToplevel(void)
|
||||
#endif /* USE_XAW */
|
||||
#ifdef USE_XAW
|
||||
XtNlabel, disp,
|
||||
+ fontset ? XNFontSet : NULL, fontset, NULL
|
||||
#else /* USE_XAW */
|
||||
- XmNlabelString, display_cs,
|
||||
+ XmNlabelString, display_cs, NULL
|
||||
#endif /* USE_XAW */
|
||||
- NULL);
|
||||
+ );
|
||||
|
||||
#ifdef USE_XAW
|
||||
if (fontset) {
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/Bindings/Java/Native.java b/Bindings/Java/Native.java
|
||||
index 8a3b003..c404bf2 100644
|
||||
--- a/Bindings/Java/Native.java
|
||||
+++ b/Bindings/Java/Native.java
|
||||
@@ -21,7 +21,15 @@ package org.a11y.BrlAPI;
|
||||
|
||||
public class Native {
|
||||
static {
|
||||
- System.loadLibrary("brlapi_java");
|
||||
+ try {
|
||||
+ System.load( "/usr/lib64/brltty/libbrlapi_java.so" );
|
||||
+ } catch( UnsatisfiedLinkError e ) {
|
||||
+ try {
|
||||
+ System.load( "/usr/lib/brltty/libbrlapi_java.so" );
|
||||
+ } catch( UnsatisfiedLinkError f ) {
|
||||
+ throw new UnsatisfiedLinkError("brlapi_java library load failed");
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
protected long handle;
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
[Unit]
|
||||
Description=Braille display driver for Linux/Unix
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/bin/brltty
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -0,0 +1,677 @@
|
|||
%define pkg_version 4.5
|
||||
%define api_version 0.6.0
|
||||
|
||||
%global with_python3 1
|
||||
|
||||
%if 0%{?rhel}
|
||||
%global with_python3 0
|
||||
%endif
|
||||
|
||||
%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
|
||||
%{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
|
||||
|
||||
# with speech dispatcher iff on Fedora:
|
||||
%define with_speech_dispatcher 0%{?fedora}
|
||||
|
||||
%ifarch %{ocaml_arches}
|
||||
%global with_ocaml 1
|
||||
%endif
|
||||
|
||||
Name: brltty
|
||||
Version: %{pkg_version}
|
||||
Release: 16%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
URL: http://mielke.cc/brltty/
|
||||
Source0: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
|
||||
Source1: brltty.service
|
||||
# patch sent upstream
|
||||
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
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
# work around a bug in the install process:
|
||||
Requires(post): coreutils
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description
|
||||
BRLTTY is a background process (daemon) which provides
|
||||
access to the Linux/Unix console (when in text mode)
|
||||
for a blind person using a refreshable braille display.
|
||||
It drives the braille display and provides complete
|
||||
screen review functionality.
|
||||
%if %{with_speech_dispatcher}
|
||||
BRLTTY can also work with speech synthesizers; if you want to use it with
|
||||
Speech Dispatcher, please install also package %{name}-speech-dispatcher.
|
||||
|
||||
%package speech-dispatcher
|
||||
Summary: Speech Dispatcher driver for BRLTTY
|
||||
Group: System Environment/Daemons
|
||||
License: GPLv2+
|
||||
BuildRequires: speech-dispatcher-devel
|
||||
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
|
||||
%description speech-dispatcher
|
||||
This package provides the Speech Dispatcher driver for BRLTTY.
|
||||
%endif
|
||||
|
||||
%package docs
|
||||
Summary: Documentation for BRLTTY
|
||||
Group: System Environment/Daemons
|
||||
License: GPLv2+
|
||||
Requires: %{name} = %{pkg_version}-%{release}
|
||||
BuildArch: noarch
|
||||
%description docs
|
||||
This package provides the documentation for BRLTTY.
|
||||
|
||||
%package xw
|
||||
Summary: XWindow driver for BRLTTY
|
||||
Group: System Environment/Daemons
|
||||
License: GPLv2+
|
||||
BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
|
||||
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
|
||||
Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts
|
||||
%description xw
|
||||
This package provides the XWindow driver for BRLTTY.
|
||||
|
||||
%package at-spi
|
||||
Summary: AtSpi driver for BRLTTY
|
||||
Group: System Environment/Daemons
|
||||
# The data files are licensed under LGPLv2+, see the README file.
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
|
||||
%description at-spi
|
||||
This package provides the AtSpi driver for BRLTTY.
|
||||
|
||||
%package at-spi2
|
||||
Summary: AtSpi2 driver for BRLTTY
|
||||
Group: System Environment/Daemons
|
||||
# The data files are licensed under LGPLv2+, see the README file.
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
|
||||
%description at-spi2
|
||||
This package provides the AtSpi2 driver for BRLTTY.
|
||||
|
||||
%package -n brlapi
|
||||
Version: %{api_version}
|
||||
Group: Applications/System
|
||||
License: LGPLv2+
|
||||
Summary: Application Programming Interface for BRLTTY
|
||||
Requires: %{name} = %{pkg_version}-%{release}
|
||||
%description -n brlapi
|
||||
This package provides the run-time support for the Application
|
||||
Programming Interface to BRLTTY.
|
||||
|
||||
Install this package if you have an application which directly accesses
|
||||
a refreshable braille display.
|
||||
|
||||
%package -n brlapi-devel
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
Summary: Headers, static archive, and documentation for BrlAPI
|
||||
|
||||
%description -n brlapi-devel
|
||||
This package provides the header files, static archive, shared object
|
||||
linker reference, and reference documentation for BrlAPI (the
|
||||
Application Programming Interface to BRLTTY). It enables the
|
||||
implementation of applications which take direct advantage of a
|
||||
refreshable braille display in order to present information in ways
|
||||
which are more appropriate for blind users and/or to provide user
|
||||
interfaces which are more specifically attuned to their needs.
|
||||
|
||||
Install this package if you are developing or maintaining an application
|
||||
which directly accesses a refreshable braille display.
|
||||
|
||||
%package -n tcl-brlapi
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
BuildRequires: tcl-devel
|
||||
Summary: Tcl binding for BrlAPI
|
||||
%description -n tcl-brlapi
|
||||
This package provides the Tcl binding for BrlAPI.
|
||||
|
||||
%package -n python-brlapi
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
BuildRequires: Cython
|
||||
BuildRequires: python2-devel
|
||||
Summary: Python binding for BrlAPI
|
||||
%description -n python-brlapi
|
||||
This package provides the Python binding for BrlAPI.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-brlapi
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
BuildRequires: Cython
|
||||
BuildRequires: python3-devel
|
||||
Summary: Python 3 binding for BrlAPI
|
||||
%description -n python3-brlapi
|
||||
This package provides the Python 3 binding for BrlAPI.
|
||||
%endif
|
||||
|
||||
%package -n brlapi-java
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: java-devel
|
||||
Summary: Java binding for BrlAPI
|
||||
%description -n brlapi-java
|
||||
This package provides the Java binding for BrlAPI.
|
||||
|
||||
%if 0%{?with_ocaml}
|
||||
%package -n ocaml-brlapi
|
||||
Version: %{api_version}
|
||||
Group: Development/System
|
||||
License: LGPLv2+
|
||||
Requires: brlapi%{?_isa} = %{api_version}-%{release}
|
||||
BuildRequires: ocaml
|
||||
Summary: OCaml binding for BrlAPI
|
||||
%description -n ocaml-brlapi
|
||||
This package provides the OCaml binding for BrlAPI.
|
||||
%endif
|
||||
|
||||
|
||||
%define version %{pkg_version}
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch3 -p1 -b .man-fix
|
||||
%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
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Add the openjdk include directories to CPPFLAGS
|
||||
for i in -I/usr/lib/jvm/java/include{,/linux}; do
|
||||
java_inc="$java_inc $i"
|
||||
done
|
||||
export CPPFLAGS="$java_inc"
|
||||
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
# there is no curses packages in BuildRequires, so the package builds
|
||||
# without them in mock; let's express this decision explicitly
|
||||
configure_opts=" \
|
||||
--disable-stripping \
|
||||
--without-curses \
|
||||
%if ! 0%{?with_ocaml}
|
||||
--disable-ocaml-bindings \
|
||||
%endif
|
||||
%if %{with_speech_dispatcher}
|
||||
--with-speechd=%{_prefix} \
|
||||
%endif
|
||||
--with-install-root=$RPM_BUILD_ROOT
|
||||
JAVA_JAR_DIR=%{_jnidir} \
|
||||
JAVA_JNI_DIR=%{_libdir}/brltty \
|
||||
JAVA_JNI=yes"
|
||||
|
||||
# First build everything with Python 2 support
|
||||
%configure $configure_opts PYTHON=%{__python2}
|
||||
# Parallel build seems broken, thus disabling it
|
||||
make
|
||||
|
||||
%if 0%{?with_python3}
|
||||
# ... and then do it again for the Python 3 module
|
||||
pushd %{py3dir}
|
||||
%configure $configure_opts PYTHON=%{__python3}
|
||||
# Parallel build seems broken, thus disabling it
|
||||
make
|
||||
popd
|
||||
%endif
|
||||
|
||||
find . \( -path ./doc -o -path ./Documents \) -prune -o \
|
||||
\( -name 'README*' -o -name '*.txt' -o -name '*.html' -o \
|
||||
-name '*.sgml' -o -name '*.patch' -o \
|
||||
\( -path './Bootdisks/*' -type f -perm /ugo=x \) \) -print |
|
||||
while read file; do
|
||||
mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
|
||||
done
|
||||
|
||||
find . -name '*.sgml' |
|
||||
while read file; do
|
||||
iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
|
||||
done
|
||||
find . -name '*.txt' |
|
||||
while read file; do
|
||||
iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
|
||||
done
|
||||
find . -name 'README*' |
|
||||
while read file; do
|
||||
iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
|
||||
done
|
||||
|
||||
%install
|
||||
# Python 2
|
||||
make install JAVA_JAR_DIR=%{_jnidir} \
|
||||
JAVA_JNI_DIR=%{_libdir}/brltty \
|
||||
JAVA_JNI=yes
|
||||
|
||||
%if 0%{?with_python3}
|
||||
# Python 3
|
||||
pushd %{py3dir}
|
||||
make install JAVA_JAR_DIR=%{_jnidir} \
|
||||
JAVA_JNI_DIR=%{_libdir}/brltty \
|
||||
JAVA_JNI=yes
|
||||
popd
|
||||
%endif
|
||||
|
||||
install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
|
||||
install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
|
||||
echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
|
||||
|
||||
install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/brltty.service
|
||||
|
||||
# clean up the manuals:
|
||||
rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
|
||||
mv Documents/BrlAPIref/{html,BrlAPIref}
|
||||
|
||||
# Don't want static lib
|
||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
|
||||
|
||||
# make brltty-config executable
|
||||
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config
|
||||
|
||||
%post
|
||||
%systemd_post brltty.service
|
||||
|
||||
%preun
|
||||
%systemd_preun brltty.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart brltty.service
|
||||
|
||||
%post -n brlapi -p /sbin/ldconfig
|
||||
%postun -n brlapi -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%config(noreplace) %{_sysconfdir}/brltty.conf
|
||||
%{_sysconfdir}/brltty/
|
||||
%{_unitdir}/brltty.service
|
||||
%{_bindir}/brltty
|
||||
%{_bindir}/brltty-*
|
||||
%{_libdir}/brltty/
|
||||
%exclude %{_libdir}/brltty/libbrlttybba.so
|
||||
%exclude %{_libdir}/brltty/libbrlttybxw.so
|
||||
%exclude %{_libdir}/brltty/libbrlapi_java.so
|
||||
%if %{with_speech_dispatcher}
|
||||
%exclude %{_libdir}/brltty/libbrlttyssd.so
|
||||
%endif
|
||||
%exclude %{_libdir}/brltty/libbrlttyxas.so
|
||||
%exclude %{_libdir}/brltty/libbrlttyxa2.so
|
||||
%doc LICENSE-GPL LICENSE-LGPL
|
||||
%doc %{_mandir}/man[15]/brltty.*
|
||||
|
||||
%if %{with_speech_dispatcher}
|
||||
%files speech-dispatcher
|
||||
%doc Drivers/Speech/SpeechDispatcher/README
|
||||
%{_libdir}/brltty/libbrlttyssd.so
|
||||
%endif
|
||||
|
||||
%files docs
|
||||
%doc Documents/ChangeLog Documents/TODO
|
||||
%doc Documents/Manual-BRLTTY/
|
||||
%doc doc/*
|
||||
|
||||
%files xw
|
||||
%doc Drivers/Braille/XWindow/README
|
||||
%{_libdir}/brltty/libbrlttybxw.so
|
||||
|
||||
%files at-spi
|
||||
%{_libdir}/brltty/libbrlttyxas.so
|
||||
|
||||
%files at-spi2
|
||||
%{_libdir}/brltty/libbrlttyxa2.so
|
||||
|
||||
%files -n brlapi
|
||||
%{_bindir}/vstp
|
||||
%{_bindir}/xbrlapi
|
||||
%{_libdir}/brltty/libbrlttybba.so
|
||||
%{_libdir}/libbrlapi.so.*
|
||||
%doc Drivers/Braille/XWindow/README
|
||||
%doc Documents/Manual-BrlAPI/
|
||||
%doc %{_mandir}/man1/xbrlapi.*
|
||||
%doc %{_mandir}/man1/vstp.*
|
||||
|
||||
%files -n brlapi-devel
|
||||
%{_libdir}/libbrlapi.so
|
||||
%{_includedir}/brltty
|
||||
%{_includedir}/brlapi*.h
|
||||
%doc %{_mandir}/man3/brlapi_*.3*
|
||||
%doc Documents/BrlAPIref/BrlAPIref/
|
||||
|
||||
%files -n tcl-brlapi
|
||||
%{tcl_sitearch}/brlapi-%{api_version}
|
||||
|
||||
%files -n python-brlapi
|
||||
%{python_sitearch}/brlapi.so
|
||||
%{python_sitearch}/Brlapi-%{api_version}-*.egg-info
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-brlapi
|
||||
%{python3_sitearch}/brlapi.cpython-*.so
|
||||
%{python3_sitearch}/Brlapi-%{api_version}-*.egg-info
|
||||
%endif
|
||||
|
||||
%files -n brlapi-java
|
||||
%{_libdir}/brltty/libbrlapi_java.so
|
||||
%{_jnidir}/brlapi.jar
|
||||
|
||||
%if 0%{?with_ocaml}
|
||||
%files -n ocaml-brlapi
|
||||
%{_libdir}/ocaml/brlapi/
|
||||
%{_libdir}/ocaml/stublibs/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 10 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-16
|
||||
- Rebuilt with ocaml-4.05.0
|
||||
Resolves: rhbz#1434818
|
||||
|
||||
* 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
|
||||
- Fixed multilib
|
||||
Related: rhbz#1324850
|
||||
|
||||
* Mon Apr 11 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-12
|
||||
- Improved fix for Braille characters not displaying in the XW driver window
|
||||
Related: rhbz#1324669
|
||||
|
||||
* Thu Apr 7 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-11
|
||||
- Fixed Braille characters not displaying in the XW driver window
|
||||
Resolves: rhbz#1324669
|
||||
- Added AT-SPI2 driver
|
||||
Resolves: rhbz#1324672
|
||||
- Fixed requirements
|
||||
Resolves: rhbz#1324850
|
||||
|
||||
* Tue Apr 5 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-10
|
||||
- Hardened build
|
||||
Resolves: rhbz#1092547
|
||||
- Fixed Braille display emulator to start
|
||||
Resolves: rhbz#1304725
|
||||
|
||||
* Fri Oct 24 2014 Richard W.M. Jones <rjones@redhat.com> - 4.5-9
|
||||
- Rebuild for OCaml 4.01.0
|
||||
resolves: rhbz#1155561
|
||||
|
||||
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 4.5-8
|
||||
- Mass rebuild 2014-01-24
|
||||
|
||||
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 4.5-7
|
||||
- Mass rebuild 2013-12-27
|
||||
|
||||
* Mon Jul 15 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-6
|
||||
- Updated man page
|
||||
|
||||
* Fri May 10 2013 Jon Ciesla <limburgher@gmail.com> - 4.5-5
|
||||
- Add systemd unit file, BZ 916628.
|
||||
- Drop spurious post scripts.
|
||||
- Move eveything but man pages and license files top -docs.
|
||||
|
||||
* Thu May 9 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5-4
|
||||
- Conditionally build python3
|
||||
|
||||
* Tue Apr 30 2013 Jon Ciesla <limburgher@gmail.com> - 4.5-3
|
||||
- Add bluetooth support, BZ 916628.
|
||||
|
||||
* Thu Apr 04 2013 Kalev Lember <kalevlember@gmail.com> - 4.5-2
|
||||
- Don't install the library in /lib now that we have UsrMove
|
||||
|
||||
* Thu Apr 04 2013 Kalev Lember <kalevlember@gmail.com> - 4.5-1
|
||||
- Update to 4.5
|
||||
- Add Python 3 support (python3-brlapi)
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Tue Jan 8 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 4.3-12
|
||||
- Build with -fno-strict-aliasing
|
||||
|
||||
* Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 4.3-11
|
||||
- revbump after jnidir change
|
||||
|
||||
* Wed Dec 12 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 4.3-10
|
||||
- Fixed directories, install to /usr prefix
|
||||
|
||||
* Wed Dec 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 4.3-9
|
||||
- Fix up java subpackage installation directories
|
||||
- Fix java JNI loading code
|
||||
|
||||
* Wed Oct 17 2012 Jon Ciesla <limburgher@gmail.com> - 4.3-8
|
||||
- Bump and rebuild for new ocaml.
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jun 08 2012 Jon Ciesla <limburgher@gmail.com> - 4.3-6
|
||||
- Bump and rebuild for ocaml 4.00.0.
|
||||
|
||||
* Fri Mar 23 2012 Dan Horák <dan[at]danny.cz> - 4.3-5
|
||||
- conditionalize ocaml support
|
||||
- fix build on 64-bit arches
|
||||
|
||||
* Mon Feb 06 2012 Jon Ciesla <limburgher@gmail.com> - 4.3-4
|
||||
- Added ocaml subpackage, BZ 702724.
|
||||
|
||||
* Fri Feb 03 2012 Jon Ciesla <limburgher@gmail.com> - 4.3-3
|
||||
- Fixed libbrlapi.so symlink, BZ 558132.
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Oct 18 2011 Jon Ciesla <limb@jcomserv.net> - 4.3-1
|
||||
- New upstream.
|
||||
- S_ISCHR patch upstreamed.
|
||||
- parallel patch updated.
|
||||
- Cleaned up some file encodings.
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Fri May 21 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2-2
|
||||
- rework parallel patch slightly and reapply
|
||||
|
||||
* Fri May 21 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2-1
|
||||
- update to 4.2
|
||||
- drop static lib (bz 556041)
|
||||
- fix undefined S_ISCHR call
|
||||
|
||||
* Wed Jan 20 2010 Stepan Kasal <skasal@redhat.com> - 4.1-5
|
||||
- requires(post): coreutils to work around an installator bug
|
||||
- Resolves: #540437
|
||||
|
||||
* Wed Jan 13 2010 Stepan Kasal <skasal@redhat.com> - 4.1-4
|
||||
- limit building against speech-dispatcher to Fedora
|
||||
- Resolves: rhbz#553795
|
||||
|
||||
* Sun Nov 1 2009 Stepan Kasal <skasal@redhat.com> - 4.1-3
|
||||
- build the TTY driver (it was disabled since it first appered in 3.7.2-1)
|
||||
- build with speech-dispatcher, packed into a separate sub-package
|
||||
|
||||
* Fri Oct 30 2009 Stepan Kasal <skasal@redhat.com> - 4.1-2
|
||||
- move data-directory back to default: /etc/brltty
|
||||
- move brltty to /bin and /lib, so that it can be used to repair the system
|
||||
without /usr mounted (#276181)
|
||||
- move vstp and libbrlttybba.so to brlapi
|
||||
- brltty no longer requires brlapi
|
||||
- brlapi now requires brltty from the same build
|
||||
|
||||
* Wed Oct 28 2009 Stepan Kasal <skasal@redhat.com> - 4.1-1
|
||||
- new upstream version
|
||||
- use --disable-stripping instead of make variable override
|
||||
- install the default brltty-pm.conf to docdir only (#526168)
|
||||
- remove the duplicate copies of rhmkboot and rhmkroot from docdir
|
||||
- patch configure so that the dirs in summary are not garbled:
|
||||
brltty-autoconf-quote.patch
|
||||
- move data-directory to ${datadir}/brltty
|
||||
|
||||
* Tue Oct 20 2009 Stepan Kasal <skasal@redhat.com> - 4.0-2
|
||||
- escape rpm macros in the rpm change log
|
||||
- add requires to bind subpackages from one build together
|
||||
|
||||
* Wed Oct 7 2009 Stepan Kasal <skasal@redhat.com> - 4.0-1
|
||||
- new upstream version
|
||||
- drop upstreamed patches; ./autogen not needed anymore
|
||||
- pack the xbrlapi server; move its man page to brlapi package
|
||||
- add man-page for brltty.conf (#526168)
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Tue May 12 2009 Stepan Kasal <skasal@redhat.com> - 3.10-5
|
||||
- rebuild after java-1.5.0-gcj rebuild
|
||||
|
||||
* Thu Apr 30 2009 Stepan Kasal <skasal@redhat.com> - 3.10-4
|
||||
- own the tcl subdirectory (#474032)
|
||||
- set CPPFLAGS to java include dirs, so that the java bindings build with
|
||||
any java implementation (#498964)
|
||||
- add --without-curses; there is no curses package BuildRequired anyway
|
||||
|
||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 3.10-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Sat Sep 13 2008 Stepan Kasal <skasal@redhat.com> - 3.10-1
|
||||
- new upstream release
|
||||
- drop brltty-3.9-java-svn.patch, brltty-3.9-tcl85path.patch,
|
||||
and brltty-3.9-pyxfix.patch, they are upstream
|
||||
- fix BuildRoot
|
||||
- fix many sub-packages' Requires on brlapi
|
||||
|
||||
* Wed Sep 10 2008 Stepan Kasal <skasal@redhat.com> - 3.9-3
|
||||
- add brltty-3.9-autoconf.patch to fix to build with Autoconf 2.62
|
||||
- add brltty-3.9-parallel.patch to fix race condition with parallel make
|
||||
- add brltty-3.9-pyxfix.patch to fix build with current pyrex
|
||||
- Summary lines shall not end with a dot
|
||||
|
||||
* Thu Feb 28 2008 Tomas Janousek <tjanouse@redhat.com> - 3.9-2.2
|
||||
- glibc build fixes
|
||||
- applied java reorganisations from svn
|
||||
|
||||
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.9-2.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Wed Jan 09 2008 Tomas Janousek <tjanouse@redhat.com> - 3.9-1.1
|
||||
- specfile update to comply with tcl packaging guidelines
|
||||
|
||||
* Mon Jan 07 2008 Tomas Janousek <tjanouse@redhat.com> - 3.9-1
|
||||
- update to latest upstream (3.9)
|
||||
|
||||
* Tue Sep 18 2007 Tomas Janousek <tjanouse@redhat.com> - 3.8-2.svn3231
|
||||
- update to r3231 from svn
|
||||
- added java binding subpackage
|
||||
|
||||
* Wed Aug 29 2007 Tomas Janousek <tjanouse@redhat.com> - 3.8-2.svn3231
|
||||
- update to r3231 from svn
|
||||
|
||||
* Tue Aug 21 2007 Tomas Janousek <tjanouse@redhat.com> - 3.8-1
|
||||
- update to latest upstream
|
||||
- added the at-spi driver, tcl and python bindings
|
||||
- fixed the license tags
|
||||
|
||||
* Mon Mar 05 2007 Tomas Janousek <tjanouse@redhat.com> - 3.7.2-3
|
||||
- added the XWindow driver
|
||||
- build fix for newer byacc
|
||||
|
||||
* Tue Jan 30 2007 Tomas Janousek <tjanouse@redhat.com> - 3.7.2-2.1
|
||||
- quiet postinstall scriptlet, really fixes #224570
|
||||
|
||||
* Tue Jan 30 2007 Tomas Janousek <tjanouse@redhat.com> - 3.7.2-2
|
||||
- failsafe postinstall script, fixes #224570
|
||||
- makefile fix - debuginfo extraction now works
|
||||
|
||||
* Thu Jan 25 2007 Tomas Janousek <tjanouse@redhat.com> - 3.7.2-1.1
|
||||
- fix building with newer kernel-headers (#224149)
|
||||
|
||||
* Wed Jul 12 2006 Petr Rockai <prockai@redhat.com> - 3.7.2-1
|
||||
- upgrade to latest upstream version
|
||||
- split off brlapi and brlapi-devel packages
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.2-12.1
|
||||
- rebuild
|
||||
|
||||
* Sun Jul 02 2006 Florian La Roche <laroche@redhat.com>
|
||||
- for the post script require coreutils
|
||||
|
||||
* Mon Jun 05 2006 Jesse Keating <jkeating@redhat.com> - 3.2-11
|
||||
- Added byacc BuildRequires, removed prereq, coreutils is always there
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.2-10.2.1
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.2-10.2
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Wed Mar 16 2005 Bill Nottingham <notting@redhat.com> 3.2-10
|
||||
- rebuild
|
||||
|
||||
* Fri Nov 26 2004 Florian La Roche <laroche@redhat.com>
|
||||
- add a %%clean into .spec
|
||||
|
||||
* Thu Oct 14 2004 Adrian Havill <havill@redhat.com> 3.2-5
|
||||
- chmod a-x for conf file (#116244)
|
||||
|
||||
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Sep 30 2003 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
- prereq coreutils for mknod/chown/chmod
|
||||
|
||||
* Mon Jul 07 2003 Adrian Havill <havill@redhat.com> 3.2-2
|
||||
- changed spec "Copyright" to "License"
|
||||
- use %%configure macro, %%{_libdir} for non-ia32 archs
|
||||
- removed unnecessary set and unset, assumed/default spec headers
|
||||
- fixed unpackaged man page, duplicate /bin and /lib entries
|
||||
- use plain install vs scripts for non-i386 buildsys
|
||||
Loading…
Reference in New Issue