Arch Linux User Repository

@marmis Done. Thanks.

Hi, @Billli11. This package is always getting updates (because it is a git package, obviously) and was taking a bit too much time to build, so I made it download and extract packages concurrently using GNU Parallel. The build time went from 26 seconds to under 5 seconds here:

> time makepkg -fC &> /dev/null

________________________________________________________
Executed in    4.73 secs    fish           external
   usr time    2.28 secs  560.00 micros    2.28 secs
   sys time    2.24 secs  264.00 micros    2.24 secs

Of course, the timings will depend on your internet speed and number of CPU thread. It is currently using the default of -j$(nproc), but this value could be increased for PCs with low CPU count, since each task spend most of the time waiting for the download and not actually using the CPU. For a slow internet speed, the speedup should be even more pronounced (i.e. larger difference in total build time).

The implementation is on commit 16f7108a. You can use pkgdiff to verify that the output is the same, aside from package metadata.

@gee if you don't have the time to maintain, just orphan it.

Throws a lot of errors while building...

mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/Textures/*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/Textures/*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/Textures/*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory
mv: cannot stat '*/Textures/*.*': No such file or directory
mv: cannot stat '*/LICENSE*': No such file or directory
mv: cannot stat '*/LICENSE*.*': No such file or directory

etc

Hey @Billli11 sorry I don't have the time these days to work on stuff like this, I hope you or somebody else can find a proper fix. I'd be happy to approve a co-maintainer if someone is willing.

When building with the current build script, any sub-directory inside of each effect package will not be included. Causing multiple effect fail to load.

example of missing files

opt/reshade/shaders/AstrayFX/OneShot/Limbo_Mod.fx
opt/reshade/shaders/AstrayFX/OneShot/SnowScape.fx
opt/reshade/shaders/CRT-Royale/crt-royale/lib/bind-shader-params.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/bloom-functions.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/blur-functions.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/derived-settings-and-constants.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/downsampling-functions.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/gamma-management.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/geometry-functions.fxh
opt/reshade/shaders/CRT-Royale/crt-royale/lib/helper-functions-and-macros.fxh
...

I tried to fix it by brute forcing it with find but it look ugly.

diff --git a/PKGBUILD b/PKGBUILD
index a5c5221..2c80384 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: gee

 pkgname=reshade-shaders-git
-pkgver=r31.99b9732
+pkgver=r72.8a7ab37
 pkgrel=1
 pkgdesc='A collection of post-processing shaders written in the ReShade FX shader language, to be used by vkBasalt'
 arch=('any')
@@ -28,31 +28,39 @@ build() {
   do
     if [[ "$line" == "InstallPath"* ]]
     then
-      folder=${line:38}
+      folder=${line#*reshade-shaders\\}
+      # Replace backslash to forward slash
+      folder=${folder//\\/\/}
+      continue
     fi
     if [[ "$line" == "DownloadUrl"* ]]
     then
-      url=${line:12}
+      url=${line#DownloadUrl=}
       msg "Getting $url"
       /usr/bin/curl  -L "$url" -o file.zip
       /usr/bin/unzip file.zip
       rm file.zip
-      mkdir -p ../Shaders/$folder
+      mkdir -p "../$folder"
       msg "$folder"
-      if [[ "$folder" == "akgunter" ]]
-      then
-        mv */{*/Shaders/*.*,README.MD,LICENSE.TXT} ../Shaders/$folder
-      elif [[ "$folder" == "CRT-Royale" ]]
-      then
-        mv crt-royale-reshade-master/{reshade-shaders/Shaders/*.*,README.MD,LICENSE.TXT} ../Shaders/$folder
-      elif [[ "$folder" == "CShade" ]]
-      then
-        mv CShade-main/{shaders/*,README.md,LICENSE} ../Shaders/$folder
-      else
-        mv */{Shaders/*.*,README.md} ../Shaders/$folder || true
-        mv */{LICENSE*,LICENSE*.*} ../Shaders/$folder || true
-        mv */Textures/*.* ../Textures || true
-      fi
+
+      while read -r shaders; do
+          if [ -d "$shaders" ]; then
+            cp -r "$shaders/"* -t "../$folder"
+            rm -r "$shaders"
+          fi
+      done < <(find . -type d -iname 'shaders')
+
+      while read -r license; do
+            cp "$license" -t "../$folder"
+            rm "$license"
+      done < <(find . -type f -iregex '.*/\(license.*\|.*\.md\)')
+
+      while read -r textures; do
+          if [ -d "$textures" ]; then
+            cp -r "$textures/"* -t "../Textures"
+            rm -r "$textures"
+          fi
+      done < <(find . -type d -iname 'textures')
     fi
   done < ../EffectPackages.ini
 }
@@ -60,17 +68,15 @@ build() {
 package() {
   cd ${srcdir}/reshade-shaders

+  msg "Packaging shaders' files"
   install -dm 755 "${pkgdir}/opt/reshade/shaders"
-  install -Dm 644 Shaders/*.*  "${pkgdir}/opt/reshade/shaders/"
-  cd Shaders
-  for dir in */
-  do
-    cd "$dir"
-    install -dm 755 "$pkgdir/opt/reshade/shaders/$dir"
-    install -Dm 644 *.*  "${pkgdir}/opt/reshade/shaders/$dir"
-    cd ..
-  done
-  cd ..
+  while read -r shaders_file; do
+    install -Dm 644 "Shaders/$shaders_file" "${pkgdir}/opt/reshade/shaders/${shaders_file#./}"
+  done < <(cd Shaders ; find . -type f )
+
+  msg "Packaging textures' files"
   install -dm 755 "${pkgdir}/opt/reshade/textures"
-  install -Dm 644 Textures/*.* "${pkgdir}/opt/reshade/textures/"
+  while read -r textures_file; do
+    install -Dm 644 "Textures/$textures_file" "${pkgdir}/opt/reshade/textures/${textures_file#./}"
+  done < <(cd Textures ; find . -type f )
 }

@scorpius2k1 yeah shaderdeck is empty it seems... not sure why it's included or what that means. I've worked around that, hopefully that'll be fine.

I haven't used this package in years, I'd really appreciate a co-maintainer to catch these issues so that many people don't have to face those before I read the AUR comments...

@gee looks like this issue has come up again. I am seeing this error on a fresh installation.

Install via git clone and makepkg -si mv: cannot stat '/Shaders/.*': No such file or directory ==> ERROR: A failure occurred in build(). Aborting...

Install via "yay" AUR helper mv: cannot stat '/Shaders/.*': No such file or directory ==> ERROR: A failure occurred in build(). Aborting... -> error making: reshade-shaders-git-exit status 4 -> Failed to install the following packages. Manual intervention is required: reshade-shaders-git - exit status 4

@kristianjgs I've fixed it, hopefully that works now.

hello,

mv: cannot stat '/Shaders/.': No such file or directory mv: cannot stat '/README.md': No such file or directory ==> ERROR: A failure occurred in build(). Aborting... -> error making: reshade-shaders-git-exit status 4 -> Failed to install the following packages. Manual intervention is required: reshade-shaders-git - exit status 4