1.7.0

2 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3efae6947700..dcd9c502af71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 pkgbase = qtscrcpy
 	pkgdesc = Android real-time screencast control tool
-	pkgver = 1.6.0
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = https://github.com/barry-ran/QtScrcpy
 	arch = x86_64
 	license = Apache
-	depends = qt5-x11extras
+	makedepends = cmake
+	makedepends = qt5-tools
 	depends = android-tools
+	depends = ffmpeg
+	depends = qt5-x11extras
 	conflicts = qt-scrcpy
 	replaces = qt-scrcpy
 	backup = etc/qtscrcpy/config.ini
-	source = QtScrcpy-1.6.0.tar.gz::https://github.com/barry-ran/QtScrcpy/archive/v1.6.0.tar.gz
+	source = QtScrcpy-1.7.0.tar.gz::https://github.com/barry-ran/QtScrcpy/archive/v1.7.0.tar.gz
 	source = path-fix.patch
 	source = qtscrcpy.desktop
 	source = qtscrcpy.sh
-	sha256sums = d29fbae6f52c457baf624e540353f7ad00e22aa7ce86866059c485c0be8a5ad8
+	sha256sums = 3a84d08795cc6b3ab41a90289080d78a2e9fb2b570c7c3a1d3dec118939c17c5
 	sha256sums = 19a9dae14c041715ee96cb6357c9f46ff7a9c5342f7e0d798bb17d6244347bfe
 	sha256sums = 0dc5b08698162c8a0172a9c2e92b18fa7cd9df4b295bd350329b1e4dbd892a6e
 	sha256sums = 26335d1e208c47ddfc4abaabce3f32734788a80a6663577b3ff462346d8dec6f
 
 pkgname = qtscrcpy
-
diff --git a/PKGBUILD b/PKGBUILD
index 686f693da1d1..ed6bef9d176e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=qtscrcpy
 _pkgname=QtScrcpy
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Android real-time screencast control tool"
 arch=('x86_64')
 url="https://github.com/barry-ran/QtScrcpy"
 license=('Apache')
-depends=('qt5-x11extras' 'android-tools')
+depends=('android-tools' 'ffmpeg' 'qt5-x11extras')
+makedepends=('cmake' 'qt5-tools')
 conflicts=('qt-scrcpy')
 replaces=('qt-scrcpy')
 backup=("etc/$pkgname/config.ini")
@@ -15,20 +16,26 @@ source=("$_pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         'path-fix.patch'
         "$pkgname.desktop"
         "$pkgname.sh")
-sha256sums=('d29fbae6f52c457baf624e540353f7ad00e22aa7ce86866059c485c0be8a5ad8'
+sha256sums=('3a84d08795cc6b3ab41a90289080d78a2e9fb2b570c7c3a1d3dec118939c17c5'
             '19a9dae14c041715ee96cb6357c9f46ff7a9c5342f7e0d798bb17d6244347bfe'
             '0dc5b08698162c8a0172a9c2e92b18fa7cd9df4b295bd350329b1e4dbd892a6e'
             '26335d1e208c47ddfc4abaabce3f32734788a80a6663577b3ff462346d8dec6f')
 
 prepare() {
-	cd "$_pkgname-$pkgver/$_pkgname"
+	cd "$_pkgname-$pkgver"
+
+	# Use system packages instead of static bundled tools
+	rm -rf third_party/{adb,ffmpeg}
+
+	cd "$_pkgname"
 	patch < "$srcdir/path-fix.patch"
 }
 
 build() {
-	cd "$_pkgname-$pkgver"
-	qmake
-	make
+	cmake -B build -S "$_pkgname-$pkgver" \
+		-DCMAKE_BUILD_TYPE='None' \
+		-Wno-dev
+	make -C build
 }
 
 package() {
@@ -36,10 +43,14 @@ package() {
 	install -Dm755 output/linux/release/QtScrcpy -t "$pkgdir/opt/$pkgname"
 	install -Dm644 backup/logo.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 	install -Dm644 config/config.ini -t "$pkgdir/etc/$pkgname"
-	install -Dm644 docs/*.md -t "$pkgdir/usr/share/doc/$pkgname"
+	install -Dm644 third_party/scrcpy-server -t "$pkgdir/opt/$pkgname"
+
 	cp -r keymap "$pkgdir/opt/$pkgname"
 	chmod 666 "$pkgdir/opt/$pkgname/keymap"
+
+	install -d "$pkgdir/usr/share/doc/$pkgname"
+	cp -r docs/* "$pkgdir/usr/share/doc/$pkgname"
+
 	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 	install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications"
-	install -Dm644 third_party/scrcpy-server -t "$pkgdir/opt/$pkgname"
 }