From aa452e2286f72820ea948ac4ebb8f183901020e5 Mon Sep 17 00:00:00 2001
From: zer0def <zer0def@zer0def.0>
Date: Sat, 18 Jun 2022 16:35:32 +0200
Subject: [PATCH] 0.14.0

---
 .SRCINFO   |  6 ++----
 PKGBUILD   | 38 +++++++++++++++++++++-----------------
 udev.rules |  1 -
 3 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 udev.rules

diff --git a/.SRCINFO b/.SRCINFO
index 2a0b001..8963468 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sunshine
 	pkgdesc = Open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield
-	pkgver = 0.13.0
+	pkgver = 0.14.0
 	pkgrel = 1
 	url = https://github.com/SunshineStream/sunshine
 	install = sunshine.install
@@ -23,11 +23,9 @@ pkgbase = sunshine
 	depends = libxcb
 	depends = libxrandr
 	depends = udev
-	source = sunshine::git+https://github.com/SunshineStream/sunshine.git#tag=v0.13.0
+	source = sunshine::git+https://github.com/SunshineStream/sunshine.git#tag=v0.14.0
 	source = systemd-user-config.patch
-	source = udev.rules
 	sha256sums = SKIP
 	sha256sums = 1642eb8672b137e94aa16e4aadde37f68bf1920dfadd1325cca480d7731f38c9
-	sha256sums = 5ce01689247cb01d3f119cac32c731607d99bb875dcdd39c92b547f76d2befa0
 
 pkgname = sunshine
diff --git a/PKGBUILD b/PKGBUILD
index 4515352..869e8fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jacek Szafarkiewicz <szafar at linux dot pl>
 
 pkgname=sunshine
-pkgver=0.13.0
+pkgver=0.14.0
 pkgrel=1
 pkgdesc="Open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield"
 url="https://github.com/SunshineStream/sunshine"
@@ -11,18 +11,16 @@ license=('GPL3')
 depends=('boost-libs' 'ffmpeg4.4' 'openssl' 'libpulse' 'opus' 'libxtst' 'libx11' 'libxfixes' 'libevdev' 'libxcb' 'libxrandr' 'udev')
 makedepends=('git' 'cmake' 'boost' 'make')
 
-source=("$pkgname::git+https://github.com/SunshineStream/sunshine.git#tag=v$pkgver"
-        "systemd-user-config.patch"
-        "udev.rules")
+source=("${pkgname}::git+https://github.com/SunshineStream/sunshine.git#tag=v${pkgver}"
+        "systemd-user-config.patch")
 sha256sums=('SKIP'
-            '1642eb8672b137e94aa16e4aadde37f68bf1920dfadd1325cca480d7731f38c9'
-            '5ce01689247cb01d3f119cac32c731607d99bb875dcdd39c92b547f76d2befa0')
+            '1642eb8672b137e94aa16e4aadde37f68bf1920dfadd1325cca480d7731f38c9')
 install=sunshine.install
 
-_assets_path=/usr/share/$pkgname
+_assets_path="/usr/share/${pkgname}"
 
 prepare() {
-    cd "$pkgname"
+    cd "${pkgname}"
     git submodule update --recursive --init
 
     patch -p1 < ../systemd-user-config.patch
@@ -33,11 +31,12 @@ build() {
     export CXXFLAGS="${CXXFLAGS/-Werror=format-security/}"
 
     cmake \
-        -S "$pkgname" \
+        -S "${pkgname}" \
         -B build \
         -Wno-dev \
         -D SUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \
-        -D SUNSHINE_ASSETS_DIR="$_assets_path" \
+        -D SUNSHINE_ASSETS_DIR="${_assets_path}" \
+        -D SUNSHINE_CONFIG_DIR=/usr/share/sunshine \
         \
         -D LIBAVCODEC_INCLUDE_DIR=/usr/include/ffmpeg4.4 \
         -D LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg4.4/libavcodec.so \
@@ -54,19 +53,24 @@ build() {
 }
 
 package() {
-    pushd "$pkgname/assets"
-        install -Dvm644 sunshine.conf "$pkgdir/$_assets_path/sunshine.conf"
-        install -Dvm644 apps_linux.json "$pkgdir/$_assets_path/apps_linux.json"
+    install -Dvm644 sunshine/src_assets/common/config/sunshine.conf "${pkgdir}/${_assets_path}/sunshine.conf"
+    install -Dvm644 sunshine/src_assets/linux/config/apps.json "${pkgdir}/${_assets_path}/apps.json"
 
-        find web shaders/opengl -type f -print0 | xargs -0 -I {} install -Dvm644 {} "$pkgdir/$_assets_path/{}"
+    # why not just "cp -r --preserve=ownership" or something to that effect? looks like tangling up the simplest of things
+    pushd sunshine/src_assets/common/assets
+    find web -type f -print0 | xargs -0 -I {} install -Dvm644 {} "${pkgdir}/${_assets_path}/{}"
+    popd
+
+    pushd sunshine/src_assets/linux/assets
+    find shaders/opengl -type f -print0 | xargs -0 -I {} install -Dvm644 {} "${pkgdir}/${_assets_path}/{}"
     popd
 
     pushd build
-        install -Dvm755 sunshine "$pkgdir/usr/bin/sunshine"
-        install -Dvm644 sunshine.service "$pkgdir/usr/lib/systemd/user/sunshine.service"
+        install -Dvm755 "sunshine-${pkgver}" "${pkgdir}/usr/bin/sunshine"
+        install -Dvm644 sunshine.service "${pkgdir}/usr/lib/systemd/user/sunshine.service"
     popd
 
-    install -Dvm644 udev.rules "$pkgdir/usr/lib/udev/rules.d/85-sunshine.rules"
+    install -Dvm644 sunshine/src_assets/linux/misc/85-sunshine-rules.rules "${pkgdir}/usr/lib/udev/rules.d/85-sunshine.rules"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/udev.rules b/udev.rules
deleted file mode 100644
index d626ba3..0000000
--- a/udev.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="uinput", GROUP="input", MODE="0660"