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

[David Runge]

    Date: Sunday, June 26, 2022 @ 21:37:46
  Author: dvzrv
Revision: 449449

upgpkg: brltty 6.5-1: Upgrade to 6.5.

Remove unnecessary quotes and curly braces.
Split out generic udev rules to separate package, as they cause many USB devices to trigger brltty.
Build only with one job, as project can not be built using many...

Modified:
  brltty/trunk/PKGBUILD

----------+
 PKGBUILD |  131 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 74 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-26 20:11:51 UTC (rev 449448)
+++ PKGBUILD	2022-06-26 21:37:46 UTC (rev 449449)
@@ -4,54 +4,36 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
-pkgname=brltty
-pkgver=6.4
-pkgrel=10
+pkgbase=brltty
+pkgname=(brltty brltty-udev-generic)
+pkgver=6.5
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
 arch=(x86_64)
 url="https://brltty.app"
 license=(LGPL2.1)
-depends=(bluez-libs gcc-libs glibc liblouis libspeechd pcre2 polkit)
-makedepends=(alsa-lib at-spi2-atk at-spi2-core atk cython dbus dracut espeak-ng
-expat festival glib2 gpm icu java-environment libxaw ncurses ocaml-ctypes
-ocaml-findlib speech-dispatcher strip-nondeterminism systemd-libs tcl)
-optdepends=(
-  'at-spi2-core: X11/GNOME Apps accessibility'
-  'atk: ATK bridge for X11/GNOME accessibility'
-  'espeak-ng: espeak-ng driver'
-  'java-runtime: Java support'
-  'libxaw: X11 support'
-  'libxt: X11 support'
-  'libx11: for xbrlapi'
-  'libxfixes: for xbrlapi'
-  'libxtst: for xbrlapi'
-  'ocaml: OCaml support'
-  'python: Python support'
-  'speech-dispatcher: speech-dispatcher driver'
-  'tcl: tcl support'
-)
-provides=(libbrlapi.so)
-backup=(
-  etc/brltty.conf
-  etc/X11/xinit/xinitrc.d/90xbrlapi
-)
+makedepends=(alsa-lib at-spi2-atk at-spi2-core atk bluez-libs cython dbus
+dracut espeak-ng expat festival gcc-libs glibc glib2 gpm icu java-environment
+liblouis libspeechd libxaw ncurses ocaml-ctypes ocaml-findlib pcre2
+polkit python-setuptools speech-dispatcher strip-nondeterminism systemd-libs
+tcl)
 options=(debug !emptydirs)
-install=brltty.install
-source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}-6.2-systemd_sysusers_groups.patch"
-        "${pkgname}-6.4-x11_autostart.patch"
+source=(
+  https://brltty.app/archive/$pkgname-$pkgver.tar.bz2
+  $pkgname-6.2-systemd_sysusers_groups.patch
+  $pkgname-6.4-x11_autostart.patch
 )
