diff options
author | Sebastian 'gonX' Jensen | 2023-08-16 15:20:21 +0200 |
---|---|---|
committer | Sebastian 'gonX' Jensen | 2023-08-16 15:20:21 +0200 |
commit | 5b0cb9e63720ff9cc88df09e8c1773bde0f054e5 (patch) | |
tree | ce16da2d75a634d8eddf8816dfd15e84d0b3c470 | |
parent | 19803e06f9ecabce39e0aa86bfe03d8970948748 (diff) | |
download | aur-5b0cb9e63720ff9cc88df09e8c1773bde0f054e5.tar.gz |
0.6.2.0
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | PKGBUILD | 59 | ||||
-rw-r--r-- | notes.install | 10 | ||||
-rw-r--r-- | opentabletdriver.desktop (renamed from OpenTabletDriver.desktop) | 0 | ||||
-rw-r--r-- | opentabletdriver.service | 12 | ||||
-rwxr-xr-x | otd | 13 | ||||
-rwxr-xr-x | otd-gui | 3 |
7 files changed, 43 insertions, 75 deletions
@@ -1,8 +1,8 @@ pkgbase = opentabletdriver pkgdesc = A cross-platform open source tablet driver - pkgver = 0.6.0.4 - pkgrel = 3 - url = https://github.com/OpenTabletDriver/OpenTabletDriver + pkgver = 0.6.2.0 + pkgrel = 1 + url = https://opentabletdriver.net install = notes.install arch = x86_64 license = LGPL3 @@ -13,17 +13,12 @@ pkgbase = opentabletdriver depends = libevdev optdepends = libxrandr: x11 display querying support optdepends = libx11 - source = OpenTabletDriver-0.6.0.4.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v0.6.0.4.tar.gz - source = otd - source = otd-gui - source = opentabletdriver.service - source = OpenTabletDriver.desktop + options = !strip + source = OpenTabletDriver-0.6.2.0.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v0.6.2.0.tar.gz + source = opentabletdriver.desktop source = notes.install - sha256sums = ae0cf2364d64ee5c006269485e8c667455abba1b6d3bc6dfda52b55746a167a4 - sha256sums = a3e5a2e4b8e7b17776bfa3fc33cb33f13bc26d6756ba5ada8200ca708f33e293 - sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0 - sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2 + sha256sums = 56fd77cbe04d667a05162f01e5bf0e3b246c102465ef8c05560795e6b2d06c20 sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834 - sha256sums = c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442 + sha256sums = c6f4cab31f62c8b4e34fff74961cd37a68bc486d14b1400638335ee59b0ebc83 pkgname = opentabletdriver @@ -4,33 +4,35 @@ pkgname=opentabletdriver _pkgname=OpenTabletDriver _lpkgname=opentabletdriver _spkgname=otd -pkgver=0.6.0.4 -pkgrel=3 +pkgver=0.6.2.0 +pkgrel=1 pkgdesc="A cross-platform open source tablet driver" arch=('x86_64') -url="https://github.com/OpenTabletDriver/OpenTabletDriver" +url="https://opentabletdriver.net" license=('LGPL3') depends=('dotnet-runtime-6.0' 'dotnet-host>=6.0' 'gtk3' 'libevdev') optdepends=('libxrandr: x11 display querying support' 'libx11') makedepends=('dotnet-sdk>=6.0') install="notes.install" +# unified binary dotnet releases break when stripped see https://github.com/dotnet/runtime/issues/54947 +options=('!strip') source=("OpenTabletDriver-$pkgver.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v$pkgver.tar.gz" - "$_spkgname" - "$_spkgname-gui" - "$_lpkgname.service" - "$_pkgname.desktop" + "$_lpkgname.desktop" "notes.install" ) -sha256sums=('ae0cf2364d64ee5c006269485e8c667455abba1b6d3bc6dfda52b55746a167a4' - 'a3e5a2e4b8e7b17776bfa3fc33cb33f13bc26d6756ba5ada8200ca708f33e293' - '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0' - '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2' +sha256sums=('56fd77cbe04d667a05162f01e5bf0e3b246c102465ef8c05560795e6b2d06c20' '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834' - 'c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442') + 'c6f4cab31f62c8b4e34fff74961cd37a68bc486d14b1400638335ee59b0ebc83') _srcdir="OpenTabletDriver-$pkgver" +# TODO: use eng/lib.sh +#prepare() { +# cd "$srcdir" +# source eng/lib.sh +#} + build() { export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true @@ -41,32 +43,31 @@ build() { EXTRA_OPTIONS="/p:DebugType=None /p:DebugSymbols=false" fi - ./build.sh linux-x64 \ - $EXTRA_OPTIONS + ./eng/linux/package.sh -- $EXTRA_OPTIONS ./generate-rules.sh } package() { - cd "$srcdir/$_srcdir" - - install -do root "$pkgdir/usr/share/$_pkgname" - - shopt -s nullglob - cd bin - for binary in *.dll *.json *.pdb; do - install -Dm 755 -o root "$binary" -t "$pkgdir/usr/share/$_pkgname" - done - cd "$srcdir" - sed -i "s/OTD_VERSION/$pkgver/" "$_pkgname.desktop" + + sed -i "s/OTD_VERSION/$pkgver/" "$_lpkgname.desktop" install -Dm 644 -o root "$_srcdir/bin/99-$_lpkgname.rules" -t "$pkgdir/usr/lib/udev/rules.d" install -Dm 644 -o root "$_srcdir/$_pkgname.UX/Assets/$_spkgname.png" -t "$pkgdir/usr/share/pixmaps" - install -Dm 755 -o root "$_spkgname" -t "$pkgdir/usr/bin" - install -Dm 755 -o root "$_spkgname-gui" -t "$pkgdir/usr/bin" - install -Dm 644 -o root "$_lpkgname.service" -t "$pkgdir/usr/lib/systemd/user" - install -Dm 644 -o root "$_pkgname.desktop" -t "$pkgdir/usr/share/applications" + install -Dm 755 -o root -t "$pkgdir/usr/bin" \ + "$_srcdir/eng/linux/Generic/usr/bin/$_spkgname" \ + "$_srcdir/eng/linux/Generic/usr/bin/$_spkgname-daemon" \ + "$_srcdir/eng/linux/Generic/usr/bin/$_spkgname-gui" + + install -Dm 755 -o root -t "$pkgdir/usr/lib/$_lpkgname" \ + "$_srcdir/dist/$_pkgname.Console" \ + "$_srcdir/dist/$_pkgname.Daemon" \ + "$_srcdir/dist/$_pkgname.UX.Gtk" + + install -Dm 644 -o root "$_srcdir/eng/linux/Generic/usr/lib/systemd/user/$_lpkgname.service" -t "$pkgdir/usr/lib/systemd/user" + install -Dm 644 -o root "$_srcdir/eng/linux/Generic/usr/lib/modprobe.d/99-$_lpkgname.conf" -t "$pkgdir/usr/lib/modprobe.d" + install -Dm 644 -o root "$_lpkgname.desktop" -t "$pkgdir/usr/share/applications" install -Dm 644 -o root "$_srcdir/docs/manpages/$_lpkgname.8" -t "$pkgdir/usr/share/man/man8" } diff --git a/notes.install b/notes.install index 9254262f4e6f..0e4eb58ebbc0 100644 --- a/notes.install +++ b/notes.install @@ -11,22 +11,21 @@ msg_starting() { echo "The daemon can be started with:" echo -e " $ ${GREEN}otd${RESET}" echo "You can fork it to the background and use output redirection to a log file if desired." - echo "A systemd user service is also provided and can be used instead:" + echo "A systemd user service is also provided and can be used instead, assuming you have a correct systemd user graphical-session.target set up:" echo -e " $ ${GREEN}systemctl --user enable --now opentabletdriver.service${RESET}" echo } msg_modules() { - echo "You will have to manually disable built-in kernel modules in order for this driver to work properly." - echo -e "This can be done by blacklisting the kernel module by creating a file in ${GREEN}/etc/modprobe.d/blacklist.conf${RESET} with a single line:" - echo -e " ${GREEN}blacklist <module>${RESET}" - echo "Where <module> is 'wacom' if you own a wacom tablet, and 'hid_uclogic' otherwise." + echo "You will have to manually unload built-in kernel modules (or reboot) in order for this driver to work properly." echo "To unload the module immediately, run:" echo -e " # ${GREEN}rmmod <module>${RESET}" + echo "Where <module> is 'wacom' if you own a wacom tablet, and 'hid_uclogic' otherwise." echo } msg_faq() { + echo -e "As of version 0.6.2.0, having the package installed will ${BOLD}block${RESET} any modules related to drawing tablets" echo -e "In the case that you still have issues after following these instructions, the FAQ at ${GREEN}https://opentabletdriver.net/Wiki/FAQ/Linux${RESET} may help." echo } @@ -51,4 +50,5 @@ post_upgrade() { echo -e "You may want to clear the contents of the ${GREEN}Plugins/${RESET} and ${GREEN}Configurations/${RESET} folder in ${GREEN}~/.config/OpenTabletDriver/${RESET}" echo fi + msg_faq } diff --git a/OpenTabletDriver.desktop b/opentabletdriver.desktop index 7eaa6bc46710..7eaa6bc46710 100644 --- a/OpenTabletDriver.desktop +++ b/opentabletdriver.desktop diff --git a/opentabletdriver.service b/opentabletdriver.service deleted file mode 100644 index 96e76e3da8d1..000000000000 --- a/opentabletdriver.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenTabletDriver Daemon -StartLimitIntervalSec=300 -StartLimitBurst=5 - -[Service] -ExecStart=/usr/bin/otd -Restart=on-failure -RestartSec=8s - -[Install] -WantedBy=default.target diff --git a/otd b/otd deleted file mode 100755 index 1755cfe6eb75..000000000000 --- a/otd +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -cd /usr/share/OpenTabletDriver -if [ $# -eq 0 ] -then - if [[ ! -v DISPLAY ]] && [[ ! -v WAYLAND_DISPLAY ]] - then - echo "DISPLAY and/or WAYLAND_DISPLAY is not set" - exit 64 - fi - dotnet ./OpenTabletDriver.Daemon.dll -else - dotnet ./OpenTabletDriver.Console.dll "$@" -fi diff --git a/otd-gui b/otd-gui deleted file mode 100755 index 8a71b9faf550..000000000000 --- a/otd-gui +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd /usr/share/OpenTabletDriver -dotnet ./OpenTabletDriver.UX.Gtk.dll "$@" |