[arch-commits] Commit in brltty/trunk (PKGBUILD brltty.service)

[David Runge]

    Date: Thursday, October 15, 2020 @ 10:28:24
  Author: dvzrv
Revision: 398375

upgpkg: brltty 6.1-1: Upgrade to 6.1.

Add all direct package dependencies to depends.
Move bluez-libs and polkit to depends, because they are required at runtime.
Add various X11 related libraries to optdepends for X11 support.
Add libbrlapi.so to provides.
Remove custom systemd service as upstream provides systemd/udev integration.
Add espeak and festival based drivers to configure.
Add all available sodeps in package() and the respective packages to makedepends.
Install upstream's systemd/udev integration.
Add contributor info.

Modified:
  brltty/trunk/PKGBUILD
Deleted:
  brltty/trunk/brltty.service

----------------+
 PKGBUILD       |   42 +++++++++++++++++++++++++++++-------------
 brltty.service |   12 ------------
 2 files changed, 29 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-15 09:11:13 UTC (rev 398374)
+++ PKGBUILD	2020-10-15 10:28:24 UTC (rev 398375)
@@ -1,40 +1,52 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Alexander Epaneshnikov <aarnaarn2 at gmail.com>
 # Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=brltty
-pkgver=6.0
-pkgrel=11
+pkgver=6.1
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('x86_64')
 url="https://brltty.app"
 license=('LGPL2.1')
-depends=('gpm' 'icu' 'liblouis' 'tcl')
-makedepends=('at-spi2-core' 'bluez-libs' 'cython' 'espeak' 'java-environment'
-'libxaw' 'ocaml-ctypes' 'ocaml-findlib' 'polkit' 'speech-dispatcher')
+depends=('bluez-libs' 'expat' 'gcc-libs' 'glibc' 'liblouis' 'libspeechd' 'pcre'
+'polkit' 'tcl')
+makedepends=('alsa-lib' 'at-spi2-atk' 'at-spi2-core' 'atk' 'cython' 'dbus'
+'espeak' 'festival' 'glib2' 'gpm' 'icu' 'java-environment' 'libxaw' 'ncurses'
+'ocaml-ctypes' 'ocaml-findlib' 'speech-dispatcher' 'systemd-libs')
 optdepends=('at-spi2-core: X11/GNOME Apps accessibility'
             'atk: ATK bridge for X11/GNOME accessibility'
-            'bluez-libs: bluetooth support'
             'espeak: espeak driver'
             'java-runtime: Java support'
             'libxaw: X11 support'
+            'libxt: X11 support'
+            'libx11: for xbrlapi'
+            'libxfixes: for xbrlapi'
+            'libxtst: for xbrlapi'
             'ocaml: OCaml support'
-            'polkit: PolicyKit support'
             'python: Python support'
             'speech-dispatcher: speech-dispatcher driver')
+provides=('libbrlapi.so')
 backup=(etc/brltty.conf)
 options=('!emptydirs')
 install=brltty.install
 source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.service"
         "${pkgname}.tmpfiles"
         "${pkgname}.sysusers")
-sha512sums=('b114cb55916109ddeb472df1e5d206c27e93cab64c4b51f82cf0887f63f6fa90064230f769302b1ba9ba7259079026a83e7b7ed46ba20a40676a487df317902e'
-            '5da854db7612b7fcc1f1a8da0825e19509158041ceedbefc7649d220fd94a17c11044985abfc435b65a8b795c19dd2d16ff05f59641e57805f710b76570a5af4'
+sha512sums=('a27236fc6211dfe1b9867871eca475a5c82471ea10c1bc3006916f9420764c6f91d5f2cfc5c44c6c76f1120f3ef21c821ca9a804d81ebcad6ecad886c2ef84ad'
             'a530fe66983768f9dc544af01c586abc101dfa2ed76885b4f1fd78c483b59e8445f2c0dbbfb865dd1cf2874342c346bd35ce978ab246e9cdd31d2d489a14e770'
             'cc2e2d5f33d4e11d6ff828aefc0773ccdc02127ce2f00649c1e3f8d4b39b90789f4a0e41385b344f850c38bd4a1df36d3d9d413a59144d431defdd343633f800')
+b2sums=('ed3744173f59c85ac9e2bdef45e65dc98d178e51332f2fc0903763067c0f9a6a806c60989a36c825baa3dbdd1ed0629395318c22134413aa27791e17b3398413'
+        '59f50e367d2e6c6704902ebbd254232aa17c741c9a43ba27d0ebaa5fd4a86f62bc8bdd08e8e4562437dea0efa9d49845e40c022b8c4d7110675d81bf63ac4df4'
+        'e6b7453360ef92254ff1049b387c9ee45f3be0e0259c9c3670154938f61ec4142b2de330401d09e1290ed9ffe8e390ede3472dab0e2f4c69b497f9ac19795aad')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  ./autogen
+}
+
 build() {
   cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
@@ -43,16 +55,20 @@
               --mandir=/usr/share/man \
               --with-tables-directory=/usr/share/brltty \
               --with-screen-driver=lx \
+              --with-speech-driver=es,fv \
               --enable-gpm
   make -j1
 }
 
 package() {
+  depends+=('libasound.so' 'libdbus-1.so' 'libgio-2.0.so' 'libglib-2.0.so'
+  'libgobject-2.0.so' 'libicuuc.so' 'libgpm.so' 'libncursesw.so'
+  'libsystemd.so')
   cd "${pkgname}-${pkgver}"
   make INSTALL_ROOT="${pkgdir}" install
+  make INSTALL_ROOT="${pkgdir}" install -C Autostart/Systemd
+  make INSTALL_ROOT="${pkgdir}" install -C Autostart/Udev
   install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
-  install -vDm 644 "../${pkgname}.service" \
-    -t "${pkgdir}/usr/lib/systemd/system/"
   install -vDm 644 "../${pkgname}.sysusers" \
     "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -vDm 644 "../${pkgname}.tmpfiles" \

Deleted: brltty.service
===================================================================
--- brltty.service	2020-10-15 09:11:13 UTC (rev 398374)
+++ brltty.service	2020-10-15 10:28:24 UTC (rev 398375)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Braille Console Driver
-DefaultDependencies=no
-Before=sysinit.target
-
-[Service]
-ExecStart=/usr/bin/brltty --pid-file=/run/brltty.pid
-Type=forking
-PIDFile=/run/brltty.pid
-
-[Install]
-WantedBy=sysinit.target