1.0-4

2 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0099b1e7e28..eab113f759f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = scrcpy
 	pkgdesc = Display and control your Android device
 	pkgver = 1.0
-	pkgrel = 2
+	pkgrel = 4
 	url = https://github.com/Genymobile/scrcpy
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = gcc
 	makedepends = meson
-	makedepends = jdk8-openjdk
 	depends = ffmpeg
-	depends = jre8-openjdk
 	depends = sdl2
-	source = scrcpy-1.0.tar.gz::https://github.com/Genymobile/scrcpy/archive/v1.0.tar.gz
+	optdepends = android-sdk-platform-tools: required if adb is not already installed
+	source = https://github.com/Genymobile/scrcpy/archive/v1.0.tar.gz
+	source = scrcpy-server.jar::https://github.com/Genymobile/scrcpy/releases/download/v1.0/scrcpy-server-v1.0.jar
 	sha256sums = fda84b2fc6a60bf808f7b87f7c9a985a446bad69d4de8e63e9ce699871f8026f
+	sha256sums = b573b06a6072476b85b6308e3ad189f2665ad5be4f8ca3a6b9ec81d64df20558
 
 pkgname = scrcpy
 
diff --git a/PKGBUILD b/PKGBUILD
index 114d33d0691f..48b4e2671830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,32 @@
 
 pkgname=scrcpy
 pkgver=1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Display and control your Android device'
 arch=('i686' 'x86_64')
 url='https://github.com/Genymobile/scrcpy'
 license=('Apache')
-depends=('ffmpeg' 'jre8-openjdk' 'sdl2')
-makedepends=('gcc' 'meson' 'jdk8-openjdk')
-source=("scrcpy-${pkgver}.tar.gz::https://github.com/Genymobile/scrcpy/archive/v${pkgver}.tar.gz")
-sha256sums=('fda84b2fc6a60bf808f7b87f7c9a985a446bad69d4de8e63e9ce699871f8026f')
+depends=('ffmpeg' 'sdl2')
+makedepends=('gcc' 'meson')
+optdepends=('android-sdk-platform-tools: required if adb is not already installed')
+source=("https://github.com/Genymobile/scrcpy/archive/v${pkgver}.tar.gz"
+        "scrcpy-server.jar::https://github.com/Genymobile/scrcpy/releases/download/v1.0/scrcpy-server-v${pkgver}.jar")
+sha256sums=('fda84b2fc6a60bf808f7b87f7c9a985a446bad69d4de8e63e9ce699871f8026f'
+            'b573b06a6072476b85b6308e3ad189f2665ad5be4f8ca3a6b9ec81d64df20558')
 
 
 build() {
-    if [[ -z "${ANDROID_HOME}" ]]; then
-        if [[ -d ~/.android/sdk ]]; then
-            echo '$ANDROID_HOME' not set. Using ~/.android/sdk
-            export ANDROID_HOME=~/.android/sdk
-        else
-            echo Cannot determine '$ANDROID_HOME'
-            exit 1
-        fi
-    fi
     cd scrcpy-${pkgver}
+    rm -rf build
     meson build --buildtype release --strip -Db_lto=true \
+        -Dbuild_server=false \
         -Doverride_server_path=/usr/share/scrcpy/scrcpy-server.jar
     cd build
     ninja
 }
 
 package() {
-    cd scrcpy-${pkgver}/build
     mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/share/scrcpy
-    install -m 755 app/scrcpy "${pkgdir}"/usr/bin/
-    install -m 755 server/scrcpy-server.jar "${pkgdir}"/usr/share/scrcpy/
+    install -m 755 scrcpy-${pkgver}/build/app/scrcpy "${pkgdir}"/usr/bin/
+    install -m 755 scrcpy-server.jar "${pkgdir}"/usr/share/scrcpy/
 }