-sha512sums=('58394c18d56a2a93a44be1c5dcfd02613581820ea2d2dbd945372ea11e066a18a75832ea04f09cf7f411e6dd1cd4ec78574f317dafcbc5c431dcf0db21b93690'
+sha512sums=('7aef484f8f719fe183ea4d83b75962ff1e1fb0002d38ee89bd41808c3cae768cbd65c63cbdcb9a27beecaddc442fb65d8fb9219e48c87a1a02dda4ecc55cc24f'
             '32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02'
             '4871512affefbc178f4204a1b285fc2b5a05ea2d181163195d695b760e9729b3d2d00b5f052abd71379df609c3859d7cbd64128bdefd16e898bbc4368500a9a0')
-b2sums=('2c31b8282f0bc4730e406772c8b5aa72b1650e3290cfe967ec668394627440f84afe936bfbdbdab9ee0e7ba93ef466950295dbd7d979b639605fe619b5c170bd'
+b2sums=('9d431c033d0963f6afe59477d2d109029c1bededf4ea333a3347ff8c4c17073af3439a827ff4db44dce08dd2245e1bc57cc2fe443bf44df6225f75ffab2fa244'
         '036e36d558594bb06af1eb41ff5fc9ae52ccf4bad54556c3f4f81a5e2f31f574039835e5e756455527c327a73d563a3db54a9f32e3478545a2a22c2725aaeee2'
         '4ebc07a725ef8362233a83118e93901e78943e8dae08f9358b668ff13ab88a65eb9e87c49d106a8c3d87eb62007b230e199107eacb01f92dc683335076c01309')
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -Np1 -i ../"${pkgname}-6.2-systemd_sysusers_groups.patch"
-  patch -Np1 -i ../"${pkgname}-6.4-x11_autostart.patch"
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../$pkgbase-6.2-systemd_sysusers_groups.patch
+  patch -Np1 -i ../$pkgbase-6.4-x11_autostart.patch
   ./autogen
 }
 
@@ -58,34 +40,69 @@
 build() {
   # fat-lto-objects is required for non-mangled static libs
   CFLAGS+=" -ffat-lto-objects"
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --mandir=/usr/share/man \
-              --with-scripts-directory=/usr/lib/brltty \
-              --with-tables-directory=/usr/share/brltty \
-              --with-writable-directory=/run/brltty \
-              --enable-gpm \
-              --disable-stripping
-  make
+
+  cd $pkgbase-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --with-scripts-directory=/usr/lib/brltty \
+    --with-tables-directory=/usr/share/brltty \
+    --with-writable-directory=/run/brltty \
+    --enable-gpm \
+    --disable-stripping
+  make -j1
   # make brlapi.jar deterministic
   find . -type f -iname "*.jar" -exec strip-nondeterminism {} \;
 }
 
-package() {
-  depends+=(libasound.so libdbus-1.so libexpat.so libgio-2.0.so libglib-2.0.so
-  libgobject-2.0.so libicuuc.so libgpm.so libncursesw.so libsystemd.so)
+package_brltty() {
+  depends=(bluez-libs gcc-libs glibc liblouis libspeechd libasound.so
+  libdbus-1.so libexpat.so libgio-2.0.so libglib-2.0.so libgobject-2.0.so
+  libicuuc.so libgpm.so libncursesw.so libsystemd.so pcre2 polkit)
+  optdepends=(
+    'at-spi2-core: X11/GNOME Apps accessibility'
+    'atk: ATK bridge for X11/GNOME accessibility'
+    'brltty-udev-generic: for initializing brltty with generic USB devices'
+    'espeak-ng: espeak-ng driver'
+    'java-runtime: Java support'
+    'libxaw: X11 support'
+    'libxt: X11 support'
+    'libx11: for xbrlapi'
+    'libxfixes: for xbrlapi'
+    'libxtst: for xbrlapi'
+    'ocaml: OCaml support'
+    'python: Python support'
+    'speech-dispatcher: speech-dispatcher driver'
+    'tcl: tcl support'
+  )
+  provides=(libbrlapi.so)
+  backup=(
+    etc/brltty.conf
+    etc/X11/xinit/xinitrc.d/90xbrlapi
+  )
+  install=brltty.install
 
-  cd "${pkgname}-${pkgver}"
+  cd $pkgbase-$pkgver
   # installation does not work reliably with many cores, so set jobs to 1
-  make -j1 INSTALL_ROOT="${pkgdir}" install
-  make -j1 INSTALL_ROOT="${pkgdir}" install-systemd
-  make -j1 INSTALL_ROOT="${pkgdir}" install-udev
-  make -j1 INSTALL_ROOT="${pkgdir}" install-dracut
-  make -j1 INSTALL_ROOT="${pkgdir}" install-polkit
-  install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
+  make -j1 INSTALL_ROOT="$pkgdir" install
+  make -j1 INSTALL_ROOT="$pkgdir" install-systemd
+  make -j1 INSTALL_ROOT="$pkgdir" install-udev
+  make -j1 INSTALL_ROOT="$pkgdir" install-dracut
+  make -j1 INSTALL_ROOT="$pkgdir" install-polkit
+  install -vDm 644 Documents/$pkgbase.conf -t "$pkgdir/etc/"
 
   # fix directory permission and ownership
   install -vdm 750 -o root -g 102 "$pkgdir/usr/share/polkit-1/rules.d"
+
+  # move generic udev rule, as it applies too broadly
+  mv -v "$pkgdir/usr/lib/udev/rules.d/90-brltty-usb-generic.rules" ../
 }
+
+package_brltty-udev-generic() {
+  pkgdesc="Generic udev rules for brltty"
+  depends=(brltty)
+
+  install -vDm 644 90-brltty-usb-generic.rules -t "$pkgdir/usr/lib/udev/rules.d/"
+}