upgpkg: qt-scrcpy 1.1.0-1

upstream release

update

3 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea21eb3faa99..86e3c3bae59b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = qt-scrcpy
 	pkgdesc = Android real-time screencast control tool
-	pkgver = 1.0.3
-	pkgrel = 2
+	pkgver = 1.1.0
+	pkgrel = 1
 	url = https://github.com/barry-ran/QtScrcpy
 	arch = x86_64
 	license = Apache
 	depends = qt5-base
+	depends = scrcpy
 	provides = qt-scrcpy
-	source = qt-scrcpy-1.0.3.src.tar.gz::https://github.com/barry-ran/QtScrcpy/archive/v1.0.3.tar.gz
+	source = qt-scrcpy-1.1.0.src.tar.gz::https://github.com/barry-ran/QtScrcpy/archive/v1.1.0.tar.gz
 	source = binaries.patch
-	sha256sums = 84c02a9402d7cbaf9626e625ccdde09de6f1d8bd6c02b66995650b312e537adc
-	sha256sums = d6aaff9b94d2a14f2c27296d30cabbaa70e47bb7fbc2782ce9e754738c748ded
+	sha256sums = 83188edee4ace0330e05e0c8e973cdfac70cc7e0cbd9752ac71e3e3bd909f603
+	sha256sums = 1fa61a24bf59a62db1b29a3d3ec49186ef6f539ff8d09dd04534d939cb30aedd
 
 pkgname = qt-scrcpy
 
diff --git a/PKGBUILD b/PKGBUILD
index c0088f1b08d3..4a5f19c49630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Bruce Zhang
 pkgname=qt-scrcpy
 _name=QtScrcpy
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Android real-time screencast control tool"
 arch=('x86_64')
 url="https://github.com/barry-ran/QtScrcpy"
 license=('Apache')
-depends=('qt5-base')
+depends=('qt5-base' 'scrcpy')
 provides=('qt-scrcpy')
 source=(
 	"$pkgname-$pkgver.src.tar.gz::https://github.com/barry-ran/$_name/archive/v$pkgver.tar.gz"
 	binaries.patch
 )
-sha256sums=('84c02a9402d7cbaf9626e625ccdde09de6f1d8bd6c02b66995650b312e537adc'
-            'd6aaff9b94d2a14f2c27296d30cabbaa70e47bb7fbc2782ce9e754738c748ded')
+sha256sums=('83188edee4ace0330e05e0c8e973cdfac70cc7e0cbd9752ac71e3e3bd909f603'
+            '1fa61a24bf59a62db1b29a3d3ec49186ef6f539ff8d09dd04534d939cb30aedd')
 
 prepare() {
 	cd "$srcdir/$_name-$pkgver/$_name"
@@ -32,7 +32,4 @@ build() {
 package() {
 	cd "$srcdir/$_name-$pkgver/output/linux/release"
 	install -Dm755 QtScrcpy "$pkgdir/usr/bin/QtScrcpy"
-
-	cd "$srcdir/$_name-$pkgver/third_party"
-	install -Dm644 scrcpy-server.jar "$pkgdir/usr/share/qt-scrcpy/scrcpy-server.jar"
 }
diff --git a/binaries.patch b/binaries.patch
index 0f816d6e8f34..d3ffa5fe9e7e 100644
--- a/binaries.patch
+++ b/binaries.patch
@@ -1,13 +1,8 @@
 --- main.cpp	2019-09-01 18:50:53.000000000 +0800
 +++ main_new.cpp	2019-11-02 17:59:37.048730782 +0800
-@@ -37,8 +37,8 @@
- #endif
- 
+@@ -49,3 +49,3 @@
  #ifdef Q_OS_LINUX
 -    qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb");
--    qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server.jar");
+-    qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server");
 +    qputenv("QTSCRCPY_ADB_PATH", "/usr/bin/adb");
-+    qputenv("QTSCRCPY_SERVER_PATH", "/usr/share/qt-scrcpy/scrcpy-server.jar");
- #endif
- 
-     //加载样式表
++    qputenv("QTSCRCPY_SERVER_PATH", "/usr/share/scrcpy/scrcpy-server");