librashader is now required

4 files changed, 7 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9465643ffd8a..956f69055a72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ares-emu-git
 	pkgdesc = Cross-platform, open source, multi-system emulator by Near and Ares team, focusing on accuracy and preservation. (git version)
-	pkgver = 135.r47.g5cdefb088
+	pkgver = 136.r6.g71302c093
 	pkgrel = 1
 	url = https://ares-emu.net/
 	install = ares.install
@@ -16,6 +16,7 @@ pkgbase = ares-emu-git
 	depends = libgl
 	depends = libpulse
 	depends = libudev.so=1-64
+	depends = librashader
 	depends = libxv
 	depends = openal
 	depends = sdl2
diff --git a/PKGBUILD b/PKGBUILD
index fbd6a456fbc4..4b0d14a1aa09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Snowstorm64
 
 pkgname=ares-emu-git
-pkgver=135.r47.g5cdefb088
+pkgver=136.r6.g71302c093
 pkgrel=1
 pkgdesc="Cross-platform, open source, multi-system emulator by Near and Ares team, focusing on accuracy and preservation. (git version)"
 arch=(x86_64 i686)
 url="https://ares-emu.net/"
 license=("ISC")
-depends=(gtk3 libao libgl libpulse libudev.so=1-64 libxv openal sdl2 vulkan-driver vulkan-icd-loader) #TODO: require librashader soon
+depends=(gtk3 libao libgl libpulse libudev.so=1-64 librashader libxv openal sdl2 vulkan-driver vulkan-icd-loader)
 makedepends=(mesa git clang lld)
 provides=(ares-emu)
 conflicts=(ares-emu)
@@ -33,7 +33,6 @@ package() {
 
   # Also install shaders and databases in Ares' shared data directory
   install -dm 755 "${pkgdir}/usr/share/ares"
-  cp -dr --no-preserve=ownership "${srcdir}/ares/ares/Shaders/" "${pkgdir}/usr/share/ares/Shaders/"
-  #cp -dr --no-preserve=ownership "${srcdir}/ares/thirdparty/slang-shaders/" "${pkgdir}/usr/share/ares/Shaders/"
+  cp -dr --no-preserve=ownership "${srcdir}/ares/thirdparty/slang-shaders/" "${pkgdir}/usr/share/ares/Shaders/"
   cp -dr --no-preserve=ownership "${srcdir}/ares/mia/Database/" "${pkgdir}/usr/share/ares/Database/"
 }
diff --git a/ares-paths.patch b/ares-paths.patch
deleted file mode 100644
index 499e71911b33..000000000000
--- a/ares-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ares/desktop-ui/desktop-ui.cpp b/ares/desktop-ui/desktop-ui.cpp
-@@ -32,6 +32,11 @@
-   #if !defined(PLATFORM_WINDOWS)
-     string shared_location = {Path::sharedData(), "ares/", name};
-     if(inode::exists(shared_location)) return shared_location;
-+
-+    // XXX: Change settings.bml location to match Ares' default behavior.
-+    if(directory::exists({Path::userSettings(), "ares/"})) {
-+      file::copy({Path::userSettings(), "ares/settings.bml"}, {Path::userData(), "ares/settings.bml"});
-+    }
- 
-     // On non-windows platforms, after exhausting other options,
-     // default to userData.
diff --git a/ares.install b/ares.install
index b156a666f5b2..e9eab8e951bc 100644
--- a/ares.install
+++ b/ares.install
@@ -3,9 +3,9 @@ post_upgrade() {
 ********************************************************************************
 * Wanting to be as close as possible to Ares vanilla, the location             *
 * of settings files has been changed from                                      *
-* $XDG_CONFIG_HOME                                                             *
+* $XDG_CONFIG_HOME/ares/
 * to the default                                                               *
-* $XDG_DATA_HOME .                                                             *
+* $XDG_DATA_HOME/ares/
 * Should you read this message, please move the file settings.bml to the new   *
 * location. Once done, only then ares can start with your customized settings. *
 ********************************************************************************