Use new repository and build tools

2 files changed, 23 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88953401684e..bc129ca0d723 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tytools-git
 	pkgdesc = GUI and command-line tools to manage Teensy devices
-	pkgver = 0.9.7.r0.gb974192
+	pkgver = 0.9.9.r161.gccbf1306b
 	pkgrel = 1
 	url = http://github.com/Koromix/tytools
 	arch = x86_64
@@ -9,13 +9,13 @@ pkgbase = tytools-git
 	makedepends = git
 	makedepends = imagemagick
 	depends = libudev.so
-	depends = qt5-base
+	depends = qt6-base
 	optdepends = teensyduino: Arduino integration
 	provides = tytools
 	provides = ty
 	conflicts = ty
 	conflicts = teensytools
-	source = git+https://github.com/Koromix/tytools.git
+	source = git+https://github.com/Koromix/rygel.git
 	sha256sums = SKIP
 
 pkgname = tytools-git
diff --git a/PKGBUILD b/PKGBUILD
index cc0f88a56f0f..dd39b28e293e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,52 @@
 # Maintainer: Niels Martignène <niels.martignene@gmail.com>
 
 pkgname=tytools-git
-pkgver=0.9.7.r0.gb974192
+pkgver=0.9.9.r161.gccbf1306b
 pkgrel=1
 pkgdesc="GUI and command-line tools to manage Teensy devices"
 arch=('x86_64' 'i686')
 url="http://github.com/Koromix/tytools"
 license=('custom:Unlicense')
-depends=('libudev.so' 'qt5-base')
+depends=('libudev.so' 'qt6-base')
 optdepends=('teensyduino: Arduino integration')
 makedepends=('git' 'imagemagick')
 provides=('tytools' 'ty')
 conflicts=('ty' 'teensytools')
-source=('git+https://github.com/Koromix/tytools.git')
+source=('git+https://github.com/Koromix/rygel.git')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd tytools
+  cd rygel
 
-  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//'
+  git describe --long --tags --match "tytools/*" | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^tytools\///'
 }
 
 build() {
-  cd tytools
+  cd rygel
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  ./bootstrap.sh
+  ./felix -pFast tycmd tycommander tyuploader
 }
 
 package() {
-  cd tytools
+  cd rygel
 
-  make install DESTDIR="${pkgdir}"
+  mkdir -p "${pkgdir}/usr/bin"
+  install -m755 bin/Fast/tycmd ${pkgdir}/usr/bin/tycmd
+  install -m755 bin/Fast/tycommander ${pkgdir}/usr/bin/tycommander
+  install -m755 bin/Fast/tyuploader ${pkgdir}/usr/bin/tyuploader
+
+  mkdir -p "${pkgdir}/usr/share/applications"
+  install -m644 src/tytools/tycommander/tycommander_linux.desktop "${pkgdir}/usr/share/applications/tycommander.desktop"
+  install -m644 src/tytools/tyuploader/tyuploader_linux.desktop "${pkgdir}/usr/share/applications/tyuploader.desktop"
 
   for size in 16 32 48 256; do
     mkdir -p "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps"
-    convert -resize "${size}x${size}" resources/images/tycommander.png \
+    convert -resize "${size}x${size}" src/tytools/assets/images/tycommander.png \
       "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/tycommander.png"
-    convert -resize "${size}x${size}" resources/images/tyuploader.png \
+    convert -resize "${size}x${size}" src/tytools/assets/images/tyuploader.png \
       "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/tyuploader.png"
   done
 
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/teensytools-git/LICENSE.txt"
+  install -Dm644 src/tytools/LICENSE.txt "${pkgdir}/usr/share/licenses/teensytools-git/LICENSE.txt"
 }