update PKGBUILD

2 files changed, 28 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f29288e85782..3d5bf6eea608 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = scrcpy-git
 	pkgdesc = Display and control your Android device (development version)
-	pkgver = 1.4.r4.gb882322
+	pkgver = 1.12.1.r10.g7bb9163
 	pkgrel = 1
 	url = https://github.com/Genymobile/scrcpy
 	arch = i686
 	arch = x86_64
 	license = Apache
-	makedepends = gcc
 	makedepends = meson
 	makedepends = git
 	depends = ffmpeg
@@ -14,10 +13,11 @@ pkgbase = scrcpy-git
 	optdepends = android-tools: required if adb is not already installed
 	provides = scrcpy
 	conflicts = scrcpy
+	noextract = scrcpy-server-v1.12.1
 	source = git+https://github.com/Genymobile/scrcpy.git
-	source = https://github.com/Genymobile/scrcpy/releases/download/v1.4/scrcpy-server-v1.4.jar
+	source = https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-server-v1.12.1
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 1ff7a72fcfe81dadccfab9d6f86c971cd7c7f38f17196748fe05480e301b443d
 
 pkgname = scrcpy-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f3c97f5cd68..b0f54a2339a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,44 @@
-# Maintainer: Addison Snelling <addison@asnell.io>
+# Maintainer: skydrome -at- protonmail
 
 pkgname=scrcpy-git
-pkgver=1.4.r4.gb882322
+pkgver=1.12.1.r10.g7bb9163
+_pkgver=${pkgver%.r*}
 pkgrel=1
 pkgdesc='Display and control your Android device (development version)'
 arch=('i686' 'x86_64')
 url='https://github.com/Genymobile/scrcpy'
 license=('Apache')
 depends=('ffmpeg' 'sdl2')
-makedepends=('gcc' 'meson' 'git')
+makedepends=('meson' 'git')
 optdepends=('android-tools: required if adb is not already installed')
-source=("git+https://github.com/Genymobile/scrcpy.git"
-        "https://github.com/Genymobile/scrcpy/releases/download/v${pkgver%.r*}/scrcpy-server-v${pkgver%.r*}.jar")
-sha256sums=('SKIP'
-            '1ff7a72fcfe81dadccfab9d6f86c971cd7c7f38f17196748fe05480e301b443d')
 provides=("scrcpy")
 conflicts=("scrcpy")
+noextract=("scrcpy-server"*)
+
+source=("git+$url.git"
+        "$url/releases/download/v$_pkgver/scrcpy-server-v$_pkgver")
+sha256sums=('SKIP'
+            'SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname%-git}"
-    git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    cd scrcpy
+    git describe |sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "${srcdir}/${pkgname%-git}"
-
-    rm -rf "$srcdir/build"
-    meson \
-        --prefix /usr \
-        --buildtype release \
-        --strip \
-        -Db_lto=true \
-        -Dprebuilt_server="${srcdir}/scrcpy-server-v${pkgver%.r*}.jar" \
-        "$srcdir/build"
-    ninja -C "$srcdir/build"
+    cd scrcpy
+    rm -rf build
+
+    arch-meson \
+        -D prebuilt_server="${srcdir}/scrcpy-server-v${_pkgver}" \
+        build
+
+    ninja -C build
 }
 
 package() {
-    DESTDIR="$pkgdir/" ninja -C "$srcdir/build" install
+    cd scrcpy/build
+
+    DESTDIR="$pkgdir" ninja install
+    install -Dm644 ../LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }