diff options
| -rw-r--r-- | .SRCINFO | 32 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 62 | ||||
| -rw-r--r-- | espeakup-git.install | 20 | ||||
| -rw-r--r-- | espeakup.service | 16 | ||||
| -rw-r--r-- | espeakup.txt | 1 | ||||
| -rw-r--r-- | espeakup@.service | 16 | ||||
| -rw-r--r-- | speakupconf.service | 12 |
8 files changed, 33 insertions, 127 deletions
@@ -1,32 +1,18 @@ -# Generated by mksrcinfo v8 -# Fri Jun 8 01:57:02 UTC 2018 pkgbase = espeakup-git - pkgdesc = allows the Speakup screen review system to use the ESpeak synthesizer - pkgver = v0.8.4.gf2000b2 + pkgdesc = Allows the Speakup screen review system to use the espeak-ng synthesizer (development version) + pkgver = 0.90.r5.ge858481 pkgrel = 1 - url = https://github.com/stormdragon2976/espeakup - install = espeakup-git.install - arch = armv7h - arch = i686 + url = https://github.com/linux-speakup/espeakup arch = x86_64 license = GPL3 makedepends = git - depends = speakup-utils - depends = espeak + makedepends = ruby-ronn-ng + makedepends = meson + depends = alsa-lib + depends = espeak-ng provides = espeakup conflicts = espeakup - source = git+http://github.com/stormdragon2976/espeakup.git - source = espeakup.service - source = speakupconf.service - source = espeakup@.service - source = espeakup.txt - source = speakup.conf - sha256sums = SKIP - sha256sums = 8d747829bd998af199d2f2e4878782d8cc33bb11920de51159362021585febbe - sha256sums = c1e97b20bd0dc4257d4af10999c65f238ac8fe8d70dd46c3d3524bf26be17171 - sha256sums = 5e9c1e2f065fdc10cd15c7704d61ba479c7e7ee352e24b904c60b8fcf8bec537 - sha256sums = b9879526368d2a258b2d0ba4b30aa12bd172e01944c91544c35321581ae2d9db - sha256sums = 4c39f77f682335dee0daf7d12013bdbd695c4740acead9c7414dd3189269472e + source = espeakup::git+https://github.com/linux-speakup/espeakup.git + md5sums = SKIP pkgname = espeakup-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..2d558e29d81c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +espeakup/ @@ -1,50 +1,34 @@ -# Maintainer: Jeremiah Ticket <seashellpromises@gmail.com> +# Maintainer: Alexander Epaneshnikov <aarnaarn2@gmail.com> +# Contributor: Jeremiah Ticket <seashellpromises@gmail.com> +# Contributor: Storm Dragon <stormdragon2976@gmail.com> -_gitname='espeakup' -pkgname="$_gitname"-git -pkgver=v0.8.4.gf2000b2 -pkgrel=2 -pkgdesc='allows the Speakup screen review system to use the ESpeak synthesizer' -arch=('armv7h' 'i686' 'x86_64') -url='https://github.com/jticket1024/espeakup' +pkgname=espeakup-git +pkgver=0.90.r5.ge858481 +pkgrel=1 +pkgdesc="Allows the Speakup screen review system to use the espeak-ng synthesizer (development version)" +arch=('x86_64') +url="https://github.com/linux-speakup/espeakup" license=('GPL3') -depends=('speakup-utils' 'espeak') -makedepends=('git') -provides=('espeakup') -conflicts=('espeakup') -install="$pkgname".install -source=("git+http://github.com/jticket1024/$_gitname.git" - 'espeakup.service' - 'speakupconf.service' - 'espeakup@.service' - 'espeakup.txt' - 'speakup.conf') -sha256sums=('SKIP' - '8d747829bd998af199d2f2e4878782d8cc33bb11920de51159362021585febbe' - 'c1e97b20bd0dc4257d4af10999c65f238ac8fe8d70dd46c3d3524bf26be17171' - '5e9c1e2f065fdc10cd15c7704d61ba479c7e7ee352e24b904c60b8fcf8bec537' - 'b9879526368d2a258b2d0ba4b30aa12bd172e01944c91544c35321581ae2d9db' - '4c39f77f682335dee0daf7d12013bdbd695c4740acead9c7414dd3189269472e') +depends=('alsa-lib' 'espeak-ng') +makedepends=('git' 'ruby-ronn-ng' 'meson') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +source=(${pkgname%-git}::'git+https://github.com/linux-speakup/espeakup.git') +md5sums=('SKIP') pkgver() { - cd "$srcdir/$_gitname" - local ver="$(git describe --tags)" - echo "${ver//-/.}" + cd "${pkgname%-git}" + # cutting off 'v' prefix that presents in the git tag + printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" } build() { - cd "$srcdir/$_gitname" - make + cd "${pkgname%-git}" + arch-meson . build + ninja -C build } package() { - cd "$srcdir/$_gitname" - make PREFIX=/usr DESTDIR="$pkgdir" install - install -m644 -D "$srcdir/espeakup@.service" "$pkgdir/usr/lib/systemd/system/espeakup@.service" - install -m644 -D "$srcdir/espeakup.service" "$pkgdir/usr/lib/systemd/system/espeakup.service" - install -m644 -D "$srcdir/speakupconf.service" "$pkgdir/usr/lib/systemd/system/speakupconf.service" - install -m644 -D "$srcdir/espeakup.txt" "$pkgdir//etc/conf.d/espeakup" - install -m644 -D "$srcdir/speakup.conf" "$pkgdir/etc/modules-load.d/speakup.conf" + cd "${pkgname%-git}" + DESTDIR="$pkgdir" ninja install -C build } - -# vim: set ts=2 sw=2 et: diff --git a/espeakup-git.install b/espeakup-git.install deleted file mode 100644 index d0090481522f..000000000000 --- a/espeakup-git.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { -_alert -} - -_alert() { -cat << EOF -If you were running the version of espeakup from community, Do the following to clear out the old service file: -# systemctl disable espeakup -To start the new service: -# systemctl daemon-reload -# systemctl enable espeakup@user.service -# systemctl stop espeakup;systemctl start espeakup@user.service -# You can set voice preferences in /home/user/.speakup/espeakup -# For example, to set to us english -# default_voice=en-us -To load your speakupconf settings on start: -# systemctl enable speakupconf.service -EOF -} - diff --git a/espeakup.service b/espeakup.service deleted file mode 100644 index c7d6a7bcd5dc..000000000000 --- a/espeakup.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Software speech output system wide settings -# espeakup needs to start after the audio devices appear, hopefully this should go away in the future -Wants=systemd-udev-settle.service -After=systemd-udev-settle.service sound.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/espeakup -PIDFile=/run/espeakup.pid -ExecStart=/usr/bin/espeakup --default-voice=${default_voice} -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=sound.target diff --git a/espeakup.txt b/espeakup.txt deleted file mode 100644 index 680c62df0e56..000000000000 --- a/espeakup.txt +++ /dev/null @@ -1 +0,0 @@ -default_voice=en-us diff --git a/espeakup@.service b/espeakup@.service deleted file mode 100644 index 8048430e3de1..000000000000 --- a/espeakup@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Software speech output for Speakup for %i -# espeakup needs to start after the audio devices appear, hopefully this should go away in the future -Wants=systemd-udev-settle.service -After=systemd-udev-settle.service sound.target - -[Service] -Type=forking -EnvironmentFile=/home/%i/.speakup/espeakup -PIDFile=/run/espeakup.pid -ExecStart=/usr/bin/espeakup --default-voice=${default_voice} -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=sound.target diff --git a/speakupconf.service b/speakupconf.service deleted file mode 100644 index d7e12fb4eb6a..000000000000 --- a/speakupconf.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Load speakup configuration -DefaultDependencies=no -After=espeakup.service - -[Service] -Type=oneshot -ExecStart=-/usr/bin/speakupconf load -StandardOutput=syslog - -[Install] -WantedBy=sound.target |