summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--30-opentabletdriver.rules70
-rw-r--r--OpenTabletDriver.desktop2
-rw-r--r--PKGBUILD59
-rw-r--r--opentabletdriver3
-rw-r--r--opentabletdriver.install5
-rw-r--r--opentabletdriver.service10
-rwxr-xr-xotd12
-rwxr-xr-xotd-gui12
9 files changed, 83 insertions, 106 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d7fd88ab7e5..3273a5cc1ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = opentabletdriver-git
pkgdesc = A cross-platform open source tablet driver
- pkgver = v0.2.0.rc1.r52.g385c965
+ pkgver = v0.2.0.rc1.r152.g0f19d70
pkgrel = 2
url = https://github.com/InfinityGhost/OpenTabletDriver
- install = opentabletdriver.install
arch = x86_64
license = GPL
makedepends = git
@@ -11,6 +10,7 @@ pkgbase = opentabletdriver-git
depends = dotnet-runtime>=3.0
depends = dotnet-host>=3.0
depends = fontconfig
+ depends = gtk3
depends = libevdev
depends = libxrandr
depends = libx11
@@ -18,14 +18,16 @@ pkgbase = opentabletdriver-git
conflicts = opentabletdriver
source = git+https://github.com/InfinityGhost/OpenTabletDriver
source = git+https://github.com/InfinityGhost/OpenTabletDriver-udev
- source = opentabletdriver
- source = opentabletdriver.install
+ source = otd
+ source = otd-gui
+ source = opentabletdriver.service
source = OpenTabletDriver.desktop
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 7e95c880ca6328d3bb6f3675ee063b18330d3ea753bef9b5376cafc31eff47f2
- sha256sums = 304ec78284e99395b3091923da540af3a1826205663aa8fd2d52deb64f852166
- sha256sums = 96f95b08be8594787a741f783a553a342abd4961ff0ef8dcc248c22e865ec3dc
+ sha256sums = 3b4e49ee69a632538869f0e21446da16d21aa5075241c5c35545cecb485134d8
+ sha256sums = 0407c3d546a382a8715318a785e11140c11a94f44edef3f730cb0f27ed7cff62
+ sha256sums = f115b727640f78a8d641fab5554305b6e064d73dc4c3f869db85bcaf412f98f1
+ sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834
pkgname = opentabletdriver-git
diff --git a/30-opentabletdriver.rules b/30-opentabletdriver.rules
deleted file mode 100644
index 5c6e574b248..00000000000
--- a/30-opentabletdriver.rules
+++ /dev/null
@@ -1,70 +0,0 @@
-# Gaomon S620
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="256c", ATTRS{idProduct}=="006d", MODE="0660", GROUP="users"
-# Huion H420
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="256c", ATTRS{idProduct}=="006e", MODE="0660", GROUP="users"
-# Huion HS64
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="256c", ATTRS{idProduct}=="006d", MODE="0660", GROUP="users"
-# Wacom CTE-440
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", MODE="0660", GROUP="users"
-# Wacom CTH-470
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00de", MODE="0660", GROUP="users"
-# Wacom CTH-480
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0302", MODE="0660", GROUP="users"
-# Wacom CTH-490
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="033c", MODE="0660", GROUP="users"
-# Wacom CTH-670
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00df", MODE="0660", GROUP="users"
-# Wacom CTH-680
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0303", MODE="0660", GROUP="users"
-# Wacom CTH-690
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="033e", MODE="0660", GROUP="users"
-# Wacom CTL-4100 Bluetooth
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0377", MODE="0660", GROUP="users"
-# Wacom CTL-4100
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0374", MODE="0660", GROUP="users"
-# Wacom CTL-470
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00dd", MODE="0660", GROUP="users"
-# Wacom CTL-471
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0300", MODE="0660", GROUP="users"
-# Wacom CTL-472
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="037a", MODE="0660", GROUP="users"
-# Wacom CTL-480
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="030e", MODE="0660", GROUP="users"
-# Wacom CTL-490
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="033b", MODE="0660", GROUP="users"
-# Wacom CTL-6100
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0378", MODE="0660", GROUP="users"
-# Wacom CTL-671
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0301", MODE="0660", GROUP="users"
-# Wacom CTL-672
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="037b", MODE="0660", GROUP="users"
-# Wacom CTL-680
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0323", MODE="0660", GROUP="users"
-# Wacom CTL-690
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="033d", MODE="0660", GROUP="users"
-# Wacom PTH-451
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0314", MODE="0660", GROUP="users"
-# Wacom PTH-660 Bluetooth
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0360", MODE="0660", GROUP="users"
-# Wacom PTH-660
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0357", MODE="0660", GROUP="users"
-# Wacom PTH-850
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0028", MODE="0660", GROUP="users"
-# XP-Pen Deco 01 v2
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0902", MODE="0660", GROUP="users"
-# XP-Pen Deco 01
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0042", MODE="0660", GROUP="users"
-# XP-Pen Deco 02
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0803", MODE="0660", GROUP="users"
-# XP-Pen G430S
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0075", MODE="0660", GROUP="users"
-# XP-Pen G430S_B
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0913", MODE="0660", GROUP="users"
-# XP-Pen G540 Pro
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0061", MODE="0660", GROUP="users"
-# XP-Pen G640
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0094", MODE="0660", GROUP="users"
-# XP-Pen G640s
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0906", MODE="0660", GROUP="users"
-# XP-Pen Star 03v2
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="0907", MODE="0660", GROUP="users" \ No newline at end of file
diff --git a/OpenTabletDriver.desktop b/OpenTabletDriver.desktop
index f69dcd9bb98..7eaa6bc4671 100644
--- a/OpenTabletDriver.desktop
+++ b/OpenTabletDriver.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Version=OTD_VERSION
Name=OpenTabletDriver
-Exec=/usr/bin/opentabletdriver
+Exec=/usr/bin/otd-gui
Icon=otd
Terminal=false
Type=Application
diff --git a/PKGBUILD b/PKGBUILD
index d958e1d932c..7eeaad12c1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,30 @@
pkgname=opentabletdriver-git
_pkgname=OpenTabletDriver
_lpkgname=opentabletdriver
-pkgver=v0.2.0.rc1.r52.g385c965
+_spkgname=otd
+pkgver=v0.2.0.rc1.r152.g0f19d70
pkgrel=2
pkgdesc="A cross-platform open source tablet driver"
arch=('x86_64')
url="https://github.com/InfinityGhost/OpenTabletDriver"
license=('GPL')
-depends=('dotnet-runtime>=3.0' 'dotnet-host>=3.0' 'fontconfig' 'libevdev' 'libxrandr' 'libx11')
+depends=('dotnet-runtime>=3.0' 'dotnet-host>=3.0' 'fontconfig' 'gtk3' 'libevdev' 'libxrandr' 'libx11')
makedepends=('git' 'dotnet-sdk>=3.0')
provides=("opentabletdriver")
conflicts=("opentabletdriver")
-install="$_lpkgname.install"
source=('git+https://github.com/InfinityGhost/OpenTabletDriver'
'git+https://github.com/InfinityGhost/OpenTabletDriver-udev'
- "$_lpkgname"
- "$_lpkgname.install"
+ "$_spkgname"
+ "$_spkgname-gui"
+ "$_lpkgname.service"
"$_pkgname.desktop")
sha256sums=('SKIP'
'SKIP'
- '7e95c880ca6328d3bb6f3675ee063b18330d3ea753bef9b5376cafc31eff47f2'
- '304ec78284e99395b3091923da540af3a1826205663aa8fd2d52deb64f852166'
- '96f95b08be8594787a741f783a553a342abd4961ff0ef8dcc248c22e865ec3dc')
+ '3b4e49ee69a632538869f0e21446da16d21aa5075241c5c35545cecb485134d8'
+ '0407c3d546a382a8715318a785e11140c11a94f44edef3f730cb0f27ed7cff62'
+ 'f115b727640f78a8d641fab5554305b6e064d73dc4c3f869db85bcaf412f98f1'
+ '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834')
pkgver() {
cd "$srcdir/$_pkgname"
@@ -36,17 +38,32 @@ build() {
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
cd "$srcdir/$_pkgname"
- dotnet publish OpenTabletDriver \
- --configuration Release \
- --runtime linux-x64 \
- --self-contained false \
- --output "./$_pkgname/out" \
+ dotnet publish OpenTabletDriver.Daemon \
+ --configuration Release \
+ --runtime linux-x64 \
+ --self-contained false \
+ --output "./$_pkgname/out" \
+ /p:PublishTrimmed=false
+
+ dotnet publish OpenTabletDriver.Console \
+ --configuration Release \
+ --runtime linux-x64 \
+ --self-contained false \
+ --output "./$_pkgname/out" \
+ /p:PublishTrimmed=false
+
+ dotnet publish OpenTabletDriver.UX.Gtk \
+ --configuration Release \
+ --framework netcoreapp3.1 \
+ --runtime linux-x64 \
+ --self-contained false \
+ --output "./$_pkgname/out" \
/p:PublishTrimmed=false
cd "$srcdir/$_pkgname-udev"
- dotnet build OpenTabletDriver.udev \
- --configuration Release \
- --runtime linux-x64 \
+ dotnet build OpenTabletDriver.udev \
+ --configuration Release \
+ --runtime linux-x64 \
--output "./$_pkgname.udev/out"
dotnet "./$_pkgname.udev/out/$_pkgname.udev.dll" \
@@ -60,7 +77,7 @@ package() {
install -do root "$pkgdir/usr/share/$_pkgname"
cd "$srcdir/$_pkgname/$_pkgname/out"
- for binary in *.so *.dll *.json *.pdb; do
+ for binary in *.dll *.json *.pdb; do
install -Dm 755 -o root "$binary" -t "$pkgdir/usr/share/$_pkgname"
done
cd "$srcdir"
@@ -68,10 +85,12 @@ package() {
sed -i "s/OTD_VERSION/$pkgver/" "$_pkgname.desktop"
install -Dm 644 -o root "$srcdir/$_pkgname/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
- install -Dm 644 -o root "$_pkgname.desktop" -t "$pkgdir/usr/share/applications"
install -Dm 644 -o root "$srcdir/$_pkgname-udev/30-$_lpkgname.rules" -t "$pkgdir/usr/lib/udev/rules.d"
- install -Dm 644 -o root "$srcdir/$_pkgname/$_pkgname/Assets/otd.png" -t "$pkgdir/usr/share/pixmaps"
+ install -Dm 644 -o root "$srcdir/$_pkgname/$_pkgname.UX/Assets/$_spkgname.png" -t "$pkgdir/usr/share/pixmaps"
cp -r "$srcdir/$_pkgname/TabletDriverLib/Configurations" "$pkgdir/usr/share/$_pkgname/"
- install -Dm 755 -o root "$_lpkgname" -t "$pkgdir/usr/bin"
+ 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"
}
diff --git a/opentabletdriver b/opentabletdriver
deleted file mode 100644
index 91a13f1f484..00000000000
--- a/opentabletdriver
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/OpenTabletDriver
-dotnet OpenTabletDriver.dll "$@" \ No newline at end of file
diff --git a/opentabletdriver.install b/opentabletdriver.install
deleted file mode 100644
index e9e8007b5cd..00000000000
--- a/opentabletdriver.install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-post_install() {
- udevadm control --reload-rules
-} \ No newline at end of file
diff --git a/opentabletdriver.service b/opentabletdriver.service
new file mode 100644
index 00000000000..19c7983b30f
--- /dev/null
+++ b/opentabletdriver.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenTabletDriver Daemon
+
+[Service]
+ExecStart=/usr/bin/dotnet /usr/share/OpenTabletDriver/OpenTabletDriver.Daemon.dll -c /usr/share/OpenTabletDriver/Configurations
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=default.target \ No newline at end of file
diff --git a/otd b/otd
new file mode 100755
index 00000000000..a5538718440
--- /dev/null
+++ b/otd
@@ -0,0 +1,12 @@
+#!/bin/bash
+systemctl --user --quiet is-active opentabletdriver.service
+daemonactive=$?
+
+if [ $daemonactive != 0 ]
+then
+ echo "OpenTabletDriver Daemon not running, starting"
+ systemctl --user start opentabletdriver.service
+fi
+
+cd /usr/share/OpenTabletDriver
+dotnet OpenTabletDriver.Console.dll "$@" \ No newline at end of file
diff --git a/otd-gui b/otd-gui
new file mode 100755
index 00000000000..c8d7599b220
--- /dev/null
+++ b/otd-gui
@@ -0,0 +1,12 @@
+#!/bin/bash
+systemctl --user --quiet is-active opentabletdriver.service
+daemonactive=$?
+
+if [ $daemonactive != 0 ]
+then
+ echo "OpenTabletDriver Daemon not running, starting"
+ systemctl --user start opentabletdriver.service
+fi
+
+cd /usr/share/OpenTabletDriver
+dotnet OpenTabletDriver.UX.Gtk.dll "$@" \ No newline at end of file